From 4eb7ec53dd39c146bbcccd37f49a6f0a17bb2a13 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:36:33 +0100 Subject: [PATCH 001/234] gnu: sbcl-cl-tld: Update to 20211117. * gnu/packages/lisp-xyz.scm (sbcl-cl-tld): Update to 20211117. --- 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 4b17c173c9..da03624c4a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18873,10 +18873,10 @@ (define-public ecl-cl-pass (define-public sbcl-cl-tld ;; No release. - (let ((commit "6529c70042cf6e82be39bc522e87ad87da08f1c9")) + (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) (package (name "sbcl-cl-tld") - (version (git-version "0.1" "1" commit)) + (version (git-version "0.1" "2" commit)) (source (origin (method git-fetch) @@ -18885,7 +18885,7 @@ (define-public sbcl-cl-tld (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1l6f0sak90pqjzkrjg0cyk7gv9h8gwpfvc0964z98dw2nj3hakqb")))) + (base32 "0sxnn35gzdby1ixil6zbjg72vli9fcspwzsqimqk455310syx9iv")))) (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") From 3e5749fc331243e9d29baa73a569dc6b6de25f33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Nov 2021 16:37:17 +0000 Subject: [PATCH 002/234] guix: Add download-multi-svn-to-store. * guix/svn-download.scm (download-multi-svn-to-store): New procedure. --- guix/svn-download.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/guix/svn-download.scm b/guix/svn-download.scm index b96151234c..e5fe8f1840 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2019 Ludovic Courtès ;;; Copyright © 2014 Sree Harsha Totakura -;;; Copyright © 2017, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2019, 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +26,9 @@ (define-module (guix svn-download) #:use-module (guix packages) #:use-module (guix utils) #:use-module ((guix build svn) #:prefix build:) + #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) #:export (svn-reference svn-reference? svn-reference-url @@ -41,7 +43,8 @@ (define-module (guix svn-download) svn-multi-reference-revision svn-multi-reference-locations svn-multi-reference-recursive? - svn-multi-fetch)) + svn-multi-fetch + download-multi-svn-to-store)) ;;; Commentary: ;;; @@ -166,4 +169,28 @@ (define* (download-svn-to-store store ref (add-to-store store name #t "sha256" (string-append temp "/svn"))))))) +(define* (download-multi-svn-to-store store ref + #:optional (name (basename (svn-multi-reference-url ref))) + #:key (log (current-error-port))) + "Download from REF, a object to STORE. Write progress +reports to LOG." + (call-with-temporary-directory + (lambda (temp) + (and (every (lambda (location) + (let ((dir (string-append temp "/" (dirname location)))) + (mkdir-p dir)) + (parameterize ((current-output-port log)) + (build:svn-fetch (string-append (svn-multi-reference-url ref) + "/" location) + (svn-multi-reference-revision ref) + (if (string-suffix? "/" location) + (string-append temp "/" location) + (string-append temp "/" (dirname location))) + #:recursive? + (svn-multi-reference-recursive? ref) + #:user-name (svn-multi-reference-user-name ref) + #:password (svn-multi-reference-password ref)))) + (svn-multi-reference-locations ref)) + (add-to-store store name #t "sha256" temp))))) + ;;; svn-download.scm ends here From 3b1a12c5bff5a0c108284d19a6982bdf663bbceb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Nov 2021 16:38:05 +0000 Subject: [PATCH 003/234] import: Replace texlive importer. * guix/import/texlive.scm (fetch-sxml, sxml->package): Remove procedures. (tlpdb-file, tlpdb, files->directories, tlpdb->package): New procedures. (string->license): Add case for lpplgpl license combination. (guix-name): Remove COMPONENT argument. (texlive->guix-package): Use new procedures. (texlive-recursive-import): New procedure. * guix/scripts/import/texlive.scm (show-help, %options): Remove --archive option. (guix-import-texlive): Adjust call of texlive->guix-package. * doc/guix.texi (Invoking guix import): Update documentation. --- doc/guix.texi | 29 +--- guix/import/texlive.scm | 254 ++++++++++++++++++++------------ guix/scripts/import/texlive.scm | 16 +- 3 files changed, 170 insertions(+), 129 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8fdeb9328d..89a970908d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30,7 +30,7 @@ Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@* -Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* +Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner@* @@ -11875,14 +11875,14 @@ guix import cran --archive=git https://github.com/immunogenomics/harmony @item texlive @cindex TeX Live @cindex CTAN -Import metadata from @uref{https://www.ctan.org/, CTAN}, the -comprehensive TeX archive network for TeX packages that are part of the -@uref{https://www.tug.org/texlive/, TeX Live distribution}. +Import TeX package information from the TeX Live package database for +TeX packages that are part of the @uref{https://www.tug.org/texlive/, +TeX Live distribution}. -Information about the package is obtained through the XML API provided -by CTAN, while the source code is downloaded from the SVN repository of -the Tex Live project. This is done because the CTAN does not keep -versioned archives. +Information about the package is obtained from the TeX Live package +database, a plain text file that is included in the @code{texlive-bin} +package. The source code is downloaded from possibly multiple locations +in the SVN repository of the Tex Live project. The command command below imports metadata for the @code{fontspec} TeX package: @@ -11891,19 +11891,6 @@ TeX package: guix import texlive fontspec @end example -When @option{--archive=@var{directory}} is added, the source code is -downloaded not from the @file{latex} sub-directory of the -@file{texmf-dist/source} tree in the TeX Live SVN repository, but from -the specified sibling @var{directory} under the same root. - -The command below imports metadata for the @code{ifxetex} package from -CTAN while fetching the sources from the directory -@file{texmf/source/generic}: - -@example -guix import texlive --archive=generic ifxetex -@end example - @item json @cindex JSON, import Import package metadata from a local JSON file. Consider the following diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 18d8b95ee0..8677caee59 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2021 Ricardo Wurmus ;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -19,18 +19,16 @@ (define-module (guix import texlive) #:use-module (ice-9 match) - #:use-module (sxml simple) - #:use-module (sxml xpath) - #:use-module (srfi srfi-11) + #:use-module (ice-9 rdelim) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-2) + #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) - #:use-module (web uri) - #:use-module (guix diagnostics) - #:use-module (guix i18n) - #:use-module (guix http-client) #:use-module (gcrypt hash) + #:use-module (guix derivations) #:use-module (guix memoization) + #:use-module (guix monads) + #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix base32) #:use-module (guix serialization) @@ -39,24 +37,16 @@ (define-module (guix import texlive) #:use-module (guix utils) #:use-module (guix upstream) #:use-module (guix packages) - #:use-module (gnu packages) #:use-module (guix build-system texlive) + #:use-module (gnu packages tex) #:export (texlive->guix-package - - fetch-sxml - sxml->package)) + texlive-recursive-import)) ;;; Commentary: ;;; -;;; Generate a package declaration template for the latest version of a -;;; package on CTAN, using the XML output produced by the XML API to the CTAN -;;; database at http://www.ctan.org/xml/1.2/ -;;; -;;; Instead of taking the packages from CTAN, however, we fetch the sources -;;; from the SVN repository of the Texlive project. We do this because CTAN -;;; only keeps a single version of each package whereas we can access any -;;; version via SVN. Unfortunately, this means that the importer is really -;;; just a Texlive importer, not a generic CTAN importer. +;;; Generate a package declaration template for corresponding package in the +;;; Tex Live Package Database (tlpdb). We fetch all sources from different +;;; locations in the SVN repository of the Texlive project. ;;; ;;; Code: @@ -79,6 +69,8 @@ (define string->license ("bsd4" 'bsd-4) ("opl" 'opl1.0+) ("ofl" 'silofl1.1) + + ("lpplgpl" `(list lppl gpl1+)) ("lppl" 'lppl) ("lppl1" 'lppl1.0+) ; usually means "or later" ("lppl1.2" 'lppl1.2+) ; usually means "or later" @@ -107,91 +99,161 @@ (define string->license ("cc-by-nc-nd-4" 'non-free) ((x) (string->license x)) ((lst ...) `(list ,@(map string->license lst))) - (_ #f))) + (x `(error unknown-license ,x)))) -(define (fetch-sxml name) - "Return an sxml representation of the package information contained in the -XML description of the CTAN package or #f in case of failure." - ;; This API always returns the latest release of the module. - (let ((url (string-append "http://www.ctan.org/xml/1.2/pkg/" name))) - (guard (c ((http-get-error? c) - (format (current-error-port) - "error: failed to retrieve package information \ -from ~s: ~a (~s)~%" - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason c)) - #f)) - (xml->sxml (http-fetch url) - #:trim-whitespace? #t)))) - -(define (guix-name component name) +(define (guix-name name) "Return a Guix package name for a given Texlive package NAME." - (string-append "texlive-" component "-" + (string-append "texlive-" (string-map (match-lambda (#\_ #\-) (#\. #\-) (chr (char-downcase chr))) name))) -(define* (sxml->package sxml #:optional (component "latex")) - "Return the `package' s-expression for a Texlive package from the SXML -expression describing it." - (define (sxml-value path) - (match ((sxpath path) sxml) - (() #f) - ((val) val))) +(define (tlpdb-file) (with-store store - (let* ((id (sxml-value '(entry @ id *text*))) - (synopsis (sxml-value '(entry caption *text*))) - (version (or (sxml-value '(entry version @ number *text*)) - (sxml-value '(entry version @ date *text*)))) - (license (match ((sxpath '(entry license @ type *text*)) sxml) - ((license) (string->license license)) - ((lst ...) (map string->license lst)))) - (home-page (string-append "http://www.ctan.org/pkg/" id)) - (ref (texlive-ref component id)) - (checkout (download-svn-to-store store ref))) - (unless checkout - (warning (G_ "Could not determine source location. \ -Please manually specify the source field.~%"))) - `(package - (name ,(guix-name component id)) - (version ,version) - (source ,(if checkout - `(origin - (method svn-fetch) - (uri (texlive-ref ,component ,id)) - (sha256 - (base32 - ,(bytevector->nix-base32-string - (let-values (((port get-hash) (open-sha256-port))) - (write-file checkout port) - (force-output port) - (get-hash)))))) - #f)) - (build-system texlive-build-system) - (arguments ,`(,'quote (#:tex-directory ,(string-join (list component id) "/")))) - (home-page ,home-page) - (synopsis ,synopsis) - (description ,(string-trim-both - (string-join - (map string-trim-both - (string-split - (beautify-description - (sxml->string (or (sxml-value '(entry description)) - '()))) - #\newline))))) - (license ,(match license - ((lst ...) `(list ,@lst)) - (license license))))))) + (run-with-store store + (mlet* %store-monad + ((drv (lower-object texlive-bin)) + (built (built-derivations (list drv)))) + (match (derivation->output-paths drv) + (((names . items) ...) + (return (string-append (first items) + "/share/tlpkg/texlive.tlpdb")))))))) + +(define tlpdb + (memoize + (lambda () + (let ((file (tlpdb-file)) + (fields + '((name . string) + (shortdesc . string) + (longdesc . string) + (catalogue-license . string) + (catalogue-ctan . string) + (srcfiles . list) + (runfiles . list) + (docfiles . list) + (depend . simple-list))) + (record + (lambda* (key value alist #:optional (type 'string)) + (let ((new + (or (and=> (assoc-ref alist key) + (lambda (existing) + (cond + ((eq? type 'string) + (string-append existing " " value)) + ((or (eq? type 'list) (eq? type 'simple-list)) + (cons value existing))))) + (cond + ((eq? type 'string) + value) + ((or (eq? type 'list) (eq? type 'simple-list)) + (list value)))))) + (acons key new (alist-delete key alist)))))) + (call-with-input-file file + (lambda (port) + (let loop ((all (list)) + (current (list)) + (last-property #false)) + (let ((line (read-line port))) + (cond + ((eof-object? line) all) + + ;; End of record. + ((string-null? line) + (loop (cons (cons (assoc-ref current 'name) current) + all) + (list) #false)) + + ;; Continuation of a list + ((and (zero? (string-index line #\space)) last-property) + ;; Erase optional second part of list values like + ;; "details=Readme" for files + (let ((plain-value (first + (string-split + (string-trim-both line) #\space)))) + (loop all (record last-property + plain-value + current + 'list) + last-property))) + (else + (or (and-let* ((space (string-index line #\space)) + (key (string->symbol (string-take line space))) + (value (string-drop line (1+ space))) + (field-type (assoc-ref fields key))) + ;; Erase second part of list keys like "size=29" + (cond + ((eq? field-type 'list) + (loop all current key)) + (else + (loop all (record key value current field-type) key)))) + (loop all current #false)))))))))))) + +(define (files->directories files) + (pk 'f->d + (map (cut string-join <> "/" 'suffix) + (delete-duplicates (map (lambda (file) + (drop-right (string-split file #\/) 1)) + files) + equal?)))) + +(define (tlpdb->package name) + (and-let* ((data (assoc-ref (tlpdb) name)) + (dirs (files->directories + (map (lambda (dir) + (string-drop dir (string-length "texmf-dist/"))) + (append (or (assoc-ref data 'docfiles) (list)) + (or (assoc-ref data 'runfiles) (list)) + (or (assoc-ref data 'srcfiles) (list)))))) + (name (guix-name name)) + (version (number->string %texlive-revision)) + (ref (svn-multi-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist")) + (locations dirs) + (revision %texlive-revision))) + (source (with-store store + (download-multi-svn-to-store + store ref (string-append name "-svn-multi-checkout"))))) + (values + `(package + (inherit (simple-texlive-package + ,name + (list ,@dirs) + (base32 + ,(bytevector->nix-base32-string + (let-values (((port get-hash) (open-sha256-port))) + (write-file source port) + (force-output port) + (get-hash)))) + ,@(if (assoc-ref data 'srcfiles) '() '(#:trivial? #true)))) + ,@(or (and=> (assoc-ref data 'depend) + (lambda (inputs) + `((propagated-inputs ,inputs)))) + '()) + ,@(or (and=> (assoc-ref data 'catalogue-ctan) + (lambda (url) + `((home-page ,(string-append "https://ctan.org" url))))) + '((home-page "https://www.tug.org/texlive/"))) + (synopsis ,(assoc-ref data 'shortdesc)) + (description ,(beautify-description + (assoc-ref data 'longdesc))) + (license ,(string->license + (assoc-ref data 'catalogue-license)))) + (or (assoc-ref data 'depend) (list))))) (define texlive->guix-package (memoize - (lambda* (package-name #:optional (component "latex")) - "Fetch the metadata for PACKAGE-NAME from REPO and return the `package' + (lambda* (name #:key repo version) + "Find the metadata for NAME in the tlpdb and return the `package' s-expression corresponding to that package, or #f on failure." - (and=> (fetch-sxml package-name) - (cut sxml->package <> component))))) + (tlpdb->package name)))) -;;; ctan.scm ends here +(define (texlive-recursive-import name) + (recursive-import name + #:repo->guix-package texlive->guix-package + #:guix-name guix-name)) + +;;; texlive.scm ends here diff --git a/guix/scripts/import/texlive.scm b/guix/scripts/import/texlive.scm index 6f0818e274..4aeaa79eef 100644 --- a/guix/scripts/import/texlive.scm +++ b/guix/scripts/import/texlive.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2021 Ricardo Wurmus ;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. @@ -42,8 +42,6 @@ (define %default-options (define (show-help) (display (G_ "Usage: guix import texlive PACKAGE-NAME Import and convert the Texlive package for PACKAGE-NAME.\n")) - (display (G_ " - -a, --archive=ARCHIVE specify the archive repository")) (display (G_ " -h, --help display this help and exit")) (display (G_ " @@ -60,10 +58,6 @@ (define %options (option '(#\V "version") #f #f (lambda args (show-version-and-exit "guix import texlive"))) - (option '(#\a "archive") #t #f - (lambda (opt name arg result) - (alist-cons 'component arg - (alist-delete 'component result)))) %standard-import-options)) @@ -84,13 +78,11 @@ (define (parse-options) (_ #f)) (reverse opts)))) (match args - ((package-name) - (let ((sexp (texlive->guix-package package-name - (or (assoc-ref opts 'component) - "latex")))) + ((name) + (let ((sexp (texlive->guix-package name))) (unless sexp (leave (G_ "failed to download description for package '~a'~%") - package-name)) + name)) sexp)) (() (leave (G_ "too few arguments~%"))) From aad93806ac26d53d301bcb9acfe45dc2aa01c355 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 10:12:43 +0000 Subject: [PATCH 004/234] gnu: python-hnswlib: Disable native optimizations. * gnu/packages/python-xyz.scm (python-hnswlib)[arguments]: Add build phase 'disable-native-optimization. --- gnu/packages/python-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f32c322c0a..4623c7b3b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1380,6 +1380,13 @@ (define-public python-hnswlib (sha256 (base32 "0wf1cwmxmdzfqmfhrkqdxb5spf21ylgl2bidswhzjrqhwf35c9qf")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-native-optimization + (lambda _ + (substitute* "setup.py" + ((", '-march=native'") ""))))))) (propagated-inputs `(("python-numpy" ,python-numpy))) (native-inputs From 9f6f05aa7bf5f186b6e8fed8e0336be3f8dfd3a3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Nov 2021 14:54:40 +0100 Subject: [PATCH 005/234] gnu: emacs-corfu: Update to 0.15. * gnu/packages/emacs-xyz.scm (emacs-corfu): 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 113471ae14..01cf6bef0f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2943,7 +2943,7 @@ (define-public emacs-citeproc-el (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.14") + (version "0.15") (source (origin (method git-fetch) @@ -2952,7 +2952,7 @@ (define-public emacs-corfu (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0y40vnd227xjzds6zh85gplkiqa387b9y0925g5l01gz7hk2z17r")))) + (base32 "0crk5dryaqqj36fjcsxi0gd924125p0yghvg5anwj38zjqg1rqm9")))) (build-system emacs-build-system) (home-page "https://github.com/minad/corfu") (synopsis "Completion overlay region function") From d14f0063558498ff291a16ffdeeac68ac048c74a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Nov 2021 14:59:33 +0100 Subject: [PATCH 006/234] gnu: emacs-vertico: Update to 0.16. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 0.16. --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 01cf6bef0f..9be5c26430 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29727,7 +29727,7 @@ (define-public emacs-ivy-avy (define-public emacs-vertico (package (name "emacs-vertico") - (version "0.15") + (version "0.16") (source (origin (method git-fetch) @@ -29736,7 +29736,7 @@ (define-public emacs-vertico (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "059mj7x9iisjl2cdc1ggqd3racfs42yf0qqk0va9c857qgscrn26")))) + (base32 "1w5i8qmh3sivqqaq3zygx1fw16s56p4nwm22d33j6inn7l9n5zsm")))) (build-system emacs-build-system) (arguments `(#:phases @@ -29748,8 +29748,7 @@ (define-public emacs-vertico (let ((el-files (find-files "./extensions" ".*\\.el$"))) (for-each (lambda (f) (rename-file f (basename f))) - el-files)) - #t))))) + el-files))))))) (native-inputs `(("texinfo" ,texinfo))) (home-page "https://github.com/minad/vertico") From 8ae8c327dd3def20ec9517b0eef28b13c6f9ee30 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Nov 2021 15:00:53 +0100 Subject: [PATCH 007/234] gnu: emacs-csharp-mode: Update to 1.1.0. * gnu/packages/emacs-xyz.scm (emacs-csharp-mode): Update to 1.1.0. --- 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 9be5c26430..09d6c77b17 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13819,7 +13819,7 @@ (define-public emacs-boon (define-public emacs-csharp-mode (package (name "emacs-csharp-mode") - (version "1.0.2") + (version "1.1.0") (source (origin (method git-fetch) @@ -13828,7 +13828,7 @@ (define-public emacs-csharp-mode (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g")))) + (base32 "0xadchhbfikw2vac6kqkmdjjixhybxqqf99cpl089cga9sjc7i5p")))) (build-system emacs-build-system) (home-page "https://github.com/josteink/csharp-mode") (synopsis "Major mode for C# code") From c3931a5454475a940983e80066a3c835cc07f66e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Nov 2021 15:06:30 +0100 Subject: [PATCH 008/234] gnu: fet: Update to 6.2.2. * gnu/packages/education.scm (fet): Update to 6.2.2. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4f4de1a834..b864ac6c76 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -653,7 +653,7 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "6.1.8") + (version "6.2.2") (source (origin (method url-fetch) @@ -662,7 +662,7 @@ (define-public fet (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "16m20vbhv8i7saxqb731bhds1f86d6x1f935j3ivg357805fqzll")))) + (base32 "1x8m543n88iqprh4zccx1zcfm20balmh0h6syrbv03cszmkvfw07")))) (build-system gnu-build-system) (arguments `(#:phases From 21357224bc1f450931fb3a64fe6d06f9d1137b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Nov 2021 15:39:06 +0100 Subject: [PATCH 009/234] import: texlive: Load (gnu packages tex) dynamically. Fixes a bug whereby 'guix pull' would fail with this guix-extra.drv build failure: ice-9/eval.scm:163:9: ERROR: 1. &formatted-message: format: "~a: patch not found\n" arguments: ("nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch") Reported by ekaitz on #guix. Regression introduced in 3b1a12c5bff5a0c108284d19a6982bdf663bbceb. * guix/import/texlive.scm: Autoload (gnu packages tex). fixlet --- guix/import/texlive.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8677caee59..d0307ae944 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -38,7 +38,6 @@ (define-module (guix import texlive) #:use-module (guix upstream) #:use-module (guix packages) #:use-module (guix build-system texlive) - #:use-module (gnu packages tex) #:export (texlive->guix-package texlive-recursive-import)) @@ -111,6 +110,12 @@ (define (guix-name name) name))) (define (tlpdb-file) + (define texlive-bin + ;; Resolve this variable lazily so that (gnu packages ...) does not end up + ;; in the closure of this module. + (module-ref (resolve-interface '(gnu packages tex)) + 'texlive-bin)) + (with-store store (run-with-store store (mlet* %store-monad From 71b24abeb2acff7935a731defdc3275fbec7fa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Nov 2021 15:41:05 +0100 Subject: [PATCH 010/234] import: texlive: Remove leftover 'pk'. * guix/import/texlive.scm (files->directories): Remove leftover 'pk' call. --- guix/import/texlive.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index d0307ae944..e22823e807 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -197,12 +197,11 @@ (define tlpdb (loop all current #false)))))))))))) (define (files->directories files) - (pk 'f->d - (map (cut string-join <> "/" 'suffix) - (delete-duplicates (map (lambda (file) - (drop-right (string-split file #\/) 1)) - files) - equal?)))) + (map (cut string-join <> "/" 'suffix) + (delete-duplicates (map (lambda (file) + (drop-right (string-split file #\/) 1)) + files) + equal?))) (define (tlpdb->package name) (and-let* ((data (assoc-ref (tlpdb) name)) From 99084abd80d7c81e83263ffc6fd3699aeb8899c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Nov 2021 17:48:18 +0200 Subject: [PATCH 011/234] gnu: xfig: Update to 3.2.8b. * gnu/packages/xfig.scm (xfig): Update to 3.2.8b. [native-inputs]: Add ghostscript. --- gnu/packages/xfig.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index c3d02619b4..4dbde6356c 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages xfig) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages xorg) #:use-module (gnu packages image) #:use-module (gnu packages compression)) @@ -32,7 +34,7 @@ (define-module (gnu packages xfig) (define-public xfig (package (name "xfig") - (version "3.2.7a") + (version "3.2.8b") (source (origin (method url-fetch) @@ -40,11 +42,12 @@ (define-public xfig name "-" version ".tar.xz")) (sha256 (base32 - "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa")))) + "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")))) (build-system gnu-build-system) (native-inputs ;; For tests. - `(("desktop-file-utils" ,desktop-file-utils))) + `(("desktop-file-utils" ,desktop-file-utils) + ("ghostscript" ,ghostscript))) (inputs `(("libxaw3d" ,libxaw3d) ("libjpeg" ,libjpeg-turbo) From 948137b62a293c6d828e317178728b7f20de12dc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 15 Nov 2021 13:57:18 +0000 Subject: [PATCH 012/234] gnu: Add emacs-vala-mode. * gnu/packages/emacs-xyz (emacs-vala-mode): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 09d6c77b17..5ee9f23385 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13839,6 +13839,52 @@ (define-public emacs-csharp-mode using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") (license license:gpl3+))) +(define-public emacs-vala-mode + ;; Upstream has no tagged release. + (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f") + (revision "0")) + (package + (name "emacs-vala-mode") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrthomas/vala-mode") + (commit commit))) + (sha256 + (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0")))) + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-multiline-support + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "vala-mode.el") + (emacs-batch-edit-file "vala-mode.el" + '(progn + (require 'thingatpt) ;; beginning-of-thing, end-of-thing + (goto-char (point-min)) + (save-excursion + (re-search-forward ";; Support multiline strings") + (goto-char (match-beginning 0)) + (kill-sexp) + (insert ";; FIXME: Support multiline strings +(c-lang-defconst c-multiline-string-start-char vala nil)")) + (save-excursion + (re-search-forward "(defcustom vala-multiline-strings") + (goto-char (match-beginning 0)) + (insert ";; FIXME: Support multiline strings\n") + (comment-region (beginning-of-thing 'sexp) + (end-of-thing 'sexp))) + (basic-save-buffer)))))))) + (home-page "https://github.com/rrthomas/vala-mode") + (synopsis "Vala mode for Emacs") + (description + "This package provides a major mode for editing .vala and .vapi files +in Emacs.") + (license license:gpl2+)))) + (define-public emacs-php-mode (package (name "emacs-php-mode") From 41c8ee1b50ef096683d1542008de28e1b7e14891 Mon Sep 17 00:00:00 2001 From: phodina Date: Wed, 17 Nov 2021 12:25:01 +0000 Subject: [PATCH 013/234] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. * gnu/packages/fonts (font-adobe-source-code-pro): Update to 2.032R-ro-1.052R-it-1.012R-VAR. [commit]: Adjust version rewriting regexp accordingly. Signed-off-by: Liliana Marie Prikler --- gnu/packages/fonts.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..c3ad57f203 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -975,7 +975,7 @@ (define-public font-hack (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") - (version "2.030R-ro-1.050R-it") + (version "2.032R-ro-1.052R-it-1.012R-VAR") (source (origin (method git-fetch) @@ -984,10 +984,12 @@ (define-public font-adobe-source-code-pro (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and italic ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post)))) + #f "((R-ro)|(R-it))(-)" version + 'pre 1 "/" 'post + )))) (file-name (git-file-name name version)) (sha256 - (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) + (base32 "1lqchm8z0ah5y675ycmciqvr8y1v1gcj22ysfs443gm291vy0z4v")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis From 7850856591e91850237e163ba9d39509ced718ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 16:12:28 +0000 Subject: [PATCH 014/234] gnu: c-blosc: Build with external libraries and without AVX2. * gnu/packages/compression.scm (c-blosc)[inputs]: Add lz4, snappy, zlib, and zstd. [arguments]: Disable building with AVX2 instructions; prefer our compression packages over bundled sources. --- gnu/packages/compression.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3098230bd5..0a993d1550 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2621,6 +2621,18 @@ (define-public c-blosc (base32 "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70")))) (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DDEACTIVATE_AVX2=ON" + "-DPREFER_EXTERNAL_LZ4=ON" + "-DPREFER_EXTERNAL_SNAPPY=ON" + "-DPREFER_EXTERNAL_ZLIB=ON" + "-DPREFER_EXTERNAL_ZSTD=ON"))) + (inputs + `(("lz4" ,lz4) + ("snappy" ,snappy) + ("zlib" ,zlib) + ("zstd:lib" ,zstd "lib"))) (home-page "https://blosc.org") (synopsis "Blocking, shuffling and lossless compression library") (description From 30474f25d0c85c2604003ffa7bcef396f58d97a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 17:52:18 +0000 Subject: [PATCH 015/234] gnu: python-numcodecs: Unbundle c-blosc. * gnu/packages/python-xyz.scm (python-numcodecs)[source]: Add snippet to remove bundled c-blosc sources and pre-built Cython files. [arguments]: Add build phase 'disable-avx2 and 'unbundle; replace 'check phase to run pytest; disable tests. [inputs]: Add c-blosc, lz4, zlib, and zstd. [native-inputs]: Add python-cython. --- gnu/packages/python-xyz.scm | 44 +++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4623c7b3b2..0639f3680b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22098,13 +22098,53 @@ (define-public python-numcodecs (uri (pypi-uri "numcodecs" version)) (sha256 (base32 - "0kbfr8pl3x9glsypbq8hzim003f16ml1b1cvgrh4w1sdvgal6j7g")))) + "0kbfr8pl3x9glsypbq8hzim003f16ml1b1cvgrh4w1sdvgal6j7g")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "c-blosc") + (for-each delete-file '("numcodecs/blosc.c" + "numcodecs/compat_ext.c" + "numcodecs/lz4.c" + "numcodecs/vlen.c" + "numcodecs/zstd.c")))))) (build-system python-build-system) + (arguments + `(#:tests? #false ; TODO: unclear why numcodecs.* are not found + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-avx2 + (lambda _ + (setenv "DISABLE_NUMCODECS_AVX2" "1"))) + (add-after 'unpack 'unbundle + (lambda _ + (substitute* "setup.py" + (("sources=sources \\+ blosc_sources,") + "sources=sources,") + (("extra_compile_args=extra_compile_args") + "extra_compile_args=list(base_compile_args)") + (("'numcodecs.zstd',") + "'numcodecs.zstd', libraries=['zstd'], ") + (("'numcodecs.lz4',") + "'numcodecs.lz4', libraries=['lz4'], ") + (("'numcodecs.blosc',") + "'numcodecs.blosc', libraries=['blosc'], ")))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv"))))))) + (inputs + `(("c-blosc" ,c-blosc) + ("lz4" ,lz4) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-msgpack" ,python-msgpack))) (native-inputs - `(("python-pytest" ,python-pytest) + `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/zarr-developers/numcodecs") (synopsis "Buffer compression and transformation codecs") From b066c9b03da94d6b2d65ae3531ae24565622df29 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 12:09:36 -0800 Subject: [PATCH 016/234] gnu: home: services: Fix typo. * gnu/home/services.scm (compute-on-first-login-script): Fix spelling of "appropriate". --- 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 04f4ec34d1..1aeca95e5a 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -291,7 +291,7 @@ (define (compute-on-first-login-script _ gexps) (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 +XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the script by running '$HOME/.guix-home/on-first-login'"))))) (define (on-first-login-script-entry on-first-login) From ee98b30a69caf0953cf352828c361533fc5d1d0b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Nov 2021 22:11:28 +0100 Subject: [PATCH 017/234] gnu: emacs-eldev: Update to 0.10. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 0.10. [arguments]: Enable some tests, disable some others. Remove #t at the end of phases. --- gnu/packages/emacs-xyz.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5ee9f23385..89c86519da 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17631,16 +17631,16 @@ (define-public emacs-peg (define-public emacs-eldev (package (name "emacs-eldev") - (version "0.9.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/doublep/eldev") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jfj4f5w20qd12k6ygv0jazn2x9pxjrmqmlmibppc4ybrhhgmg0s")))) + (version "0.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/doublep/eldev") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y1gc37vn8k1yhp6b069sg8hdh1bn22icdqn4b28c2k5iiw9g7gi")))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -17650,14 +17650,13 @@ (define-public emacs-eldev (add-after 'unpack 'prepare-for-tests (lambda _ (setenv "ELDEV_LOCAL" (getcwd)) - (make-file-writable - "test/project-i/project-i-autoloads.el") - #t)) + (make-file-writable "test/project-i/project-i-autoloads.el"))) (add-after 'unpack 'skip-failing-tests ;; FIXME: 10 tests are failing. Skip them for now. (lambda _ - (substitute* '("test/init.el" "test/targets.el") - (("(targets-project-e-[34]|init-[1-8]).*" line) + (delete-file "test/upgrade-self.el") + (substitute* "test/init.el" + (("init-[1-8].*" line) (string-append line "(skip-unless nil)\n"))))) (add-after 'install 'install-eldev-executable ;; This constructs the eldev executable from templates and @@ -17674,8 +17673,7 @@ (define-public emacs-eldev ;; eldev doesn't try to bootstrap itself from MELPA when ;; invoked. (("export ELDEV_EMACS.*" all) - (string-append "export ELDEV_LOCAL=" site-lisp "\n" all))) - #t)))))) + (string-append "export ELDEV_LOCAL=" site-lisp "\n" all))))))))) (native-inputs `(("texinfo" ,texinfo))) ;for tests (home-page "https://github.com/doublep/eldev/") From 6bffa13040710fd232d6c3b9a2886a1d136a6363 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 13:17:18 -0800 Subject: [PATCH 018/234] gnu: perl-log-message: Fix typo. * gnu/packages/perl.scm (perl-log-message)[description]: Correctly use "lets you". --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5d4843d39a..838e942cca 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5916,7 +5916,7 @@ (define-public perl-log-message throughout programs and projects. Every message will be logged with stacktraces, timestamps and so on. You can use built-in handlers immediately, or after the fact when you inspect the error stack. It -is highly configurable and let's you even provide your own handlers +is highly configurable and lets you even provide your own handlers for dealing with messages.") (license (package-license perl)))) From 4ace6455063297e6de84a9a2477150a6ce9416d8 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Thu, 4 Nov 2021 07:48:09 +0100 Subject: [PATCH 019/234] services: docker: Add 'environment-variables' configuration field. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/docker.scm (docker-configuration): Add the field (docker-shepherd-service): Pass the list of defined variables to make-forkexec-constructor. * doc/guix.texi (Miscellaneous Services): Update doc. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 11 +++++++++++ gnu/services/docker.scm | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 89a970908d..158261e373 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33229,6 +33229,17 @@ Enable or disable debug output. @item @code{enable-iptables?} (default @code{#t}) Enable or disable the addition of iptables rules. +@item @code{environment-variables} (default: @code{()}) +List of environment variables to set for @command{dockerd}. + +This must be a list of strings where each string has the form +@samp{@var{key}=@var{value}} as in this example: + +@lisp +(list "LANGUAGE=eo:ca:eu" + "TMPDIR=/tmp/dockerd") +@end lisp + @end table @end deftp diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index ef551480aa..c4d48676b5 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -62,6 +62,9 @@ (define-configuration docker-configuration (enable-iptables? (boolean #t) "Enable addition of iptables rules (enabled by default).") + (environment-variables + (list '()) + "Environment variables to set for dockerd") (no-serialization)) (define %docker-accounts @@ -102,6 +105,7 @@ (define (docker-shepherd-service config) (let* ((docker (docker-configuration-docker config)) (enable-proxy? (docker-configuration-enable-proxy? config)) (enable-iptables? (docker-configuration-enable-iptables? config)) + (environment-variables (docker-configuration-environment-variables config)) (proxy (docker-configuration-proxy config)) (debug? (docker-configuration-debug? config))) (shepherd-service @@ -132,6 +136,8 @@ (define (docker-shepherd-service config) (if #$enable-iptables? "--iptables" "--iptables=false")) + #:environment-variables + (list #$@environment-variables) #:pid-file "/var/run/docker.pid" #:log-file "/var/log/docker.log")) (stop #~(make-kill-destructor))))) From 77483d6b61ca7a706acb07fd9e7b6ee269a93562 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 8 Nov 2021 11:02:06 +0100 Subject: [PATCH 020/234] =?UTF-8?q?gnu:=20perl-inline-c:=20Patch=20paths?= =?UTF-8?q?=20to=20=E2=80=98make=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl-inline-c)[arguments]<#:phases>{patch-paths}: New phase. Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 838e942cca..5973805a75 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5399,6 +5399,17 @@ (define-public perl-inline-c (base32 "1b3sr39813di3j1kwbgn1xq2z726rhjjdw809ydzgmshj26jb1gi")))) (build-system perl-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((make (assoc-ref inputs "make"))) + (substitute* "lib/Inline/C.pm" + (("'\"make\"'") + (string-append "'\"" make "/bin/make\"'")) + (("'\"make install\"'") + (string-append "'\"" make "/bin/make install\"'"))))))))) (native-inputs `(("perl-file-copy-recursive" ,perl-file-copy-recursive) ("perl-file-sharedir-install" ,perl-file-sharedir-install) From 5a6af48408ecfa3c468194ef7b0e67f3e87998b0 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 9 Nov 2021 02:30:01 -0500 Subject: [PATCH 021/234] gnu: shellcheck: Update to 0.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (shellcheck): Update to 0.8.0. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index fe7dd853b2..5dcf6c1cb2 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -828,7 +828,7 @@ (define-public scroll (define-public shellcheck (package (name "shellcheck") - (version "0.7.2") + (version "0.8.0") (source (origin (method url-fetch) @@ -836,7 +836,7 @@ (define-public shellcheck "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" version ".tar.gz")) (sha256 - (base32 "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz")) + (base32 "05jlapp4m997w36h2wszdxz9gvczdczaylypsbn14jqpb650w232")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (arguments From 538a75534156571472c6c936a74f7f026ced72e7 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 9 Nov 2021 17:30:07 +0100 Subject: [PATCH 022/234] gnu: xfce4-cpugraph-plugin: Update to 1.2.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-cpugraph-plugin): Update to 1.2.5. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c279ac9355..4e54f6e20a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1396,7 +1396,7 @@ (define-public xfce4-volumed-pulse (define-public xfce4-cpugraph-plugin (package (name "xfce4-cpugraph-plugin") - (version "1.2.3") + (version "1.2.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1405,7 +1405,7 @@ (define-public xfce4-cpugraph-plugin "/xfce4-cpugraph-plugin-" version ".tar.bz2")) (sha256 (base32 - "13302psv0fzg2dsgadr8j6mb06k1bsa4zw6hxmb644vqlvcwq37v")))) + "1c51qf93lr6kr2g4nil21rj1h3h5kp3k50n9hcxvcy9wz3bxpxn2")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From 7fe5742e03c9282f9706aac309f966451c7c4364 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 9 Nov 2021 17:38:34 +0100 Subject: [PATCH 023/234] gnu: ristretto: Update to 0.12.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (ristretto): Update to 0.12.0. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4e54f6e20a..a74f32f670 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1077,7 +1077,7 @@ (define-public xfce4-power-manager (define-public ristretto (package (name "ristretto") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/ristretto/" @@ -1085,7 +1085,7 @@ (define-public ristretto "ristretto-" version ".tar.bz2")) (sha256 (base32 - "08w8nw6cl8kpvjnp7dxgpqlmi3s73amhrb7l0sbzmjy82ba30zl7")))) + "008h8mlq82nwxb7kc8m8d6a51rwl2i9fgv4v6k5w30va46l2s0s7")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From 609066e996927b29a12c39e985144c56f31f3782 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 9 Nov 2021 17:43:19 +0100 Subject: [PATCH 024/234] gnu: xfce4-whiskermenu-plugin: Update to 2.6.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.6.1. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a74f32f670..7a4fca4f43 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -575,7 +575,7 @@ (define-public xfce4-pulseaudio-plugin (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) @@ -583,7 +583,7 @@ (define-public xfce4-whiskermenu-plugin "xfce4-whiskermenu-plugin/" (version-major+minor version) "/" "xfce4-whiskermenu-plugin-" version ".tar.bz2")) (sha256 - (base32 "0rnlhcfsbjj0n8m84jgqihp783hrkjdjfapqr7ia53mr0fjgcw9j")))) + (base32 "0wpcc9i505mh6vphg27ph43dw4n3z59mwy39416yzmw325q04kl5")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) From f5fc395ab4cc79d52a4e316b907e780a5a7adb30 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 7 Nov 2021 12:13:32 +0100 Subject: [PATCH 025/234] =?UTF-8?q?scripts:=20home:=20Make=20=E2=80=98guix?= =?UTF-8?q?=20home=20import=E2=80=99=20write=20home-configuration.scm.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/home.scm (process-command): Populate ‘home-configuration.scm’ in the destination directory instead of printing to stdout. * doc/guix.texi (Declaring the Home Environment): Adjust accordingly. (Invoking guix home): Likewise. Suggested-by: Ludovic Courtès Co-authored-by: Ludovic Courtès --- doc/guix.texi | 34 +++++++--------------------------- guix/scripts/home.scm | 10 +++++++++- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 158261e373..59ceb4477a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35933,9 +35933,8 @@ The @command{guix home import} command reads some of the ``dot files'' such as @file{~/.bashrc} found in your home directory and copies them to the given directory, @file{~/src/guix-config} in this case; it also reads the contents of your profile, @file{~/.guix-profile}, and, based -on that, it outputs a Home configuration that resembles your current -configuration. You can dump that configuration to a file and you're -ready to go! +on that, it populates @file{~/src/guix-config/home-configuration.scm} +with a Home configuration that resembles your current configuration. A simple setup can include Bash and a custom text configuration, like in the example below. Don't be afraid to declare home environment parts, @@ -36667,33 +36666,14 @@ $ guix home list-generations 10d @item import Generate a @dfn{home environment} from the packages in the default profile and configuration files found in the user's home directory. The -configuration files will be copied to the specified directory. Note -that not every home service that exists is supported (@pxref{Home -Services}). +configuration files will be copied to the specified directory, and a +@file{home-configuration.scm} will be populated with the home +environment. Note that not every home service that exists is supported +(@pxref{Home Services}). @example $ guix home import ~/guix-config -;; This "home-environment" file can be passed to 'guix home reconfigure' -;; to reproduce the content of your profile. This is "symbolic": it only -;; specifies package names. To reproduce the exact same profile, you also -;; need to capture the channels being used, as returned by "guix describe". -;; See the "Replicating Guix" section in the manual. - -(use-modules - (gnu home) - (gnu packages) - (gnu home services shells)) - -(home-environment - (packages - (map specification->package - (list "glibc-locales" "nss-certs" "nss"))) - (services - (list (service - home-bash-service-type - (home-bash-configuration - (bashrc - (list (local-file "/home/charlie/guix-config/.bashrc")))))))) +guix home: '/home/alice/guix-config' populated with all the Home configuration files @end example @end table diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 3f48b98ed4..afc7d8b39c 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -274,7 +274,15 @@ (define-syntax-rule (with-store* store exp ...) (_ (leave (G_ "wrong number of arguments~%")))))) (unless (file-exists? destination) (mkdir-p destination)) - (import-manifest manifest destination (current-output-port)))) + (call-with-output-file + (string-append destination "/home-configuration.scm") + (cut import-manifest manifest destination <>)) + (info (G_ "'~a' populated with all the Home configuration files~%") + destination) + (display-hint (format #f (G_ "\ +Run @command{guix home reconfigure ~a/home-configuration.scm} to effectively +deploy the home environment described by these files.\n") + destination)))) ((describe) (match (generation-number %guix-home) (0 From cb768f38604886da0feb10db6af391fb0d055d33 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 12 Nov 2021 17:51:20 -0500 Subject: [PATCH 026/234] gnu: tidy-html: Update to 5.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (tidy-html): Update to 5.8.0. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9cdbc31459..964f312ba3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6147,7 +6147,7 @@ (define-public xinetd (define-public tidy-html (package (name "tidy-html") - (version "5.7.28") + (version "5.8.0") (source (origin (method git-fetch) @@ -6157,7 +6157,7 @@ (define-public tidy-html (file-name (git-file-name name version)) (sha256 (base32 - "01k5sqwgcsr26i8031v1yr2r8qcy9a5w7sj800660haszgfbjz2f")))) + "1vd50q6xqxvidaclinsm89p6r0494wj72j1gpk32vkkhhx15cddz")))) (build-system cmake-build-system) (outputs '("out" "static")) ; 1.3MiB of .a files From fa67d6eef67092aff355d769a38d8bb46b4b8c48 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Mon, 15 Nov 2021 14:10:20 +0100 Subject: [PATCH 027/234] doc: Improve wording for param spec of `./configure`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/contributing.texi (Running Guix Before It Is Installed): Writing "Do . But it won't work unless ..." is a bad practice. Signed-off-by: Ludovic Courtès --- doc/contributing.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index db0f836157..aa6bfc2e65 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -120,12 +120,12 @@ export ACLOCAL_PATH=/usr/share/aclocal @xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more information. -Then, run @command{./configure} as usual. Make sure to pass -@code{--localstatedir=@var{directory}} where @var{directory} is the -@code{localstatedir} value used by your current installation (@pxref{The -Store}, for information about this), usually @file{/var}. Note that you -will probably not run @command{make install} at the end (you don't have -to) but it's still important to pass the right @code{localstatedir}. +Then, run @command{./configure --localstatedir=@var{directory}}, where +@var{directory} is the @code{localstatedir} value used by your current +installation (@pxref{The Store}, for information about this), usually +@file{/var}. Note that you will probably not run @command{make install} +at the end (you don't have to) but it's still important to pass the +right @code{localstatedir}. Finally, you have to invoke @code{make && make check} to build Guix and run the tests (@pxref{Running the Test Suite}). If anything fails, take From 346d2f64889b0c82111e790e999bf6c754027e04 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 17 Nov 2021 14:43:47 +0000 Subject: [PATCH 028/234] diagnostics: Add syntax to capture arguments' syntax-properties. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/diagnostics.scm (define-with-syntax-properties): Add it. Signed-off-by: Ludovic Courtès --- guix/diagnostics.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm index 6a792febd4..337a73c1a2 100644 --- a/guix/diagnostics.scm +++ b/guix/diagnostics.scm @@ -54,7 +54,9 @@ (define-module (guix diagnostics) condition-fix-hint guix-warning-port - program-name)) + program-name + + define-with-syntax-properties)) ;;; Commentary: ;;; @@ -331,3 +333,37 @@ (define guix-warning-port (define program-name ;; Name of the command-line program currently executing, or #f. (make-parameter #f)) + + +(define-syntax define-with-syntax-properties + (lambda (x) + "Define BINDING to be a syntax form replacing each VALUE-IDENTIFIER and +SYNTAX-PROPERTIES-IDENTIFIER in body by the syntax and syntax-properties, +respectively, of each ensuing syntax object." + (syntax-case x () + ((_ (binding (value-identifier syntax-properties-identifier) + ...) + body ...) + (and (and-map identifier? #'(value-identifier ...)) + (and-map identifier? #'(syntax-properties-identifier ...))) + #'(define-syntax binding + (lambda (y) + (with-ellipsis ::: + (syntax-case y () + ((_ value-identifier ...) + (with-syntax ((syntax-properties-identifier + #`'#,(datum->syntax y + (syntax-source + #'value-identifier))) + ...) + #'(begin body ...))) + (_ + (syntax-violation #f (format #f + "Expected (~a~{ ~a~})" + 'binding + '(value-identifier ...)) + y))))))) + (_ + (syntax-violation #f "Expected a definition of the form \ +(define-with-syntax-properties (binding (value syntax-properties) \ +...) body ...)" x))))) From 7c4142628a397f7863f346635591dbe92b667b45 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 17 Nov 2021 14:43:48 +0000 Subject: [PATCH 029/234] gnu: system: Improve location of some configuration warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/bootloader.scm (%warn-target-field-deprecation): Remove it. * gnu/bootloader.scm (warn-target-field-deprecation): Use define-with-syntax-properties. * gnu/system.scm (ensure-setuid-program-list): Ditto. Also rename the 'location' variable to 'properties'. Signed-off-by: Ludovic Courtès --- gnu/bootloader.scm | 16 +++++++--------- gnu/system.scm | 11 ++++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index d1c72c0c85..9cf5457873 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -183,8 +183,13 @@ (define-record-type* ;; The record contains bootloader independant ;; configuration used to fill bootloader configuration file. -(define-syntax-rule (warn-target-field-deprecation value) - (%warn-target-field-deprecation value (current-source-location))) +(define-with-syntax-properties (warn-target-field-deprecation + (value properties)) + (when value + (warning (source-properties->location properties) + (G_ "the 'target' field is deprecated, please use 'targets' \ +instead~%"))) + value) (define-record-type* bootloader-configuration make-bootloader-configuration @@ -213,13 +218,6 @@ (define-record-type* (serial-speed bootloader-configuration-serial-speed ;integer | #f (default #f))) -(define (%warn-target-field-deprecation value location) - (when value - (warning (source-properties->location location) - (G_ "the 'target' field is deprecated, please use 'targets' \ -instead~%"))) - value) - (define-deprecated (bootloader-configuration-target config) bootloader-configuration-targets (%bootloader-configuration-target config)) diff --git a/gnu/system.scm b/gnu/system.scm index 17653682c5..73e6b58f2a 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1073,16 +1073,17 @@ (define (operating-system-environment-variables os) ;; TODO: Remove when glibc@2.23 is long gone. ("GUIX_LOCPATH" . "/run/current-system/locale"))) -(define-syntax-rule (ensure-setuid-program-list lst) - "Ensure LST is a list of records and warn otherwise." - (%ensure-setuid-program-list lst (current-source-location))) +;; Ensure LST is a list of records and warn otherwise. +(define-with-syntax-properties (ensure-setuid-program-list (lst properties)) + (%ensure-setuid-program-list lst properties)) -(define (%ensure-setuid-program-list lst location) +;; We want to be able to use defines, so define a procedure. +(define (%ensure-setuid-program-list lst properties) (define warned? #f) (define (warn-once) (unless warned? - (warning (source-properties->location location) + (warning (source-properties->location properties) (G_ "representing setuid programs with file-like objects is \ deprecated; use 'setuid-program' instead~%")) (set! warned? #t))) From b737607c549765da0a89ae362d1294379884a0dd Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sat, 6 Nov 2021 05:45:12 +0000 Subject: [PATCH 030/234] gnu: rcs: Install rcsfreeze. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (rcs): Install rcsfreeze. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8b5861068..739bb28355 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2049,6 +2049,14 @@ (define-public rcs "1if5pa4iip2p70gljm54nggfdnsfjxa4cqz8fpj07lvsijary39s")) (patches (search-patches "rcs-5.10.0-no-stdin.patch")))) (build-system gnu-build-system) + (arguments `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-rcsfreeze + (lambda* (#:key outputs #:allow-other-keys) + (chmod "src/rcsfreeze" #o755) + (install-file + "src/rcsfreeze" + (string-append (assoc-ref outputs "out") "/bin"))))))) (native-inputs `(("ed" ,ed))) (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") From 94fbcf7b78e136b7c53c10c3ecfce8a5a6768478 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Tue, 16 Nov 2021 01:54:34 +0000 Subject: [PATCH 031/234] gnu: Add rcs-blame. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (rcs-blame): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 739bb28355..10487c6939 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 François J. ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 jgart +;;; Copyright © 2021 Foo Chuan Wei ;;; ;;; This file is part of GNU Guix. ;;; @@ -2068,6 +2069,27 @@ (define-public rcs machine.") (license license:gpl3+))) +(define-public rcs-blame + (package + (name "rcs-blame") + (version "1.3.1-20210207") + (source (origin + (method url-fetch) + (uri (string-append + "https://invisible-mirror.net/archives/rcs-blame/blame-" + version ".tgz")) + (sha256 + (base32 + "1j0brsvdx3hlbwchddafh8r2xmxv5vg4ahpd68v4bb9xhcq6pcih")))) + (build-system gnu-build-system) + (home-page "https://invisible-island.net/rcs-blame/rcs-blame.html") + (synopsis "Display the last modification for each line in an RCS file") + (description + "@code{blame} outputs an annotated revision from each RCS file. An +annotated RCS file describes the revision and date in which each line was +added to the file, and the author of each line.") + (license license:gpl2+))) + (define-public cvs (package (name "cvs") From b432cd11899e5ff9c94c8ed6145d49f697bcb1a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Nov 2021 11:34:00 +0100 Subject: [PATCH 032/234] gnu: libtorrent-rasterbar: Update to 1.2.14. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.2.14. [source](uri): Adjust tag name. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Adjust accordingly. Override the check phase to fake the time for one test, and disable another. [native-inputs]: Add LIBFAKETIME. --- gnu/packages/bittorrent.scm | 44 +++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index e17e04dcfe..e014136c44 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ (define-module (gnu packages bittorrent) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system glib-or-gtk) @@ -42,6 +44,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) @@ -419,30 +422,43 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.8") + (version "1.2.14") (source (origin (method url-fetch) (uri (string-append "https://github.com/arvidn/libtorrent/" - "releases/download/libtorrent-" version "/" + "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "1phn4klzvfzvidv5g566pnrrxj8l0givpy6s4r17d45wznqxc006")))) - (build-system gnu-build-system) + (base32 "0gwm4w7337ykh5lfnspapnnz6a35g7yay3wnj126s8s5kcsvy9wy")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-boost-libdir=" - (assoc-ref %build-inputs "boost") - "/lib") - "--enable-python-binding" - "--enable-tests") - #:make-flags (list - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")))) + `(#:cmake ,cmake ;3.17 or later + #:configure-flags '("-Dpython-bindings=ON" + "-Dbuild_tests=ON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (let ((disabled-tests + ;; test_upnp requires a non-localhost IPv4 interface. + '("test_upnp"))) + (when tests? + ;; test_ssl relies on bundled TLS certificates with a fixed + ;; expiry date. To ensure succesful builds in the future, + ;; fake the time to be roughly that of the release. + (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + (invoke "faketime" "2021-06-01" + "ctest" + "--exclude-regex" (string-join disabled-tests "|") + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))))))) (inputs `(("boost" ,boost) ("openssl" ,openssl))) - (native-inputs `(("python" ,python-wrapper) + (native-inputs `(("libfaketime" ,libfaketime) + ("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") From e3f70c947ff6c94a7d7f96028139434eb3d00b16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Nov 2021 23:55:25 +0100 Subject: [PATCH 033/234] gnu: ungoogled-chromium: Update to 96.0.4664.45-0. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M96. (%chromium-version): Set to 96.0.4664.45. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index f55379bbf0..e51e7e7234 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -150,6 +150,7 @@ (define %preserved-third-party-files "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 "third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0 + "third_party/distributed_point_functions" ;ASL2.0 "third_party/dom_distiller_js" ;BSD-3 "third_party/eigen3" ;MPL2.0 "third_party/emoji-segmenter" ;ASL2.0 @@ -268,7 +269,6 @@ (define %preserved-third-party-files "third_party/tflite" ;ASL2.0 "third_party/tflite/src/third_party/eigen3" ;MPL2.0 "third_party/tflite/src/third_party/fft2d" ;ASL2.0 - "third_party/tflite-support" ;ASL2.0 "third_party/ukey2" ;ASL2.0 "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 @@ -336,7 +336,7 @@ (define* (debian-patch name hash #:optional (revision %debian-revision)) (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "95.0.4638.69") +(define %chromium-version "96.0.4664.45") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %arch-revision "db2157b84924ce84201a8245e68a02f7d55f6491") (define %debian-revision "debian/90.0.4430.85-1") @@ -367,7 +367,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj")))) + "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3")))) (define %guix-patches (list (local-file @@ -502,7 +502,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq")) + "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) From f41fbda9db269fb78d16384c8f42c0c28004ccd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Nov 2021 22:10:13 +0100 Subject: [PATCH 034/234] gnu: sg3-utils: Update to 1.47. * gnu/packages/scsi.scm (sg3-utils): Update to 1.47. --- gnu/packages/scsi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 4c3bfd7e33..e00b3ff004 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -27,14 +27,14 @@ (define-module (gnu packages scsi) (define-public sg3-utils (package (name "sg3-utils") - (version "1.46") + (version "1.47") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "185rlxppnsmi6q7garfhglmw31gji2ff24xg2yjk3klk1fqnihjr")))) + "1ckj2kjcs23lbjfyl5mz2rb0aylnyq13yghg0bdv1n7dbywcmc6x")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") From 90c524c94e19f05ab3cbd9f99ddf913b17481be7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Nov 2021 22:10:48 +0100 Subject: [PATCH 035/234] gnu: sg3-utils: Omit static library. * gnu/packages/scsi.scm (sg3-utils)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/scsi.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index e00b3ff004..12a623776e 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -36,6 +36,9 @@ (define-public sg3-utils (base32 "1ckj2kjcs23lbjfyl5mz2rb0aylnyq13yghg0bdv1n7dbywcmc6x")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static"))) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") (description From 407594d21bf26af513d6cdb989ef4733d17470c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Nov 2021 22:41:18 +0100 Subject: [PATCH 036/234] gnu: foo2zjs: Use archived home page. * gnu/packages/cups.scm (foo2zjs)[home-page]: Link to the Web Archive'd URL. --- gnu/packages/cups.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 76958efe8a..b2fe3e05c1 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -852,7 +852,9 @@ (define-public foo2zjs (native-inputs `(("bc" ,bc) ("groff" ,groff))) - (home-page "http://foo2zjs.rkkda.com/") + ;; The domain has expired and no one has meaningfully taken up the torch. + (home-page (string-append "https://web.archive.org/web/20210129024712/" + "http://foo2zjs.rkkda.com/")) (synopsis "Printer driver for ZjStream-based printers") (description "foo2zjs is a printer driver for printers that use the Zenographics From 747403aca5275e550b497c41de2adb1f7aab47a0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:35:18 -0800 Subject: [PATCH 037/234] gnu: perl-test-nowarnings: Fix typo. * gnu/packages/perl-check.scm (perl-test-nowarnings)[description]: Fix "This module" typo. --- gnu/packages/perl-check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 87f233a3aa..24861a785c 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1034,7 +1034,7 @@ (define-public perl-test-nowarnings (build-system perl-build-system) (synopsis "Ensure no warnings are produced while testing") (description - "This modules causes any warnings during testing to be captured and + "This module causes any warnings during testing to be captured and stored. It automatically adds an extra test that will run when your script ends to check that there were no warnings. If there were any warnings, the test will fail and output diagnostics of where, when and what the warning was, From fb1cd494d79249af037cae92c35cc195c07e7521 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:28:58 -0800 Subject: [PATCH 038/234] gnu: rust-fever-api-0.2: Fix typo. * gnu/packages/crates-io.scm (rust-fever-api-0.2)[description]: Fix "This package" typo. --- 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 9327ed5e1c..148e8cbff3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18089,7 +18089,7 @@ (define-public rust-fever-api-0.2 (home-page "https://gitlab.com/news-flash/fever_api") (synopsis "Rust implementation of the Fever API") (description - "This packages provides a Rust implementation of the Fever API.") + "This package provides a Rust implementation of the Fever API.") ;; No copyright headers in the source code. LICENSE indicates gpl3. (license license:gpl3))) From e782bb901bf23289fe6a460a61364d6c5afea4dc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:31:15 -0800 Subject: [PATCH 039/234] gnu: python-sgmllib3k: Fix typo. * gnu/packages/python-xyz.scm (python-sgmllib3k)[description]: Fix "This package" typo. --- 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 0639f3680b..17d629bcb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28032,7 +28032,7 @@ (define-public python-sgmllib3k ;; (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. + "This package 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))) From 8f6ac12fe4415cd87b177cfbda6819b128923f11 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:34:09 -0800 Subject: [PATCH 040/234] gnu: perl-test-dir: Fix typo. * gnu/packages/perl-check.scm (perl-test-dir)[description]: Fix "This module" typo. --- gnu/packages/perl-check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 24861a785c..3a324dfdd3 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -407,7 +407,7 @@ (define-public perl-test-dir (home-page "https://metacpan.org/release/Test-Dir") (synopsis "Utilities for testing directory attributes") (description - "This modules provides a collection of test utilities for directory + "This module provides a collection of test utilities for directory attributes.") (license perl-license))) From f4f93b38aa3e05be53a884b2c40fedd98229d381 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:36:42 -0800 Subject: [PATCH 041/234] gnu: perl-business-isbn: Fix typo. * gnu/packages/perl.scm (perl-business-isbn)[description]: Fix "This module" typo. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5973805a75..51654416aa 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -860,7 +860,7 @@ (define-public perl-business-isbn ("perl-mojolicious" ,perl-mojolicious))) (home-page "https://metacpan.org/release/Business-ISBN") (synopsis "Work with International Standard Book Numbers") - (description "This modules provides tools to deal with International + (description "This module provides tools to deal with International Standard Book Numbers, including ISBN-10 and ISBN-13.") (license license:artistic2.0))) From e52032ac1d8e51c08842a1f33bd77b35a204ca29 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:38:14 -0800 Subject: [PATCH 042/234] gnu: perl-business-issn: Fix typo. * gnu/packages/perl.scm (perl-business-issn)[description]: Fix "This module" typo. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 51654416aa..addaad1b0b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -879,7 +879,7 @@ (define-public perl-business-issn (build-system perl-build-system) (home-page "https://metacpan.org/release/Business-ISSN") (synopsis "Work with International Standard Serial Numbers") - (description "This modules provides tools to deal with International + (description "This module provides tools to deal with International Standard Serial Numbers.") (license (package-license perl)))) From 67900b955551b29d20fb90bcad0b38a4fe841771 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:39:20 -0800 Subject: [PATCH 043/234] gnu: perl-business-ismn: Fix typo. * gnu/packages/perl.scm (perl-business-ismn)[description]: Fix "This module" typo. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index addaad1b0b..81022accae 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -899,7 +899,7 @@ (define-public perl-business-ismn `(("perl-tie-cycle" ,perl-tie-cycle))) (home-page "https://metacpan.org/release/Business-ISMN") (synopsis "Work with International Standard Music Numbers") - (description "This modules provides tools to deal with International + (description "This module provides tools to deal with International Standard Music Numbers.") (license (package-license perl)))) From e930d4a747d319b559dacb55211764ee680c11d9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:40:41 -0800 Subject: [PATCH 044/234] gnu: perl-tie-handle-offset: Fix typo. * gnu/packages/perl.scm (perl-tie-handle-offset)[description]: Fix "This module" typo. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 81022accae..6d653be445 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10644,7 +10644,7 @@ (define-public perl-tie-handle-offset (home-page "https://metacpan.org/release/Tie-Handle-Offset") (synopsis "Special file handle that hides the beginning of a file") (description - "This modules provides a file handle that hides the beginning of a file, + "This module provides a file handle that hides the beginning of a file, by modifying the @code{seek()} and @code{tell()} calls.") (license license:asl2.0))) From 2d60af4d6d486591c5a6981659d1771b7c69781a Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 19:51:50 +0100 Subject: [PATCH 045/234] gnu: Add coq-semantics. * gnu/packages/coq.scm (coq-semantics): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index dccb9bea4c..322bdb126e 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Robin Green ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -573,6 +574,56 @@ (define-public coq-equations kernel.") (license license:lgpl2.1))) +(define-public coq-semantics + (package + (name "coq-semantics") + (version "8.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coq-community/semantics") + (commit (string-append "v" version)))) + (modules '((guix build utils))) + (snippet + '(substitute* "Makefile.coq.local" + ;; Num was part of OCaml and now external + (("-libs nums") "-use-ocamlfind -pkg num -libs num"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m5si9dsv96z92gy4xaqz8mzyz8zp7j1sp542l0wzsp5xgyfpc7i")))) + (build-system gnu-build-system) + (native-inputs + `(("coq" ,coq) + ("ocaml" ,ocaml) + ("ocamlbuild" ,ocamlbuild) + ("ocaml-findlib" ,ocaml-findlib))) + (inputs + `(("ocaml-num" ,ocaml-num))) + (arguments + `(#:tests? #f ;included in Makefile + #:make-flags (list (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/coq-community/semantics") + (synopsis "Survey of semantics styles") + (description + "This package provides a survey of programming language semantics styles, +from natural semantics through structural operational, axiomatic, and +denotational semantics, for a miniature example of an imperative programming +language. Their encoding, the proofs of equivalence of different styles, +abstract interpretation, and the proof of soundess obtained from axiomatic +semantics or abstract interpretation is done in Coq. The tools can be run +inside Coq, thus making them available for proof by reflection. Code can also +be extracted and connected to a yacc-based parser, thanks to the use of a +functor parameterized by a module type of strings. A hand-written parser is +also provided in Coq, without associated proofs.") + (license license:expat))) + (define-public coq-stdpp (package (name "coq-stdpp") From 7b93c6d77786c27171900045f62be0fce69432f7 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 19:51:51 +0100 Subject: [PATCH 046/234] gnu: coq-mathcomp: Adjust '#:make-flags'. * gnu/packages/coq.scm (coq-mathcomp)[arguments]<#:make-flags>: Set install destination. <#:phases>: Remove replace 'install. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 322bdb126e..602a2d305d 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -326,17 +326,14 @@ (define-public coq-mathcomp ("coq" ,coq))) (arguments `(#:tests? #f ; No tests. + #:make-flags (list (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'build 'chdir - (lambda _ (chdir "mathcomp") #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "-f" "Makefile.coq" - (string-append "COQLIB=" (assoc-ref outputs "out") - "/lib/coq/") - "install")))))) + (lambda _ (chdir "mathcomp") #t))))) (home-page "https://math-comp.github.io/") (synopsis "Mathematical Components for Coq") (description "Mathematical Components for Coq has its origins in the formal From 5d7d64ff8567abb32defbf00038fab789353a8d5 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 19:51:52 +0100 Subject: [PATCH 047/234] gnu: coq-autosubst: Adjust '#:make-flags'. * gnu/packages/coq.scm (coq-autosubst)[arguments]<#:make-flags>: Set install destination. <#:phases>: Remove replace 'install. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 602a2d305d..fc739a0475 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -502,16 +502,12 @@ (define-public coq-autosubst (build-system gnu-build-system) (arguments `(#:tests? #f + #:make-flags (list (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) - (invoke "make" - (string-append "COQLIB=" (assoc-ref outputs "out") - "/lib/coq/") - "install")))))) + (delete 'configure)))) (native-inputs `(("coq" ,coq))) (home-page "https://www.ps.uni-saarland.de/autosubst/") From 4423caece69f6142eeff562007ce53b9144de334 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 19:51:53 +0100 Subject: [PATCH 048/234] gnu: coq-equations: Adjust '#:make-flags'. * gnu/packages/coq.scm (coq-equations)[arguments]<#:make-flags>: Set install destination. <#:phases>: Remove replace 'install. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index fc739a0475..aeba0eb5da 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -547,17 +547,14 @@ (define-public coq-equations `(("ocaml-zarith" ,ocaml-zarith))) (arguments `(#:test-target "test-suite" + #:make-flags (list (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (invoke "sh" "./configure.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" - (string-append "COQLIB=" (assoc-ref outputs "out") - "/lib/coq/") - "install")))))) + (invoke "sh" "./configure.sh")))))) (home-page "https://mattam82.github.io/Coq-Equations/") (synopsis "Function definition plugin for Coq") (description "Equations provides a notation for writing programs From 7537ec816ffe0aaa6677c53604ac12fe9d9ca250 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 19:51:54 +0100 Subject: [PATCH 049/234] gnu: coq-stdpp: Adjust '#:make-flags'. * gnu/packages/coq.scm (coq-stdpp)[arguments]<#:make-flags>: Set install destination. <#:phases>: Remove replace 'install. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index aeba0eb5da..a0579f8869 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -633,15 +633,12 @@ (define-public coq-stdpp `(("coq" ,coq))) (arguments `(#:tests? #f ; Tests are executed during build phase. + #:make-flags (list (string-append "COQLIBINSTALL=" + (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" - (string-append "COQLIB=" (assoc-ref outputs "out") - "/lib/coq/") - "install")))))) + (delete 'configure)))) (description "This project contains an extended \"Standard Library\" for Coq called coq-std++. The key features are: @itemize From f4aa543f74109f274d842cd973f719144fe90712 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Nov 2021 09:13:22 +0100 Subject: [PATCH 050/234] gnu: emacs-elfeed-score: Update to 1.2.0. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score): Update to 1.2.0. --- 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 89c86519da..e141c390d8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10317,7 +10317,7 @@ (define-public emacs-elfeed-protocol (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "1.1.0") + (version "1.2.0") (source (origin (method git-fetch) @@ -10326,7 +10326,7 @@ (define-public emacs-elfeed-score (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1drgv16555cyn7w6g44z23yhi1i0cy1b9h1ri3lz6h814px0wj0z")))) + (base32 "0b49sd0h1idx3p5p9zqb3p5ni4i43fyikfkg70fs5iqjcl0vmz7c")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elfeed" ,emacs-elfeed))) From 039c3848c302903e2b85643dd5f1d6008b8fcfd8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Nov 2021 09:18:41 +0100 Subject: [PATCH 051/234] gnu: wireshark: Update to 3.4.10. * gnu/packages/networking.scm (wireshark): Update to 3.4.10. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4c0c87115f..02041924f6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1468,14 +1468,14 @@ (define-public whois (define-public wireshark (package (name "wireshark") - (version "3.4.9") + (version "3.4.10") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "084nv4fbgpxsf6b6cfi6cinn8l3wsbn0g8lsd7p2aifjkf15wln6")))) + (base32 "1vvw30lkga1zwmdysxqfbqq9ffy05hg7dkv3nj6vnqmf8i5fz9wa")))) (build-system cmake-build-system) (arguments `(#:phases From a030511fd9933c52cbffe298f68a375594bb84a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 21:37:23 +0000 Subject: [PATCH 052/234] import: texlive: Print inputs with labels and guixified names. * guix/import/texlive.scm (tlpdb->package): Improve handling of propagated-inputs. --- guix/import/texlive.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index e22823e807..15afc781ff 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -235,7 +235,11 @@ (define (tlpdb->package name) ,@(if (assoc-ref data 'srcfiles) '() '(#:trivial? #true)))) ,@(or (and=> (assoc-ref data 'depend) (lambda (inputs) - `((propagated-inputs ,inputs)))) + `((propagated-inputs + ,(map (lambda (tex-name) + (let ((name (guix-name tex-name))) + (list name (list 'unquote (string->symbol name))))) + inputs))))) '()) ,@(or (and=> (assoc-ref data 'catalogue-ctan) (lambda (url) From 424f2c92b4043c13165beb2f746ab5c10f8ddf83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 21:38:24 +0000 Subject: [PATCH 053/234] import: texlive: Take different package database as optional argument. * guix/import/texlive.scm (tlpdb->package): Expect PACKAGE-DATABASE as argument. (texlive->guix-package): Accept PACKAGE-DATABASE keyword. --- guix/import/texlive.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 15afc781ff..bdef9f58b0 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -203,8 +203,8 @@ (define (files->directories files) files) equal?))) -(define (tlpdb->package name) - (and-let* ((data (assoc-ref (tlpdb) name)) +(define (tlpdb->package name package-database) + (and-let* ((data (assoc-ref package-database name)) (dirs (files->directories (map (lambda (dir) (string-drop dir (string-length "texmf-dist/"))) @@ -254,10 +254,10 @@ (define (tlpdb->package name) (define texlive->guix-package (memoize - (lambda* (name #:key repo version) + (lambda* (name #:key repo version (package-database tlpdb)) "Find the metadata for NAME in the tlpdb and return the `package' s-expression corresponding to that package, or #f on failure." - (tlpdb->package name)))) + (tlpdb->package name (package-database))))) (define (texlive-recursive-import name) (recursive-import name From f66da037b457f5d92a0b3e3f53121e17571b42c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 17 Nov 2021 21:39:52 +0000 Subject: [PATCH 054/234] tests: Replace texlive importer tests. * tests/texlive.scm (xml, sxml): Remove variables. ("fetch-sxml: returns SXML for valid XML", "sxml->package"): Remove tests. ("texlive->guix-package"): Add new test. --- tests/texlive.scm | 221 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 154 insertions(+), 67 deletions(-) diff --git a/tests/texlive.scm b/tests/texlive.scm index a6f08046a8..368e36e31a 100644 --- a/tests/texlive.scm +++ b/tests/texlive.scm @@ -30,87 +30,174 @@ (define-module (test-texlive) (test-begin "texlive") -(define xml - "\ - - foo - Foomatic frobnication in LuaLaTeX - - - - -

- Foo is a package for LuaLaTeX. It provides an interface to frobnicate gimbals - in a foomatic way with the LuaTeX engine. -

-

- The package requires the bar and golly - bundles for extremely special specialties. -

- - - - - null -") +(define %fake-tlpdb + '(("stricttex" + . ((name + . "stricttex") + (shortdesc + . "Strictly balanced brackets and numbers in command names") + (longdesc + . "This is a small, LuaLaTeX-only package providing you with three, +sometimes useful features: It allows you to make brackets [...] \"strict\", +meaning that each [ must be balanced by a ]. It allows you to use numbers in +command names, so that you can do stuff like \\newcommand\\pi12{\\pi_{12}}. It +allows you to use numbers and primes in command names, so that you can do +stuff like \\newcommand\\pi'12{\\pi '_{12}}.") + (docfiles + . ("texmf-dist/doc/lualatex/stricttex/README.md" + "texmf-dist/doc/lualatex/stricttex/stricttex.pdf")) + (runfiles + . ("texmf-dist/tex/lualatex/stricttex/stricttex.lua" + "texmf-dist/tex/lualatex/stricttex/stricttex.sty")) + (catalogue-license . "lppl1.3c"))) + ("texsis" + . ((name + . "texsis") + (shortdesc + . "Plain TeX macros for Physicists") + (longdesc + . "TeXsis is a TeX macro package which provides useful features for +typesetting research papers and related documents. For example, it includes +support specifically for: Automatic numbering of equations, figures, tables +and references; Simplified control of type sizes, line spacing, footnotes, +running headlines and footlines, and tables of contents, figures and tables; +Specialized document formats for research papers, preprints and \"e-prints\", +conference proceedings, theses, books, referee reports, letters, and +memoranda; Simplified means of constructing an index for a book or thesis; +Easy to use double column formatting; Specialized environments for lists, +theorems and proofs, centered or non-justified text, and listing computer +code; Specialized macros for easily constructing ruled tables. TeXsis was +originally developed for physicists, but others may also find it useful. It is +completely compatible with Plain TeX.") + (depend . ("cm" "hyphen-base" "knuth-lib" "plain" "tex")) + (docfiles + . ("texmf-dist/doc/man/man1/texsis.1" + "texmf-dist/doc/man/man1/texsis.man1.pdf" + "texmf-dist/doc/otherformats/texsis/base/COPYING" + "texmf-dist/doc/otherformats/texsis/base/Example.tex" + "texmf-dist/doc/otherformats/texsis/base/Fonts.tex" + "texmf-dist/doc/otherformats/texsis/base/INSTALL" + "texmf-dist/doc/otherformats/texsis/base/Install.tex" + "texmf-dist/doc/otherformats/texsis/base/MANIFEST" + "texmf-dist/doc/otherformats/texsis/base/Manual.fgl" + "texmf-dist/doc/otherformats/texsis/base/Manual.ref" + "texmf-dist/doc/otherformats/texsis/base/Manual.tbl" + "texmf-dist/doc/otherformats/texsis/base/Manual.tex" + "texmf-dist/doc/otherformats/texsis/base/NEWS" + "texmf-dist/doc/otherformats/texsis/base/README" + "texmf-dist/doc/otherformats/texsis/base/TXSapxF.doc" + "texmf-dist/doc/otherformats/texsis/base/TXScover.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSdcol.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSdoc.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSdoc0.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSdocM.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSend.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSenvmt.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSeqns.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSfigs.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSfmts.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSfonts.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSinstl.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSintro.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSletr.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSmisc.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSprns.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSrefs.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSrevs.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSruled.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSsects.doc" + "texmf-dist/doc/otherformats/texsis/base/TXSsite.000" + "texmf-dist/doc/otherformats/texsis/base/TXSsymb.doc" + "texmf-dist/doc/otherformats/texsis/base/TXStags.doc" + "texmf-dist/doc/otherformats/texsis/base/index.tex" + "texmf-dist/doc/otherformats/texsis/base/letr" + "texmf-dist/doc/otherformats/texsis/base/penguin.eps" + "texmf-dist/doc/otherformats/texsis/base/penguin2.eps" + "texmf-dist/doc/otherformats/texsis/base/texsis.el" + "texmf-dist/doc/otherformats/texsis/base/texsis.lsm")) + (runfiles + . ("texmf-dist/bibtex/bst/texsis/texsis.bst" + "texmf-dist/tex/texsis/base/AIP.txs" + "texmf-dist/tex/texsis/base/CVformat.txs" + "texmf-dist/tex/texsis/base/Elsevier.txs" + "texmf-dist/tex/texsis/base/Exam.txs" + "texmf-dist/tex/texsis/base/Formletr.txs" + "texmf-dist/tex/texsis/base/IEEE.txs" + "texmf-dist/tex/texsis/base/PhysRev.txs" + "texmf-dist/tex/texsis/base/Spanish.txs" + "texmf-dist/tex/texsis/base/Swedish.txs" + "texmf-dist/tex/texsis/base/TXSconts.tex" + "texmf-dist/tex/texsis/base/TXSdcol.tex" + "texmf-dist/tex/texsis/base/TXSenvmt.tex" + "texmf-dist/tex/texsis/base/TXSeqns.tex" + "texmf-dist/tex/texsis/base/TXSfigs.tex" + "texmf-dist/tex/texsis/base/TXSfmts.tex" + "texmf-dist/tex/texsis/base/TXSfonts.tex" + "texmf-dist/tex/texsis/base/TXShead.tex" + "texmf-dist/tex/texsis/base/TXSinit.tex" + "texmf-dist/tex/texsis/base/TXSletr.tex" + "texmf-dist/tex/texsis/base/TXSmacs.tex" + "texmf-dist/tex/texsis/base/TXSmemo.tex" + "texmf-dist/tex/texsis/base/TXSprns.tex" + "texmf-dist/tex/texsis/base/TXSrefs.tex" + "texmf-dist/tex/texsis/base/TXSruled.tex" + "texmf-dist/tex/texsis/base/TXSsects.tex" + "texmf-dist/tex/texsis/base/TXSsite.tex" + "texmf-dist/tex/texsis/base/TXSsymb.tex" + "texmf-dist/tex/texsis/base/TXStags.tex" + "texmf-dist/tex/texsis/base/TXStitle.tex" + "texmf-dist/tex/texsis/base/Tablebod.txs" + "texmf-dist/tex/texsis/base/WorldSci.txs" + "texmf-dist/tex/texsis/base/color.txs" + "texmf-dist/tex/texsis/base/nuclproc.txs" + "texmf-dist/tex/texsis/base/printfont.txs" + "texmf-dist/tex/texsis/base/spine.txs" + "texmf-dist/tex/texsis/base/texsis.tex" + "texmf-dist/tex/texsis/base/thesis.txs" + "texmf-dist/tex/texsis/base/twin.txs" + "texmf-dist/tex/texsis/config/texsis.ini")) + (catalogue-license . "lppl"))))) -(define sxml - '(*TOP* (entry (@ (id "foo")) - (name "foo") - (caption "Foomatic frobnication in LuaLaTeX") - (authorref (@ (id "rekado"))) - (license (@ (type "lppl1.3"))) - (version (@ (number "2.6a"))) - (description - (p "\n Foo is a package for LuaLaTeX. It provides an interface to frobnicate gimbals\n in a foomatic way with the LuaTeX engine.\n ") - (p "\n The package requires the bar and golly\n bundles for extremely special specialties.\n ")) - (ctan (@ (path "/macros/latex/contrib/foo") (file "true"))) - (texlive (@ (location "foo"))) - (keyval (@ (value "tests") (key "topic"))) - "\n null\n"))) - -(test-equal "fetch-sxml: returns SXML for valid XML" - sxml - (with-http-server `((200 ,xml)) - (parameterize ((current-http-proxy (%local-url))) - (fetch-sxml "foo")))) - -;; TODO: -(test-assert "sxml->package" +(test-assert "texlive->guix-package" ;; Replace network resources with sample data. (mock ((guix build svn) svn-fetch (lambda* (url revision directory #:key (svn-command "svn") (user-name #f) - (password #f)) + (password #f) + (recursive? #t)) (mkdir-p directory) (with-output-to-file (string-append directory "/foo") (lambda () (display "source"))))) - (let ((result (sxml->package sxml))) + (let ((result (texlive->guix-package "texsis" + #:package-database + (lambda _ %fake-tlpdb)))) (match result (('package - ('name "texlive-latex-foo") - ('version "2.6a") - ('source ('origin - ('method 'svn-fetch) - ('uri ('texlive-ref "latex" "foo")) - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'texlive-build-system) - ('arguments ('quote (#:tex-directory "latex/foo"))) - ('home-page "http://www.ctan.org/pkg/foo") - ('synopsis "Foomatic frobnication in LuaLaTeX") - ('description - "Foo is a package for LuaLaTeX. It provides an interface to \ -frobnicate gimbals in a foomatic way with the LuaTeX engine. The package \ -requires the bar and golly bundles for extremely special specialties.") - ('license 'lppl1.3+)) - #t) + ('inherit ('simple-texlive-package + "texlive-texsis" + ('list "doc/man/man1/" + "doc/otherformats/texsis/base/" + "bibtex/bst/texsis/" + "tex/texsis/base/" + "tex/texsis/config/") + ('base32 (? string? hash)) + #:trivial? #t)) + ('propagated-inputs + (("texlive-cm" ',texlive-cm) + ("texlive-hyphen-base" ',texlive-hyphen-base) + ("texlive-knuth-lib" ',texlive-knuth-lib) + ("texlive-plain" ',texlive-plain) + ("texlive-tex" ',texlive-tex))) + ('home-page "https://www.tug.org/texlive/") + ('synopsis "Plain TeX macros for Physicists") + ('description (? string? description)) + ('license 'lppl)) + #true) (_ (begin - (format #t "~s\n" result) + (format #t "~s~%" result) (pk 'fail result #f))))))) (test-end "texlive") From 443ed83bc3125db1b6d5474416359921e2ea4ce0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:13 +0000 Subject: [PATCH 055/234] gnu: r-annotationdbi: Update to 1.56.2. * gnu/packages/bioconductor.scm (r-annotationdbi): Update to 1.56.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d36d070a56..ca7b8b2030 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2026,13 +2026,13 @@ (define-public r-annotate (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.56.1") + (version "1.56.2") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "1svh5zcb7ymz463z5641l2cvzniswxasjjix2plfhqs0yqf1j9qg")))) + "01zwq14msbbwzxv8rgpmyr74ymvhq0vnmxkxxwd886iac5vjlgi8")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) From 30038c57382b32043e7b6e655026b1b8e94ae904 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:19 +0000 Subject: [PATCH 056/234] gnu: r-chipseeker: Update to 1.30.2. * gnu/packages/bioconductor.scm (r-chipseeker): Update to 1.30.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ca7b8b2030..07da2e1b0f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2459,13 +2459,13 @@ (define-public r-category (define-public r-chipseeker (package (name "r-chipseeker") - (version "1.30.0") + (version "1.30.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPseeker" version)) (sha256 (base32 - "1x8px8ylc231g87rd48kmy9y36h26rldbmqjkcj4mgaldvbsj0rp")))) + "1nr5p1h9131rvbpnh2kizzx9q6f4ycq6rzxy1yqg2pczqcg7hy4x")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) From f917fa4e50c3f39170de531b77fd7e96e5331f85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:20 +0000 Subject: [PATCH 057/234] gnu: r-ensembldb: Update to 2.18.2. * gnu/packages/bioconductor.scm (r-ensembldb): Update to 2.18.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 07da2e1b0f..1e95c84e5a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2822,14 +2822,14 @@ (define-public r-edger (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.18.0") + (version "2.18.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "02rdbqp33g488w1df1rgp0dg63qrr6w2kmgigxzc8l9wmrvj0y1j")))) + "0q56gv0isa9ayw505py7i7x65pvcshmd2j1mna1wpbk66wqj4qzx")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) From 6b1375d3afdd81d58ba243cdbd75d86855054271 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:20 +0000 Subject: [PATCH 058/234] gnu: r-msnbase: Update to 2.20.1. * gnu/packages/bioconductor.scm (r-msnbase): Update to 2.20.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1e95c84e5a..1fd99a5b00 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3518,14 +3518,14 @@ (define-public r-mutationalpatterns (define-public r-msnbase (package (name "r-msnbase") - (version "2.20.0") + (version "2.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "1r5igzb7xb5qcw37ffy0c3j6vlg9zffmksrc57rs1pmfnca773z5")))) + "0ip614mdwisz2hlmyfgngysq1s3hajb88cgdmygfc8i6kyxjkjzl")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs From 34ba8b256b5f46550e1d5a1596cda13fbc5c16aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:21 +0000 Subject: [PATCH 059/234] gnu: r-systempiper: Update to 2.0.1. * gnu/packages/bioconductor.scm (r-systempiper): Update to 2.0.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1fd99a5b00..01bfbfe17b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4442,14 +4442,14 @@ (define-public r-sva (define-public r-systempiper (package (name "r-systempiper") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "systemPipeR" version)) (sha256 (base32 - "0kibr47z7ml13hpl955qcr4wp2z4nq7gjiinyk30wivrwrng5sg1")))) + "1r0qc1pyff9nvjix21xjd6fmka06ywr4ipr8szm52hq41hwaiqgq")))) (properties `((upstream-name . "systemPipeR"))) (build-system r-build-system) (propagated-inputs From e52eb93765c73ae6a9ae7f98572d917326da97e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:21 +0000 Subject: [PATCH 060/234] gnu: r-treeio: Update to 1.18.1. * gnu/packages/bioconductor.scm (r-treeio): Update to 1.18.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 01bfbfe17b..a3fcebf2de 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5825,14 +5825,14 @@ (define-public r-scaledmatrix (define-public r-treeio (package (name "r-treeio") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "treeio" version)) (sha256 (base32 - "03gz378qrp6b9fcriqanfnphibqv4bxhvz48rigzkidkzz71wfaj")))) + "19i8jhvycv57zbxhpn5gx5ymdiws64kc3nidc00xh1j9a8xkj1aq")))) (properties `((upstream-name . "treeio"))) (build-system r-build-system) (propagated-inputs From 7e9a13d78927999f6aff35c3b1fdff918b114d76 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:22 +0000 Subject: [PATCH 061/234] gnu: r-ggtree: Update to 3.2.1. * gnu/packages/bioconductor.scm (r-ggtree): Update to 3.2.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a3fcebf2de..6ce785e295 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5857,14 +5857,14 @@ (define-public r-treeio (define-public r-ggtree (package (name "r-ggtree") - (version "3.2.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ggtree" version)) (sha256 (base32 - "1c6b7kjh44k096v8mhn53abr181vpbn7s6ab7zk4phnsyfxsclxb")))) + "0qk39gdpy4kznjhmvi25y2spcdj2r1i6mv673vx8dzf66zfs20v8")))) (properties `((upstream-name . "ggtree"))) (build-system r-build-system) (propagated-inputs From f4b108d8723d3bc3ce00261fe1c2edc614ea86d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:22 +0000 Subject: [PATCH 062/234] gnu: r-icobra: Update to 1.22.1. * gnu/packages/bioconductor.scm (r-icobra): Update to 1.22.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6ce785e295..9665446e6e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6315,14 +6315,14 @@ (define-public r-ihw (define-public r-icobra (package (name "r-icobra") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "iCOBRA" version)) (sha256 (base32 - "0qg32g1rfvh6mx8wny1lrva9vc347288hzml7yb4rnrsx1hggkpa")))) + "05j3h314l2bw8n61h1nyiqhm3z7c1axycn4p3xkfccq5i4mcqvn2")))) (properties `((upstream-name . "iCOBRA"))) (build-system r-build-system) (propagated-inputs From d30d9c6001e8a4e7821073fe80d44f656fc328d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:23 +0000 Subject: [PATCH 063/234] gnu: r-geoquery: Update to 2.62.1. * gnu/packages/bioconductor.scm (r-geoquery): Update to 2.62.1. [propagated-inputs]: Add r-r-utils. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9665446e6e..4693ca1993 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6726,14 +6726,14 @@ (define-public r-scone (define-public r-geoquery (package (name "r-geoquery") - (version "2.62.0") + (version "2.62.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GEOquery" version)) (sha256 (base32 - "0fkx4jh1s76l015vwikkryarlx6iihb1z935nzpdhah3rpqx3b3z")))) + "0plmh4x37r848g6ilvl1x8cim90rp85gikfc5m8lgi2i4xkq7hbq")))) (properties `((upstream-name . "GEOquery"))) (build-system r-build-system) (propagated-inputs @@ -6743,6 +6743,7 @@ (define-public r-geoquery ("r-httr" ,r-httr) ("r-limma" ,r-limma) ("r-magrittr" ,r-magrittr) + ("r-r-utils" ,r-r-utils) ("r-readr" ,r-readr) ("r-tidyr" ,r-tidyr) ("r-xml2" ,r-xml2))) From a03c84244d500ad9120cd9c48d32a12661b4a0b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:23 +0000 Subject: [PATCH 064/234] gnu: r-rsubread: Update to 2.8.1. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4693ca1993..2c3929a1ea 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9551,14 +9551,14 @@ (define-public r-annotatr (define-public r-rsubread (package (name "r-rsubread") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "09kd7vl2z9k82ppfzy679hs7d00c60z3w3n6a8wq4z3k3f4glc3s")))) + "0lpx0dp5570kbrq7v0g573axkhi00qrf38si59vmvnqxhmkvsixn")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) From 63504133252e23616742bbe308d283efd8a62d09 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:24 +0000 Subject: [PATCH 065/234] gnu: r-mixomics: Update to 6.18.0. * gnu/packages/bioconductor.scm (r-mixomics): Update to 6.18.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2c3929a1ea..05f6c4870e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10114,14 +10114,14 @@ (define-public r-flowsom (define-public r-mixomics (package (name "r-mixomics") - (version "6.17.26") + (version "6.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mixOmics" version)) (sha256 (base32 - "10ir4876sjmw2mw0cjvshwy3qyhsyz6g1ihyr3dycgzya0jcxw1x")))) + "0jwkb5scc33nfn2mibga8vp00pmc24ham71gpkbizvy43cy85icf")))) (properties `((upstream-name . "mixOmics"))) (build-system r-build-system) (propagated-inputs From 3cfeeace839ace247964be159c1e7ba827f62799 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:24 +0000 Subject: [PATCH 066/234] gnu: r-biocpkgtools: Update to 1.12.2. * gnu/packages/bioconductor.scm (r-biocpkgtools): Update to 1.12.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 05f6c4870e..6b925d9891 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11979,14 +11979,14 @@ (define-public r-biocor (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.12.0") + (version "1.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "13m6h35938407ajj7fakl50g4p2wsvinkg0r2mwl1zwq88735arg")))) + "1yz2sgx4xrnw22k3d6q6hkj213bnbb4hbr5ymxnmjnsz551s75ny")))) (properties `((upstream-name . "BiocPkgTools"))) (build-system r-build-system) (propagated-inputs From ef5bbc34161fcad0e46e73307542b96ba6205ef0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:25 +0000 Subject: [PATCH 067/234] gnu: r-biocset: Update to 1.8.1. * gnu/packages/bioconductor.scm (r-biocset): Update to 1.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6b925d9891..ba3a7d7ed9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12027,14 +12027,14 @@ (define-public r-biocpkgtools (define-public r-biocset (package (name "r-biocset") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSet" version)) (sha256 (base32 - "0ysm68gcalg3d91jx6vmdzra01vc6kvzqnvz557g3rnm0wkx12q6")))) + "1x5ar9byr85iap2x6y66j31fi17wr31awx1gl3z01sckp0dldx6w")))) (properties `((upstream-name . "BiocSet"))) (build-system r-build-system) (propagated-inputs From ddb9d228b468ffe31bb432ca0b106e1350a7b866 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:25 +0000 Subject: [PATCH 068/234] gnu: r-s4vectors: Update to 0.32.2. * gnu/packages/bioconductor.scm (r-s4vectors): Update to 0.32.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ba3a7d7ed9..a550f04161 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12379,13 +12379,13 @@ (define-public r-preprocesscore (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.32.0") + (version "0.32.2") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "1zm1xlqrq1f9xa81j3ij2p78g3aywq7izsk3h40z94fjggahvc09")))) + "0xrmii2dnwyknpjdiwwjlklgzpbk9q09br27rq5ffz08if9yyk20")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) From 0f72bdada51ef5fd452b3f5905a95bf5059430b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:26 +0000 Subject: [PATCH 069/234] gnu: r-hdf5array: Update to 1.22.1. * gnu/packages/bioconductor.scm (r-hdf5array): Update to 1.22.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a550f04161..5c1a8b83a4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12539,14 +12539,14 @@ (define-public r-hitc (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "13h6qr4zkynir0ck2aiasjvlid7hrk3m2lzkjyhpvbg1a15r8zi9")))) + "1al4a88pgdl7hfhphsnwl1gg1c1kmw37wcdr4v4pfsw5l8ff7nx4")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs From 34d17d5f62315af0581db999a5d8d141d707ec74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:26 +0000 Subject: [PATCH 070/234] gnu: r-scran: Update to 1.22.1. * gnu/packages/bioconductor.scm (r-scran): Update to 1.22.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5c1a8b83a4..11200fa792 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12964,14 +12964,14 @@ (define-public r-scater (define-public r-scran (package (name "r-scran") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "1nyvbss4914giwzp5wiw9g4z5b6lr5iprbjrqlg4vpgnf1hz8k7l")))) + "06lcxya6rpa8dv0il7m7fwyx0ci1y1jn16ff5lmvzf2mnr6q7lic")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) From 13f8140290e2bb334e114314ab168fd4adf3eb67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:27 +0000 Subject: [PATCH 071/234] gnu: r-chromstar: Update to 1.20.2. * gnu/packages/bioconductor.scm (r-chromstar): Update to 1.20.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 11200fa792..5d1988cdd6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13790,14 +13790,14 @@ (define-public r-snpstats (define-public r-chromstar (package (name "r-chromstar") - (version "1.19.0") + (version "1.20.2") (source (origin (method url-fetch) (uri (bioconductor-uri "chromstaR" version)) (sha256 (base32 - "0z511l26fhz00qn8h2yybylk8c3ws8hj1hp8hq9qj9mfczwiqy3j")))) + "1akcmxzn4j9ph4n3lsgfh8fh8hrb28jjamz037w59bsdkcv6wyjq")))) (properties `((upstream-name . "chromstaR"))) (build-system r-build-system) (propagated-inputs From 6a5e5bb9e2fd7403d7c70f3bbbc855559559c16b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:27 +0000 Subject: [PATCH 072/234] gnu: r-biodb: Update to 1.2.1. * gnu/packages/bioconductor.scm (r-biodb): Update to 1.2.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5d1988cdd6..f8e5ff980e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14269,14 +14269,14 @@ (define-public r-biocdockermanager (define-public r-biodb (package (name "r-biodb") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biodb" version)) (sha256 (base32 - "0q343zbx341xdy634p50k7bj6byv8v2rqzy50nw75a79206pajl4")))) + "1z4adapsnpw6fwanihdz43r11ijypxs5wbndb1i98j8kb7wf308k")))) (properties `((upstream-name . "biodb"))) (build-system r-build-system) (propagated-inputs From 93b2ce1197d2dcda81b900a89545f8f6f00ac570 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Nov 2021 13:15:28 +0000 Subject: [PATCH 073/234] gnu: r-tximeta: Update to 1.12.3. * gnu/packages/bioconductor.scm (r-tximeta): Update to 1.12.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f8e5ff980e..977fd99e03 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14845,14 +14845,14 @@ (define-public r-biscuiteer (define-public r-tximeta (package (name "r-tximeta") - (version "1.12.0") + (version "1.12.3") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "03fbz6pka7bcbhd0bblgckyxsqhzp4n8qp2dcpdb3sr01lyw4bc5")))) + "15l1jvfis7xzxwwnlqs8xpaf212v1lx513np2dc4l4h7rqhclm2v")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs From dcc4028c0ee49c543bc31bd3c1f75000e7819e6b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Nov 2021 21:13:23 +0200 Subject: [PATCH 074/234] gnu: irrlicht: Update home-page. * gnu/packages/games.scm (irrlicht)[home-page]: Update to new home-page. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8f80772f1e..395b108ef4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3596,7 +3596,7 @@ (define-public irrlicht C++. Features include an OpenGL renderer, extensible materials, scene graph management, character animation, particle and other special effects, support for common mesh file formats, and collision detection.") - (home-page "http://irrlicht.sourceforge.net/") + (home-page "https://irrlicht.sourceforge.io/") (license license:zlib))) (define-public mars From 4c91332cced67bd7b9034035fb2b02c5728509a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Nov 2021 21:43:45 -0500 Subject: [PATCH 075/234] gnupg: Honor GnuPG's configuration for the key server. The previous default "pool.sks-keyservers.net" doesn't seem to work anymore; besides, users know best. * guix/gnupg.scm (%openpgp-key-server): Default to #f, meaning not provided. (gnupg-receive-keys): Make SERVER and KEYRING keyword arguments. Adjust doc. Provide the '--keyserver' argument only when %openpgp-key-server is not #f. (gnupg-verify*): Do not set a default value for SERVER. Adjust accordingly. --- guix/gnupg.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/guix/gnupg.scm b/guix/gnupg.scm index 5fae24b325..088bebc0de 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2010, 2011, 2013, 2014, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,9 +57,9 @@ (define current-keyring "/gpg/trustedkeys.kbx"))) (define %openpgp-key-server - ;; The default key server. Note that keys.gnupg.net appears to be - ;; unreliable. - (make-parameter "pool.sks-keyservers.net")) + ;; The default key server. It defaults to #f, which causes GnuPG to use the + ;; one it is configured with. + (make-parameter #f)) ;; Regexps for status lines. See file `doc/DETAILS' in GnuPG. @@ -182,22 +183,26 @@ (define (gnupg-status-missing-key? status) (_ #f))) status)) -(define* (gnupg-receive-keys fingerprint/key-id server - #:optional (keyring (current-keyring))) - "Download FINGERPRINT/KEY-ID from SERVER, a key server, and add it to -KEYRING." +(define* (gnupg-receive-keys fingerprint/key-id + #:key server (keyring (current-keyring))) + "Download FINGERPRINT/KEY-ID from SERVER if specified, otherwise from +GnuPG's default/configured one. The key is added to KEYRING." (unless (file-exists? keyring) (mkdir-p (dirname keyring)) - (call-with-output-file keyring (const #t))) ;create an empty keybox + (call-with-output-file keyring (const #t))) ;create an empty keybox - (zero? (system* (%gpg-command) "--keyserver" server - "--no-default-keyring" "--keyring" keyring - "--recv-keys" fingerprint/key-id))) + (zero? (apply system* + `(,(%gpg-command) + ,@(if server + (list "--keyserver" server) + '()) + "--no-default-keyring" "--keyring" ,keyring + "--recv-keys" ,fingerprint/key-id)))) (define* (gnupg-verify* sig file #:key (key-download 'interactive) - (server (%openpgp-key-server)) + server (keyring (current-keyring))) "Like `gnupg-verify', but try downloading the public key if it's missing. Return two values: 'valid-signature and a fingerprint/name pair upon success, @@ -215,7 +220,7 @@ (define* (gnupg-verify* sig file (let ((missing (gnupg-status-missing-key? status))) (define (download-and-try-again) ;; Download the missing key and try again. - (if (gnupg-receive-keys missing server keyring) + (if (gnupg-receive-keys missing #:server server #:keyring keyring) (match (gnupg-status-good-signature? (gnupg-verify sig file keyring)) (#f From b1acfb676aa9f81531034377186effe91cafeca2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 18 Nov 2021 23:17:08 +0100 Subject: [PATCH 076/234] gnu: ocaml-ssl: Update to 0.5.10. * gnu/packages/ocaml.scm (ocaml-ssl): Update to 0.5.10. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d559b0141f..05579cbf85 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2356,16 +2356,16 @@ (define-public ocaml-react (define-public ocaml-ssl (package (name "ocaml-ssl") - (version "0.5.9") + (version "0.5.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savonet/ocaml-ssl") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0")))) + "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb")))) (build-system dune-build-system) (arguments `(#:test-target ".")) From 6fc80d9d4c6712f3da71ab09290163c7441adabe Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 18 Nov 2021 14:00:27 -0800 Subject: [PATCH 077/234] gnu: r-msfeatures: Fix typos. * gnu/packages/bioconductor.scm (r-msfeatures)[description]: Switch from "allows to" to "can be used" and from "allows to aggregate" to "allows aggregating". --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 977fd99e03..90b49d5118 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13124,9 +13124,9 @@ (define-public r-msfeatures "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 package hence allows to group features, and +of signals across samples. This package hence can be used 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 +allows aggregating abundance levels of features within each group. This package defines concepts and functions for base and common data types, implementations for more specific data types are expected to be implemented in the respective packages (such as e.g. @code{xcms}).") From de0a3b578e3629ad4b0b1fcfcb9ca544620bd742 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Nov 2021 17:56:32 -0800 Subject: [PATCH 078/234] gnu: python-ueberzug: Fix typo. * gnu/packages/python-xyz.scm (python-ueberzug)[description]: Use "draws" instead of "allows to draw". --- 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 17d629bcb9..a6f8b10bf7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -331,7 +331,7 @@ (define-public python-ueberzug ("python-xlib" ,python-xlib))) (home-page "https://github.com/seebye/ueberzug") (synopsis "Command line util to display images in combination with X11") - (description "Überzug is a command line util which allows to draw images on + (description "Überzug is a command line util which draws images on terminals by using child windows. The advantages of using Überzug are: @itemize @item No race conditions as a new window is created to display images. From b23d7aa880c3017235009ad16d2b5464d08ccb86 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 18 Nov 2021 14:05:54 -0800 Subject: [PATCH 079/234] gnu: r-bgeecall: Fix typo. * gnu/packages/bioconductor.scm (r-bgeecall)[description]: Switch from "allows to generate" to "allows generating". --- 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 90b49d5118..5d29a3acf2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14009,7 +14009,7 @@ (define-public r-bgeecall (home-page "https://github.com/BgeeDB/BgeeCall") (synopsis "RNA-Seq present/absent gene expression calls generation") (description - "BgeeCall allows to generate present/absent gene expression calls without + "BgeeCall allows generating present/absent gene expression calls without using an arbitrary cutoff like TPM<1. Calls are generated based on reference intergenic sequences. These sequences are generated based on expression of all RNA-Seq libraries of each species integrated in Bgee.") From a8eea7a51e243587b7e0b12c2a769ace6f05351d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 18 Nov 2021 14:09:30 -0800 Subject: [PATCH 080/234] gnu: qtltools: Fix typo. * gnu/packages/bioinformatics.scm (qtltools)[description]: Switch from "allows to go" to "allows going". --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6c9c1af33d..3fa378de13 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1581,7 +1581,7 @@ (define-public qtltools (home-page "https://qtltools.github.io/qtltools/") (synopsis "Tool set for molecular QTL discovery and analysis") (description "QTLtools is a tool set for molecular QTL discovery -and analysis. It allows to go from the raw genetic sequence data to +and analysis. It allows going from the raw genetic sequence data to collection of molecular @dfn{Quantitative Trait Loci} (QTLs) in few easy-to-perform steps.") (license license:gpl3+))) From 92d6f17dfd449208a657a1a54e3a287ae22d1da8 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 18 Nov 2021 20:37:52 +0100 Subject: [PATCH 081/234] gnu: Add shell2batch. * gnu/packages/crates-io.scm (shell2batch): New variable. * gnu/packages/patches/rust-shell2batch-lint-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Julien Lepiller --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 25 +++++++++++++++++++ .../patches/rust-shell2batch-lint-fix.patch | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 gnu/packages/patches/rust-shell2batch-lint-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6aada7326b..7cc06c8212 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1744,6 +1744,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ + %D%/packages/patches/rust-shell2batch-lint-fix.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 148e8cbff3..7d5833ffc0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Ricardo Wurmus +;;; Copyright © 2021 Jacob Hrbek ;;; ;;; This file is part of GNU Guix. ;;; @@ -63154,3 +63155,27 @@ (define-public svd2rust (description "Generate Rust register maps (`struct`s) from SVD files") (license (list license:expat license:asl2.0)))) + +(define-public rust-shell2batch-0.4 + (package + (name "rust-shell2batch") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "shell2batch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r9zfhxmqnrnyk7g590333szfpsjijs2wfwy7ish240w6pp54nhq")) + ;; https://github.com/sagiegurari/shell2batch/issues/17 + (patches (search-patches "rust-shell2batch-lint-fix.patch")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/sagiegurari/shell2batch") + (synopsis "Basic shell scripts to windows batch scripts conversion") + (description "While it is not really possible to take every shell script +and automatically convert it to a windows batch file, this library provides a +way to convert simple shell commands to windows batch commands.") + (license license:asl2.0))) diff --git a/gnu/packages/patches/rust-shell2batch-lint-fix.patch b/gnu/packages/patches/rust-shell2batch-lint-fix.patch new file mode 100644 index 0000000000..7c160b6cca --- /dev/null +++ b/gnu/packages/patches/rust-shell2batch-lint-fix.patch @@ -0,0 +1,25 @@ +Resolves the following error that was most likely introduced in new version of +rust as this package is from 2019: + +error: unnecessary parentheses around type + --> src/converter.rs:108:61 + | +108 | fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { + | ^^^^^^^^ help: remove these parentheses + +Reported upstream at https://github.com/sagiegurari/shell2batch/issues/17. + +diff --git a/src/converter.rs b/src/converter.rs +index fc87d68..af309d2 100644 +--- a/src/converter.rs ++++ b/src/converter.rs +@@ -105,7 +105,7 @@ fn replace_vars(arguments: &str) -> String { + updated_arguments + } + +-fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { ++fn add_arguments(arguments: &str, additional_arguments: Vec, pre: bool) -> String { + let mut windows_arguments = if pre { + "".to_string() + } else { + From 5012281765f6677ce355b4ef36e91bfb9d6cc292 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 18 Nov 2021 23:48:50 +0100 Subject: [PATCH 082/234] gnu: ocaml-ocp-index: Update to 1.3.2. * gnu/packages/ocaml.scm (ocaml-ocp-index): Update to 1.3.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 05579cbf85..08c9f8e57d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2913,7 +2913,7 @@ (define-public ocaml-ocp-indent (define-public ocaml-ocp-index (package (name "ocaml-ocp-index") - (version "1.2.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -2923,7 +2923,7 @@ (define-public ocaml-ocp-index (file-name (git-file-name name version)) (sha256 (base32 - "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8")))) + "0y7fk8s477f40vvbsp4ikxv1v51y6bzj416bh1sc3f17rbnczpkk")))) (build-system dune-build-system) (arguments `(#:package "ocp-index")) From 08326f3d62085795e4860dbb88d6bd4b52230774 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 9 Oct 2021 15:25:20 +0200 Subject: [PATCH 083/234] gnu: Add gplates. * gnu/packages/geo.scm (gplates): New variable. --- gnu/packages/geo.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d70e2f6cc3..927ddb167d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018, 2019, 2020 Julien Lepiller +;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019, 2021 Wiktor Żelazny @@ -75,6 +75,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gps) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-apps) #:use-module (gnu packages image) @@ -84,6 +85,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages kde) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -2651,3 +2653,42 @@ (define-public marble-qt supports searching for places of interest, viewing Wikipedia articles, creating routes by drag and drop and more.") (license license:gpl3)))) + +(define-public gplates + (package + (name "gplates") + (version "2.3.0") + (source (origin + (method url-fetch) + (uri "https://www.earthbyte.org/download/8421/") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DBoost_NO_BOOST_CMAKE=ON") + #:tests? #f)) ;no test target + (inputs + `(("boost" ,boost) + ("cgal" ,cgal) + ("gdal" ,gdal) + ("glew" ,glew) + ("glu" ,glu) + ("gmp" ,gmp) + ("mesa" ,mesa) + ("mpfr" ,mpfr) + ("proj" ,proj) + ("python-3" ,python-3) + ("python-numpy" ,python-numpy) + ("qt" ,qtbase-5) + ("qtsvg" ,qtsvg) + ("qtxmlpatterns" ,qtxmlpatterns) + ("qwt" ,qwt) + ("zlib" ,zlib))) + (home-page "https://www.gplates.org") + (synopsis "Plate tectonics simulation program") + (description "GPlates is a plate tectonics program. Manipulate +reconstructions of geological and paleogeographic features through geological +time. Interactively visualize vector, raster and volume data.") + (license license:gpl2+))) From 2f1f2ac1e98587b74fa3d23e55569e3ee3b2b6c8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 00:29:13 +0100 Subject: [PATCH 084/234] gnu: ocaml-alcotest: Update to 1.5.0. * gnu/packages/ocaml.scm (ocaml-alcotest): Update to 1.5.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 08c9f8e57d..e336189a8a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2244,7 +2244,7 @@ (define-public ocaml-astring (define-public ocaml-alcotest (package (name "ocaml-alcotest") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -2253,7 +2253,7 @@ (define-public ocaml-alcotest (file-name (git-file-name name version)) (sha256 (base32 - "0fs4yzjva8q703h9kjl5cs0wibvxaqv5hhfhmpbpm1k8cqwr9cri")))) + "1lgadc7p56677fi5gwl7r9bml4z87rzh50khhqaij7bwp37zrmpi")))) (build-system dune-build-system) (arguments `(#:package "alcotest" From 2198d477239256667c665fcaf5abee2f613cbbeb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Nov 2021 10:53:21 -0500 Subject: [PATCH 085/234] gnu: linux-libre: Update to 5.14.19. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.19. (linux-libre-5.14-pristine-source, deblob-scripts-5.14): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ba839a592..c9c59e0633 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -347,17 +347,17 @@ (define (%upstream-linux-source version hash) ;; 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.18") +(define-public linux-libre-5.14-version "5.14.19") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts linux-libre-5.14-version linux-libre-5.14-gnu-revision (base32 "11zax57brk8bl75q68c71xsdlvslj48wpmrv8rh34sb8wym9n4mc") - (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) + (base32 "1xmmr26lpffc4dfmrkvh3gdkkr8666fcyvgam560vbyd2b2qkd78"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis"))) + (hash (base32 "1dw7hcqwv4w4rbrh9c4xjy9vgd4d63v97mf7jdf0s80f36mcfh8l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) From 794f5a05f70a71f3734813a8d323629ea3182ed1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Nov 2021 10:55:45 -0500 Subject: [PATCH 086/234] gnu: linux-libre 5.4: Update to 5.4.160. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.160. (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 c9c59e0633..1d005de1db 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,7 +380,7 @@ (define-public linux-libre-5.10-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.159") +(define-public linux-libre-5.4-version "5.4.160") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -390,7 +390,7 @@ (define deblob-scripts-5.4 (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p"))) + (hash (base32 "0n04nlg44l7p855lxkdz80x2avwm1pmrx1761cjmqv4w1qlq1c6l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) From fff318599508d296c9fdbbb7dfb4d620229b2bb9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 02:52:48 +0100 Subject: [PATCH 087/234] gnu: dune: Update to 2.9.1. * gnu/packages/ocaml.scm (dune): Update to 2.9.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e336189a8a..cdf3fa619b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1619,7 +1619,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "2.9.0") + (version "2.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1628,7 +1628,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b")))) + "1lnah40pm9ndixz5hbsh67chvdspqpy26g6byb767vqgj7dbivfh")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc From 4c8714d40651184ba7dcfe7d373958e1262fa588 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 03:26:35 +0100 Subject: [PATCH 088/234] gnu: ocaml-lwt: Update to 5.4.2. * gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cdf3fa619b..4a8b6f8770 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2405,7 +2405,7 @@ (define-public ocaml-mmap (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "5.4.0") + (version "5.4.2") (source (origin (method git-fetch) @@ -2414,7 +2414,7 @@ (define-public ocaml-lwt (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) + "1gkld5ms63lxkaa41jfg8y34qm5lb3ls6mkw03s760zln8i1k3gy")))) (build-system dune-build-system) (arguments `(#:package "lwt")) From 78c930e617fcd756c8fc4b60c99e4e18074dc814 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 03:29:43 +0100 Subject: [PATCH 089/234] gnu: ocaml-lwt-react: Update to 1.1.4. * gnu/packages/ocaml.scm (ocaml-lwt-react): Update to 1.1.4. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4a8b6f8770..094bcf223d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2441,17 +2441,17 @@ (define-public ocaml-lwt-react (package (inherit ocaml-lwt) (name "ocaml-lwt-react") - (version "1.1.3") + (version "1.1.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ocsigen/lwt") ;; Version from opam - (commit "4.3.0"))) + (commit "5.4.0"))) (file-name (git-file-name name version)) (sha256 (base32 - "0f7036srqz7zmnz0n164734smgkrqz78r1i35cg30x31kkr3pnn4")))) + "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (arguments `(#:package "lwt_react")) (properties `((upstream-name . "lwt_react"))) From eb9fa94ccae90fdb8ba3748dc62340db82f22872 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 03:49:29 +0100 Subject: [PATCH 090/234] gnu: ocaml-base: Update to 0.14.1. * gnu/packages/ocaml.scm (ocaml-base): Update to 0.14.1. --- gnu/packages/ocaml.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 094bcf223d..ced13806f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2016-2020 Julien Lepiller +;;; Copyright © 2016-2021 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye @@ -4919,11 +4919,18 @@ (define-public ocaml4.07-sexplib (define-public ocaml-base (package (name "ocaml-base") - (version "0.14.0") + (version "0.14.1") (home-page "https://github.com/janestreet/base") (source - (janestreet-origin "base" version - "1rkdhsgbcv0a8p29mwvpd2ldz8cjk97pixl43izm54wyin4lp778")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hizjxmiqlj2zzkwplzjamw9rbnl0kh44sxgjpzdij99qnfkzylf")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-sexplib0" ,ocaml-sexplib0))) From 9d662021aec7f89ea134d21ac379b9d471ee49e1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 04:03:10 +0100 Subject: [PATCH 091/234] gnu: ocaml-jst-config: Update to 0.14.1. * gnu/packages/ocaml.scm (ocaml-jst-config): Update to 0.14.1. --- gnu/packages/ocaml.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ced13806f3..cc694d7376 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4257,11 +4257,17 @@ (define-public emacs-flycheck-dedukti (define-public ocaml-jst-config (package (name "ocaml-jst-config") - (version "0.14.0") + (version "0.14.1") (source - (janestreet-origin - "jst-config" version - "1fppr29vn91zpqda8jlnp8bcssd4bf3rn36ig8fnd1yhjrsvz8f6")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/jst-config") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sak7rrix8vd2bscbjxbxi1d9jyd27ik59dpybfxhzhsn9s1wllv")))) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests (propagated-inputs From 188e3e2e6878346b0bdc8b46084f458abe86826c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 19:33:04 +0200 Subject: [PATCH 092/234] gnu: ocaml4.07-merlin: Remove package. * gnu/packages/ocaml.scm (ocaml4.07-merlin): Remove package. --- gnu/packages/ocaml.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cc694d7376..8c83cbca9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4648,34 +4648,6 @@ (define-public ocaml-merlin Atom.") (license license:expat))) -;; ocaml-merlin 3.4.2 can not be built with old version of dune used in -;; package-with-ocaml4.07 -(define-public ocaml4.07-merlin - (package-with-ocaml4.07 - (package - (inherit ocaml-merlin) - (name "ocaml-merlin") - (version "3.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/merlin") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) - (build-system dune-build-system) - (inputs - `(("ocaml-yojson" ,ocaml-yojson))) - (native-inputs - `(("ocaml-findlib" ,ocaml-findlib))) - (arguments - `(#:package "merlin" - ;; Errors in tests in version 3.2.2 - #:tests? #f))))) - (define-public ocaml4.07-gsl (package (name "ocaml4.07-gsl") From 59a22fcc917765f18a386b54f7f9fed106e42f3b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Nov 2021 09:51:13 +0100 Subject: [PATCH 093/234] gnu: emacs-modus-themes: Update to 1.7.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 1.7.0. --- 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 e141c390d8..1e5a3e2594 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26769,7 +26769,7 @@ (define-public emacs-doom-themes (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "1.6.0") + (version "1.7.0") (source (origin (method git-fetch) @@ -26778,7 +26778,7 @@ (define-public emacs-modus-themes (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fkj5as1lx6q7n6iny9x5hhhswfgg9f5ky3d82832hrq5a1jc0mg")))) + (base32 "06i2jsy7vigydci4261nfnh668rl5zrcss5icwxlqii928dkmy8y")))) (build-system emacs-build-system) (home-page "https://protesilaos.com/modus-themes/") (synopsis "Accessible themes (WCAG AAA)") From 6750e5a6e09255490b13d65a7274c0aff304e55d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 19 Nov 2021 09:33:34 +0100 Subject: [PATCH 094/234] gnu: Add r-lmom. * gnu/packages/statistics.scm (r-lmom): New variable. --- gnu/packages/statistics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 50e014ee8d..2a534b92b7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6699,3 +6699,25 @@ (define-public r-datasaurus Datasets with Varied Appearance and Identical Statistics through Simulated Annealing\" @url{doi:10.1145/3025453.3025912}.") (license license:expat))) + +(define-public r-lmom + (package + (name "r-lmom") + (version "2.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "lmom" version)) + (sha256 + (base32 "1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna")))) + (properties `((upstream-name . "lmom"))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/package=lmom") + (synopsis "L-Moments for R") + (description + "This package provides functions related to L-moments: computation +of L-moments and trimmed L-moments of distributions and data samples; +parameter estimation; L-moment ratio diagram; plot vs. quantiles of an +extreme-value distribution.") + (license license:cpl1.0))) From 3199b96b2eaf73c627491f7ad29efee1481a4398 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 19 Nov 2021 09:33:59 +0100 Subject: [PATCH 095/234] gnu: Add r-gld. * gnu/packages/statistics.scm (r-gld): New variable. --- gnu/packages/statistics.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2a534b92b7..d7ffa4355f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6721,3 +6721,36 @@ (define-public r-lmom parameter estimation; L-moment ratio diagram; plot vs. quantiles of an extreme-value distribution.") (license license:cpl1.0))) + +(define-public r-gld + (package + (name "r-gld") + (version "2.6.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "gld" version)) + (sha256 + (base32 "1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i")))) + (properties `((upstream-name . "gld"))) + (build-system r-build-system) + (propagated-inputs `(("r-e1071" ,r-e1071) ("r-lmom" ,r-lmom))) + (home-page + "https://cran.r-project.org/package=gld") + (synopsis + "Estimation and Use of the Generalised (Tukey) Lambda Distribution") + (description + "The generalised lambda distribution, or Tukey lambda distribution, +provides a wide variety of shapes with one functional form. This package +provides random numbers, quantiles, probabilities, densities and +density quantiles for four different types of the distribution, the FKML +(Freimer et al 1988), RS (Ramberg and Schmeiser 1974), GPD (van Staden +and Loots 2009) and FM5 - see documentation for details. It provides the +density function, distribution function, and Quantile-Quantile plots. +It implements a variety of estimation methods for the distribution, +including diagnostic plots. Estimation methods include the starship (all +4 types), method of L-Moments for the GPD and FKML types, and a number +of methods for only the FKML type. These include maximum likelihood, +maximum product of spacings, Titterington's method, Moments, Trimmed +L-Moments and Distributional Least Absolutes.") + (license license:gpl2+))) From 146ca5cd2f02c64c3ab3eef2ee0a7a7f2e8eaa01 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 19 Nov 2021 09:34:18 +0100 Subject: [PATCH 096/234] gnu: Add r-exact. * gnu/packages/statistics.scm (r-exact): New variable. --- gnu/packages/statistics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d7ffa4355f..0bcfe26080 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6754,3 +6754,32 @@ (define-public r-gld maximum product of spacings, Titterington's method, Moments, Trimmed L-Moments and Distributional Least Absolutes.") (license license:gpl2+))) + +(define-public r-exact + (package + (name "r-exact") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "Exact" version)) + (sha256 + (base32 "0acm01njg3arlzwknv5v1sdsz5ab0bdh04sn1bmf91hcg3li8qd7")))) + (properties `((upstream-name . "Exact"))) + (build-system r-build-system) + (propagated-inputs `(("r-rootsolve" ,r-rootsolve))) + (home-page "https://cran.r-project.org/package=Exact") + (synopsis "Unconditional Exact Test") + (description + "Performs unconditional exact tests and power calculations for 2x2 +contingency tables. For comparing two independent proportions, performs +@url{doi:10.1038/156177a0, Barnard's test (1945)} using the original CSM +test (@url{doi:10.1093/biomet/34.1-2.123, Barnard (1947)}), using Fisher's +p-value referred to as @url{doi:10.1111/j.1467-9574.1970.tb00104.x, +Boschloo's test (1970)}, or using a Z-statistic (@url{doi:10.2307/2981892, +Suissa and Shuster (1985)}). For comparing two binary proportions, +performs unconditional exact test using McNemar's Z-statistic +(@url{doi:10.1191/0962280203sm312ra, Berger and Sidik (2003)}), using +McNemar's Z-statistic with continuity correction, or using CSM test. +Calculates confidence intervals for the difference in proportion.") + (license license:gpl2))) From 2a3ca2696b3267bc098b7480ef57d2ecf5e2c018 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 19 Nov 2021 09:34:22 +0100 Subject: [PATCH 097/234] gnu: Add r-desctools. * gnu/packages/statistics.scm (r-desctools): New variable. --- gnu/packages/statistics.scm | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0bcfe26080..e69baee8bd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6783,3 +6783,50 @@ (define-public r-exact McNemar's Z-statistic with continuity correction, or using CSM test. Calculates confidence intervals for the difference in proportion.") (license license:gpl2))) + +(define-public r-desctools + (package + (name "r-desctools") + (version "0.99.43") + (source + (origin + (method url-fetch) + (uri (cran-uri "DescTools" version)) + (sha256 + (base32 "1zx4wwry7pph21q37r0r1vgx616pki232ych2wl9z2s2fmclwg4c")))) + (properties `((upstream-name . "DescTools"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-boot" ,r-boot) + ("r-data-table" ,r-data-table) + ("r-exact" ,r-exact) + ("r-expm" ,r-expm) + ("r-gld" ,r-gld) + ("r-mass" ,r-mass) + ("r-mvtnorm" ,r-mvtnorm) + ("r-rcpp" ,r-rcpp) + ("r-rstudioapi" ,r-rstudioapi))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://andrisignorell.github.io/DescTools/") + (synopsis "Tools for Descriptive Statistics") + (description + "This package provides a collection of miscellaneous basic statistic +functions and convenience wrappers for efficiently describing data. +The author's intention was to create a toolbox, which facilitates the +(notoriously time consuming) first descriptive tasks in data analysis, +consisting of calculating descriptive statistics, drawing graphical +summaries and reporting the results. The package contains furthermore +functions to produce documents using MS Word (or PowerPoint) and functions +to import data from Excel. Many of the included functions can be found +scattered in other packages and other sources written partly by Titans +of R. The reason for collecting them here, was primarily to have them +consolidated in ONE instead of dozens of packages (which themselves might +depend on other packages which are not needed at all), and to provide a +common and consistent interface as far as function and arguments naming, +NA handling, recycling rules etc. are concerned. Google style guides +were used as naming rules (in absence of convincing alternatives). +The BigCamelCase style was consequently applied to functions borrowed +from contributed R packages as well.") + (license license:gpl2+))) + From 8dfab10152f4c13d747afadfabf47001001e0260 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Nov 2021 10:35:03 +0100 Subject: [PATCH 098/234] gnu: emacs-toc-org: Update to 1.2.0. * gnu/packages/emacs-xyz.scm (emacs-toc-org): Update to 1.2.0. --- 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 1e5a3e2594..c844a7fb6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4033,7 +4033,7 @@ (define-public emacs-skempo (define-public emacs-toc-org (package (name "emacs-toc-org") - (version "1.1.0") + (version "1.2.0") (source (origin (method git-fetch) @@ -4042,7 +4042,7 @@ (define-public emacs-toc-org (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0lk0rji85a1c0c5r9an0fdvsm4n4jyixsknmr8ywha3lfmc2p0l8")))) + (base32 "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm")))) (build-system emacs-build-system) (home-page "https://github.com/snosov1/toc-org") (synopsis "Table of Contents generator for Emacs Org mode") From c7caeb33d63ce4a99beef478cfce20cc71e7cdda Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 16 Nov 2021 21:46:53 -0500 Subject: [PATCH 099/234] gnu: jgmenu: Update to 4.4.0. * gnu/packages/xdisorg.scm (jgmenu): Update to 4.4.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b0c2f9dd6a..bf82db5823 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2457,7 +2457,7 @@ (define-public autocutsel (define-public jgmenu (package (name "jgmenu") - (version "4.3.0") + (version "4.4.0") (source (origin (method git-fetch) @@ -2466,7 +2466,7 @@ (define-public jgmenu (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "13y4ra2hjfqbn2vxyyn4ar5iqklbabyfwksbryc2gzxspw1vz4zq")))) + (base32 "08dyygclayyipa0p2qsxqa3fsfyflkrkhpi25dkc3ybkicvynk24")))) (build-system gnu-build-system) (native-inputs `(("cppcheck" ,cppcheck) From a35debac9747686722a2c4951b69c6f26e3b7b3c Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:41:07 +0000 Subject: [PATCH 100/234] gnu: Add cl-genhash. * gnu/packages/lisp-xyz.scm (cl-genhash, ecl-genhash, sbcl-genhash): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index da03624c4a..332749e156 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18103,6 +18103,34 @@ (define-public ecl-hunchenissr-routes (define-public cl-hunchenissr-routes (sbcl-package->cl-source-package sbcl-hunchenissr-routes)) +(define-public sbcl-genhash + (let ((commit "220ae1af8361dbd2005177f2ee11072b6a33934f") + (revision "1")) + (package + (name "sbcl-genhash") + (version (git-version "1.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pnathan/genhash") + (commit commit))) + (file-name (git-file-name "cl-genhash" version)) + (sha256 + (base32 "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/pnathan/genhash") + (synopsis "Generic hash tables for Common Lisp") + (description + "This an implementation of CDR 2: generic hash tables for Common Lisp") + (license license:public-domain)))) + +(define-public cl-genhash + (sbcl-package->cl-source-package sbcl-genhash)) + +(define-public ecl-genhash + (sbcl-package->ecl-package sbcl-genhash)) + (define-public sbcl-spinneret ;; No release since 2019, no tags. (let ((commit "02451b32648eda4e6e4022bbb7f91d9ea71bebbc")) From 641e3d1288a22cd1e81e153c7fb1877a70e52b22 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:41:32 +0000 Subject: [PATCH 101/234] gnu: Add cl-path-parse. * gnu/packages/lisp-xyz.scm (cl-path-parse, ecl-path-parse, sbcl-path-parse): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 332749e156..69b04c8b67 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18192,6 +18192,39 @@ (define-public ecl-spinneret (define-public cl-spinneret (sbcl-package->cl-source-package sbcl-spinneret)) +(define-public sbcl-path-parse + (let ((commit "86183f3752374435f8933394b4c5d8e75a37a113") + (revision "1")) + (package + (name "sbcl-path-parse") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/path-parse") + (commit commit))) + (file-name (git-file-name "cl-path-parse" version)) + (sha256 + (base32 "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("split-sequence" ,sbcl-split-sequence))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/eudoxia0/path-parse") + (synopsis "Parse the PATH environment variable in Common Lisp") + (description + "This package provides a function to parse the @code{PATH} environment +variable portably in Common Lisp.") + (license license:expat)))) + +(define-public cl-path-parse + (sbcl-package->cl-source-package sbcl-path-parse)) + +(define-public ecl-path-parse + (sbcl-package->ecl-package sbcl-path-parse)) + (define-public sbcl-cl-libxml2 (let ((commit "8d03110c532c1a3fe15503fdfefe82f60669e4bd")) (package From 002e8bac4bd763eae062faf0ef09c2a55955740a Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:42:00 +0000 Subject: [PATCH 102/234] gnu: Add cl-pileup. * gnu/packages/lisp-xyz.scm (cl-pileup, ecl-pileup, sbcl-pileup): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 69b04c8b67..809d3f4651 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18311,6 +18311,40 @@ (define-public ecl-cl-libxml2 (define-public cl-libxml2 (sbcl-package->cl-source-package sbcl-cl-libxml2)) +(define-public sbcl-pileup + (let ((commit "f269473a570a8e55881082545ee63cfe5c7d3e72") + (revision "1")) + (package + (name "sbcl-pileup") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nikodemus/pileup") + (commit commit))) + (file-name (git-file-name "cl-pileup" version)) + (sha256 + (base32 "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads))) + (native-inputs + `(("hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) + (home-page "https://github.com/nikodemus/pileup") + (synopsis "Simple thread-safe binary heap implementation for Common Lisp") + (description + "@code{Pileup} is a portable, performant, and thread-safe binary heap +for Common Lisp.") + (license license:expat)))) + +(define-public cl-pileup + (sbcl-package->cl-source-package sbcl-pileup)) + +(define-public ecl-pileup + (sbcl-package->ecl-package sbcl-pileup)) + (define-public sbcl-feeder ;; No release. (let ((commit "b05f517d7729564575cc809e086c262646a94d34") From a5185d9b64798b3a2f4a133354a1da1b62f492fe Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:42:25 +0000 Subject: [PATCH 103/234] gnu: Add cl-routes. * gnu/packages/lisp-xyz.scm (cl-routes, ecl-routes, sbcl-routes): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 809d3f4651..bea3152e45 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18381,6 +18381,51 @@ (define-public ecl-feeder (define-public cl-feeder (sbcl-package->cl-source-package sbcl-feeder)) +(define-public sbcl-routes + (let ((commit "1b79e85aa653e1ec87e21ca745abe51547866fa9") + (revision "1")) + (package + (name "sbcl-routes") + (version (git-version "0.2.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/archimag/cl-routes") + (commit commit))) + (file-name (git-file-name "cl-routes" version)) + (sha256 + (base32 "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix: :FORCE and :FORCE-NOT arguments not allowed in + ;; a nested call to ASDF/OPERATE:OPERATE unless + ;; identically to toplevel + (substitute* "routes.asd" + ((" :force t") ""))))))) + (inputs + `(("iterate" ,sbcl-iterate) + ("puri" ,sbcl-puri) + ("split-sequence" ,sbcl-split-sequence))) + (native-inputs + `(("lift" ,sbcl-lift))) + (home-page "https://github.com/archimag/cl-routes") + (synopsis "Rails routes system for Common Lisp") + (description + "This is a a Common Lisp re-implementation of the Rails routes system +for mapping URLs.") + (license license:llgpl)))) + +(define-public cl-routes + (sbcl-package->cl-source-package sbcl-routes)) + +(define-public ecl-routes + (sbcl-package->ecl-package sbcl-routes)) + (define-public sbcl-terminfo (let ((commit "b8b2e3ed786bfcf9f1aa4a264cee2e93135080f5") (revision "1")) From df1e97a644ba30a743de64deed4486621b9b5403 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:42:48 +0000 Subject: [PATCH 104/234] gnu: Add cl-terminal-size. * gnu/packages/lisp-xyz.scm (cl-terminal-size, ecl-terminal-size, sbcl-terminal-size): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 bea3152e45..33eec1694b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18487,6 +18487,40 @@ (define-public cl-conium (define-public ecl-conium (sbcl-package->ecl-package sbcl-conium)) +(define-public sbcl-terminal-size + (let ((commit "e0b3d56a9dd3366baf2a05d84381da5747a2ef4a") + (revision "1")) + (package + (name "sbcl-terminal-size") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/terminal-size") + (commit commit))) + (file-name (git-file-name "cl-terminal-size" version)) + (sha256 + (base32 "1212wbadms9jzrqgarpj3d9xh9w4dab8jhx4k2aryqgf116zs42h")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("osicat" ,sbcl-osicat))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/eudoxia0/terminal-size") + (synopsis "Get the size of the terminal from Common Lisp") + (description + "This package provides the @{(terminal-size:size)} function to get the +size of the terminal from Common Lisp.") + (license license:expat)))) + +(define-public cl-terminal-size + (sbcl-package->cl-source-package sbcl-terminal-size)) + +(define-public ecl-terminal-size + (sbcl-package->ecl-package sbcl-terminal-size)) + (define-public sbcl-cl-readline (let ((commit "8438c9ebd92ccc95ebab9cc9cbe6c72d44fccc58") (revision "1")) From 03b146c45c5fe673eca6e423a860a0d4470d2109 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:43:10 +0000 Subject: [PATCH 105/234] gnu: Add cl-trivial-open-browser. * gnu/packages/lisp-xyz.scm (cl-trivial-open-browser, ecl-trivial-open-browser, sbcl-trivial-open-browser): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 33eec1694b..ad78f6a6b7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18860,6 +18860,34 @@ (define-public cl-charms (define-public ecl-cl-charms (sbcl-package->ecl-package sbcl-cl-charms)) +(define-public sbcl-trivial-open-browser + (let ((commit "7ab4743dea9d592639f15c565bfa0756e828c427") + (revision "1")) + (package + (name "sbcl-trivial-open-browser") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/trivial-open-browser") + (commit commit))) + (file-name (git-file-name "trivial-open-browser" version)) + (sha256 + (base32 "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/eudoxia0/trivial-open-browser") + (synopsis "Open a browser window from Common Lisp") + (description + "This package provides a library to open a web browser to a URL.") + (license license:expat)))) + +(define-public cl-trivial-open-browser + (sbcl-package->cl-source-package sbcl-trivial-open-browser)) + +(define-public ecl-trivial-open-browser + (sbcl-package->ecl-package sbcl-trivial-open-browser)) + (define-public sbcl-clinenoise (let ((commit "46e21f99d06a55d93eaa382cf652d55d457032ef") (revision "1")) From 04ed4a0e05c13c4fec499fe1f952f535c00c4000 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:43:33 +0000 Subject: [PATCH 106/234] gnu: Add cl-which. * gnu/packages/lisp-xyz.scm (cl-which, ecl-which, sbcl-which): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 ad78f6a6b7..8440f31e43 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19073,6 +19073,40 @@ (define-public cl-pass (define-public ecl-cl-pass (sbcl-package->ecl-package sbcl-cl-pass)) +(define-public sbcl-which + (let ((commit "b2333e4fcacab6e5d85eecd28b5ef4944bda1448") + (revision "1")) + (package + (name "sbcl-which") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/which") + (commit commit))) + (file-name (git-file-name "cl-which" version)) + (sha256 + (base32 "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-fad" ,sbcl-cl-fad) + ("path-parse" ,sbcl-path-parse))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/eudoxia0/which") + (synopsis "The which command in Common Lisp") + (description + "This package provides an implementation of the @code{which} UNIX +command in Common Lisp.") + (license license:expat)))) + +(define-public cl-which + (sbcl-package->cl-source-package sbcl-which)) + +(define-public ecl-which + (sbcl-package->ecl-package sbcl-which)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) From 4cc345faf950fe47afd38ce9657ce8d5d69acaf9 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:45:55 +0000 Subject: [PATCH 107/234] gnu: Add cl-trivial-raw-io. * gnu/packages/lisp-xyz.scm (cl-trivial-raw-io, ecl-trivial-raw-io, sbcl-trivial-raw-io): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8440f31e43..128aefb979 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18921,6 +18921,38 @@ (define-public cl-clinenoise (define-public ecl-clinenoise (sbcl-package->ecl-package sbcl-clinenoise)) +(define-public sbcl-trivial-raw-io + (let ((commit "b1a3c876305baa0dead419841de7b3e433a75867") + (revision "1")) + (package + (name "sbcl-trivial-raw-io") + (version (git-version "0.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kingcons/trivial-raw-io") + (commit commit))) + (file-name (git-file-name "trivial-raw-io" version)) + (sha256 + (base32 "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("sbcl-alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/kingcons/trivial-raw-io") + (synopsis "Trivial portability for raw *nix IO in Common Lisp") + (description + "This library exports three symbols: @code{with-raw-io}, +@code{read-char}, and @code{read-line}, to provide raw POSIX I/O in Common +Lisp.") + (license license:bsd-2)))) + +(define-public cl-trivial-raw-io + (sbcl-package->cl-source-package sbcl-trivial-raw-io)) + +(define-public ecl-trivial-raw-io + (sbcl-package->ecl-package sbcl-trivial-raw-io)) + (define-public sbcl-periodic-table (package (name "sbcl-periodic-table") From e3bba7f720d74320e24e752c9cdcb193a939480c Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 17 Nov 2021 05:46:38 +0000 Subject: [PATCH 108/234] gnu: Add cl-terminal-keypress. * gnu/packages/lisp-xyz.scm (cl-terminal-keypress, ecl-terminal-keypress, sbcl-terminal-keypress): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 128aefb979..541af9b7a8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18953,6 +18953,48 @@ (define-public cl-trivial-raw-io (define-public ecl-trivial-raw-io (sbcl-package->ecl-package sbcl-trivial-raw-io)) +(define-public sbcl-terminal-keypress + (let ((commit "2ef48c045aa627229764b2aa393a83d392d93d08") + (revision "1")) + (package + (name "sbcl-terminal-keypress") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/terminal-keypress") + (commit commit))) + (file-name (git-file-name "cl-terminal-keypress" version)) + (sha256 + (base32 "11c4krpq5x55qkchx6ykcnb455ssb4r3jjywx3c3irfrkj733ybp")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("trivial-raw-io" ,sbcl-trivial-raw-io))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/eudoxia0/terminal-keypress") + (synopsis "Read keyboard events in the terminal from Common Lisp") + (description + "This is a library for reading semi-raw user input from terminals. +Semi-raw as in, we can't detect if the user pressed the @code{Control} key +alone, and the function keys are a mystery. What is supported, however, is: + +@itemize +@item Regular characters +@item Control+[key] +@item Alt+[key] +@item Control+Alt+[key] +@end itemize") + (license license:expat)))) + +(define-public cl-terminal-keypress + (sbcl-package->cl-source-package sbcl-terminal-keypress)) + +(define-public ecl-terminal-keypress + (sbcl-package->ecl-package sbcl-terminal-keypress)) + (define-public sbcl-periodic-table (package (name "sbcl-periodic-table") From ad9b5cd19bfd44fdbce2f279a50886a90df29262 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Nov 2021 10:51:09 +0100 Subject: [PATCH 109/234] gnu: emacs-evil-multiedit: Update to 1.4.1. * gnu/packages/emacs-xyz.scm (emacs-evil-multiedit): Update to 1.4.1. [arguments]<#:phases>: Prevent test suite from downloading packages. Remove trailing #t. --- gnu/packages/emacs-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c844a7fb6d..c111f83823 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20770,7 +20770,7 @@ (define-public emacs-evil-magit (define-public emacs-evil-multiedit (package (name "emacs-evil-multiedit") - (version "1.3.9") + (version "1.4.1") (source (origin (method git-fetch) @@ -20779,8 +20779,7 @@ (define-public emacs-evil-multiedit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "19h3kqylqzbjv4297wkzzxdmn9yxbg6z4ga4ssrqri90xs7m3rw3")))) + (base32 "0iwrfkgs0964kxj3kwi8dqn42flhg2pnp4iswc07xi8ri2lflnkv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) @@ -20790,15 +20789,15 @@ (define-public emacs-evil-multiedit (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'fix-makefile + (add-before 'check 'fix-checks (lambda _ (substitute* "Makefile" (("@cask exec ") "")) - #t))) + (substitute* "test/test-helper.el" + (("'\\(evil iedit\\)") "nil"))))) #:tests? #t #:test-command '("make" "test"))) - (home-page - "https://github.com/hlissner/evil-multiedit") + (home-page "https://github.com/hlissner/evil-multiedit") (synopsis "Multiple cursors for Evil mode") (description "This plugin was an answer to the lack of proper multiple cursor support From 56db786591f14488656b099aef04539a90821993 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:09:42 +0100 Subject: [PATCH 110/234] build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs. Inputs can be non-packages, for instance (origin ...). sbcl-package->cl-source-package used to fail if such inputs were present in the parent sbcl-* package. * guix/build-system/asdf.scm (package-with-build-system): Fix 'has-from-build-system?' function. --- guix/build-system/asdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index b4e40ee8c2..4edf6857b5 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -162,7 +162,8 @@ (define (transform-package-name name) name)) (define (has-from-build-system? pkg) - (eq? from-build-system (package-build-system pkg))) + (and (package? pkg) + (eq? from-build-system (package-build-system pkg)))) (define (find-input-package pkg) (let* ((name (package-name pkg)) From 0f2a6fa49c4fa49532ed4216937b0bf9f08ab516 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 11:53:02 +0100 Subject: [PATCH 111/234] 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 541af9b7a8..b6e33bb1c3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19574,3 +19574,85 @@ (define-public sbcl-vernacular (define-public cl-vernacular (sbcl-package->cl-source-package sbcl-vernacular)) + +(define-public sbcl-cl-https-everywhere + ;; No release. + ;; Don't forget to update the https-everywhere input. + (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 ((version "2021.7.13")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/EFForg/https-everywhere") + (commit version))) + (file-name (git-file-name "https-everywhere" version)) + (sha256 + (base32 + "1k5gj29imhxf47sv3d8rxyrgr6k65scp2fm040va3nfshayslzia"))))))) + (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)) From 044161025e1d533de57dd380da206fd6db462e66 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Nov 2021 11:13:54 +0100 Subject: [PATCH 112/234] gnu: sbcl-cl-webkit: Update to 3.4.0. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 3.4.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 b6e33bb1c3..1f1fc11d52 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3230,7 +3230,7 @@ (define-public ecl-cl-cffi-gtk (define-public sbcl-cl-webkit (package (name "sbcl-cl-webkit") - (version "3.2.0") + (version "3.4.0") (source (origin (method git-fetch) @@ -3240,7 +3240,7 @@ (define-public sbcl-cl-webkit (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "1c0kas8k02167v5f1gjbhy3741b7ky91x7lkc5bh5429jmbpiapf")))) + "0l6ml7g0r0kzbgf49bsgj2yxhgralh8fc0h9vpc79fvw20qgsd56")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) From bd2aa8031babdca5f574fca52e025d6794f08d82 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Nov 2021 11:20:32 +0100 Subject: [PATCH 113/234] gnu: nyxt: Update to 2.2.3. * gnu/packages/web-browsers.scm (nyxt): Update to 2.2.3. --- gnu/packages/web-browsers.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 3b495b8978..7ea2a9a9ec 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -577,7 +577,7 @@ (define-public vimb (define-public nyxt (package (name "nyxt") - (version "2.2.0") + (version "2.2.3") (source (origin (method git-fetch) @@ -586,11 +586,11 @@ (define-public nyxt (commit version))) (sha256 (base32 - "0l8x32fsvk2gbymcda1yc0ggnsymjazqd58vmi05ifiiv7jwxyjw")) + "1v1szbj44pwxh3k70fvg78xjfkab29dqnlafa722sppdyqd06cqp")) (file-name (git-file-name "nyxt" version)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "nyxt" "NYXT_INTERNAL_QUICKLISP=false" + `(#:make-flags (list "nyxt" "NYXT_SUBMODULES=false" (string-append "DESTDIR=" (assoc-ref %outputs "out")) "PREFIX=") #:strip-binaries? #f ; Stripping breaks SBCL binaries. @@ -685,9 +685,9 @@ (define-public nyxt ("gobject-introspection" ,gobject-introspection))) (synopsis "Extensible web-browser in Common Lisp") (home-page "https://nyxt.atlas.engineer") - (description "Nyxt is a keyboard-oriented, extensible web browser designed -for power users. Conceptually inspired by Emacs and Vim, it has familiar -key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.") + (description "Nyxt is a keyboard-oriented, extensible web-browser designed +for power users. The application has familiar Emacs and VI key-bindings and +is fully configurable and extensible in Common Lisp.") (license license:bsd-3))) (define-public lagrange From 42070c199a28ea2c1b480ec134ee843878c8253e Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 19 Nov 2021 12:47:15 +0100 Subject: [PATCH 114/234] gnu: emacs-flymake-kondor: Update to 0.1.3. * gnu/packages/emacs-xyz.scm (emacs-flymake-kondor): Update to 0.1.3. --- gnu/packages/emacs-xyz.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c111f83823..7f895b9321 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1634,26 +1634,23 @@ (define-public emacs-flymake-quickdef (license license:gpl3+)))) (define-public emacs-flymake-kondor - ;; 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+)))) + (package + (name "emacs-flymake-kondor") + (version "0.1.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 "1vcl1q07faqqmrryyia36hbgf78g3cs51pbi0bx41yzz779ribvk")))) + (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. From b5d51bb19e790baee9b16a3325397ec92d8e7625 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 16 Nov 2021 11:12:34 +0100 Subject: [PATCH 115/234] import: opam: Warn instead of leave when fetching fails. * guix/import/opam.scm (opam-featch): Warn instead of leave when fetching fails. Signed-off-by: Julien Lepiller --- guix/import/opam.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index fe13d29f03..0804526e3a 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -318,7 +318,7 @@ (define* (opam-fetch name #:optional (repositories-specs '("opam"))) (_ others))) #f (filter-map get-opam-repository repositories-specs)) - (leave (G_ "package '~a' not found~%") name))) + (warning (G_ "opam: package '~a' not found~%") name))) (define* (opam->guix-package name #:key (repo '()) version) "Import OPAM package NAME from REPOSITORIES (a list of names, URLs or local From 6460345725a5021c8740f77e68724e5bb880d6a4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 13:55:19 +0100 Subject: [PATCH 116/234] gnu: ocaml-ounit: Update to 2.2.4. * gnu/packages/ocaml.scm (ocaml-ounit): Update to 2.2.4. Inherit from ocaml-ounit2. [arguments]: Use installation instructions from opam. --- gnu/packages/ocaml.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c83cbca9c..54c1188d90 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1360,22 +1360,17 @@ (define-public ocaml-ounit2 ;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit (package + (inherit ocaml-ounit2) (name "ocaml-ounit") - (version "2.0.8") - (source (origin - (method url-fetch) - (uri (ocaml-forge-uri "ounit" version 1749)) - (sha256 - (base32 - "03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f")))) - (build-system ocaml-build-system) - (native-inputs - `(("libxml2" ,libxml2) ; for xmllint - ("ocamlbuild" ,ocamlbuild))) (arguments `(#:phases (modify-phases %standard-phases - (delete 'check)))) ; tests are run during build + (replace 'install + (lambda _ + (invoke "make" "install-ounit" ,(string-append "version=" + (package-version ocaml-ounit2)))))))) + (propagated-inputs + `(("ocaml-ounit2" ,ocaml-ounit2))) (home-page "http://ounit.forge.ocamlcore.org") (synopsis "Unit testing framework for OCaml") (description "Unit testing framework for OCaml. It is similar to JUnit and From 54cc341e24a5621e44e775a28f400a5e5e2b9166 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 19 Nov 2021 06:19:29 -0500 Subject: [PATCH 117/234] gnu: mycli: Update to 1.24.1. * gnu/packages/databases.scm (mycli): Update to 1.24.1. [propagated-inputs]: Add python-pyaes and python-pyperclip. Signed-off-by: Arun Isaac --- gnu/packages/databases.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index de161e1864..230f7c2490 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +146,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -618,13 +620,13 @@ (define-public python2-pylibmc (define-public mycli (package (name "mycli") - (version "1.22.2") + (version "1.24.1") (source (origin (method url-fetch) (uri (pypi-uri "mycli" version)) (sha256 - (base32 "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv")))) + (base32 "0rij9nw20zhqr7cqnkm8daw8b1wdc9zb6ny1ji9qz5557nz9i3bl")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; tests expect a running MySQL @@ -634,8 +636,10 @@ (define-public mycli ("python-configobj" ,python-configobj) ("python-cryptography" ,python-cryptography) ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-pyaes" ,python-pyaes) ("python-pygments" ,python-pygments) ("python-pymysql" ,python-pymysql) + ("python-pyperclip" ,python-pyperclip) ("python-sqlparse" ,python-sqlparse))) (home-page "http://mycli.net") (synopsis From 256c3e714a459af6db2343c9120c7180c5a14462 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 19 Nov 2021 21:34:48 +0530 Subject: [PATCH 118/234] gnu: mycli: Update home page. * gnu/packages/databases.scm (mycli)[home-page]: Update. --- 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 230f7c2490..dfa833b62a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017, 2020 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2021 Arun Isaac ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft @@ -641,7 +641,7 @@ (define-public mycli ("python-pymysql" ,python-pymysql) ("python-pyperclip" ,python-pyperclip) ("python-sqlparse" ,python-sqlparse))) - (home-page "http://mycli.net") + (home-page "https://www.mycli.net") (synopsis "Terminal Client for MySQL with AutoCompletion and Syntax Highlighting") (description From 24224530d1f4a70808d003ba8dce849b77625b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Nov 2021 14:53:25 +0100 Subject: [PATCH 119/234] daemon: Micro-optimize 'deletePath'. 'remove' calls 'unlink' first and falls back to 'rmdir' upon EISDIR. This change gets rid of the 'unlink' call for every directory being removed. * nix/libutil/util.cc (_deletePath): Call 'unlink' or 'rmdir' depending on 'st.st_mode', rather than call 'remove'. --- nix/libutil/util.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 69f1c634a9..4d3780e3c2 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -337,12 +337,15 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed, size for (auto & i : readDirectory(path)) _deletePath(path + "/" + i.name, bytesFreed, linkThreshold); } + + int ret; + ret = S_ISDIR(st.st_mode) ? rmdir(path.c_str()) : unlink(path.c_str()); + if (ret == -1) + throw SysError(format("cannot unlink `%1%'") % path); + #undef st_mode #undef st_size #undef st_nlink - - if (remove(path.c_str()) == -1) - throw SysError(format("cannot unlink `%1%'") % path); } From 7cad4466533f14ec7e9d8744b26a8d5211ff39d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Nov 2021 23:03:26 +0100 Subject: [PATCH 120/234] gnu: cl-cxml-rng: Fix license. This is a followup to 3f6953b54e183a36d6e5a2c6d7a5a3d4a09b8a53. * gnu/packages/lisp-xyz.scm (sbcl-cxml-rng)[license]: Change to 'license:bsd-2'. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1f1fc11d52..077f8ed007 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5803,7 +5803,7 @@ (define-public sbcl-cxml-rng 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)))) + (license license:bsd-2)))) (define-public cl-cxml-rng (sbcl-package->cl-source-package sbcl-cxml-rng)) From c83dbe2cc0a284ee12ab199b4ad138ec092bc739 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 23:44:16 +0100 Subject: [PATCH 121/234] gnu: ocaml-uuseg: Update to 14.0.0. * gnu/packages/ocaml.scm (ocaml-uuseg): Update to 14.0.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 54c1188d90..769d063929 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7128,7 +7128,7 @@ (define-public ocaml-uucp (define-public ocaml-uuseg (package (name "ocaml-uuseg") - (version "13.0.0") + (version "14.0.0") (source (origin (method url-fetch) @@ -7136,7 +7136,7 @@ (define-public ocaml-uuseg "uuseg-" version ".tbz")) (sha256 (base32 - "1a635j8ra6p27g1ivfln3387lhwqmf6vq4r6bn7b6n1qsqyi1rls")))) + "1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p")))) (build-system ocaml-build-system) (arguments '(#:build-flags '("build" "--tests" "true") From a37f84fd617c107db0ac2f2fbd715b73be4b2d12 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 23:52:45 +0100 Subject: [PATCH 122/234] gnu: ocaml-uucd: Update to 14.0.0. * gnu/packages/ocaml.scm (ocaml-uucd): Update to 14.0.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 769d063929..3e8a698da9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7063,7 +7063,7 @@ (define-public ocaml-reactivedata (define-public ocaml-uucd (package (name "ocaml-uucd") - (version "13.0.0") + (version "14.0.0") (source (origin (method url-fetch) @@ -7071,7 +7071,7 @@ (define-public ocaml-uucd "uucd-" version ".tbz")) (sha256 (base32 - "1fg77hg4ibidkv1x8hhzl8z3rzmyymn8m4i35jrdibb8adigi8v2")))) + "0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30")))) (build-system ocaml-build-system) (arguments '(#:build-flags '("build" "--tests" "true") From ee1188dcb1f2ef265902ec3e7c01ad2e2202b1ad Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 23:53:47 +0100 Subject: [PATCH 123/234] gnu: ocaml-uucp: Update to 14.0.0. * gnu/packages/ocaml.scm (ocaml-uucp): Update to 14.0.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3e8a698da9..e8f8e97332 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7096,7 +7096,7 @@ (define-public ocaml-uucd (define-public ocaml-uucp (package (name "ocaml-uucp") - (version "13.0.0") + (version "14.0.0") (source (origin (method url-fetch) @@ -7104,7 +7104,7 @@ (define-public ocaml-uucp "uucp-" version ".tbz")) (sha256 (base32 - "19kf8ypxaakacgg1dwwfzkc2zicaj88cmw11fw2z7zl24dn4gyiq")))) + "1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj")))) (build-system ocaml-build-system) (arguments '(#:build-flags '("build" "--tests" "true") From 4f86ef865e71f110bd0f198fc1b175d32742fe7e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 19 Nov 2021 23:57:38 +0100 Subject: [PATCH 124/234] gnu: ocaml-uunf: Update to 14.0.0. * gnu/packages/ocaml.scm (ocaml-uunf): Update to 14.0.0. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e8f8e97332..f7e1c730f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2794,14 +2794,15 @@ (define-public ocaml-uutf (define-public ocaml-uunf (package (name "ocaml-uunf") - (version "13.0.0") + (version "14.0.0") (source (origin (method url-fetch) - (uri "https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz") + (uri (string-append "https://erratique.ch/software/uunf/releases/uunf-" + version".tbz")) (sha256 (base32 - "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm")))) + "17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2")))) (build-system ocaml-build-system) (arguments `(#:build-flags (list "build" "--tests" "true") @@ -2817,15 +2818,16 @@ (define-public ocaml-uunf `(("ocamlbuild" ,ocamlbuild) ("opam" ,opam) ("topkg" ,ocaml-topkg) - ;; Test data is otherwise downloaded wit curl + ;; Test data is otherwise downloaded with curl ("NormalizationTest.txt" ,(origin (method url-fetch) (uri (string-append "https://www.unicode.org/Public/" version "/ucd/NormalizationTest.txt")) + (file-name (string-append "NormalizationTest-" version ".txt")) (sha256 - (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))))) + (base32 "0c93pqdkksf7b7zw8y2w0h9i5kkrsdjmh2cr5clrrhp6mg10rcvw")))))) (propagated-inputs `(("ocaml-uutf" ,ocaml-uutf))) (home-page "https://erratique.ch/software/uunf") (synopsis "Unicode text normalization for OCaml") From be9ae1347c7eb9508b79661232372559bfe03711 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:15:10 +0100 Subject: [PATCH 125/234] gnu: ocaml-menhir: Update to 20211012. * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20211012. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f7e1c730f9..146040702b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1060,7 +1060,7 @@ (define-public emacs-tuareg (define-public ocaml-menhir (package (name "ocaml-menhir") - (version "20210419") + (version "20211012") (source (origin (method git-fetch) @@ -1069,7 +1069,7 @@ (define-public ocaml-menhir (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0jcbr7s3iwfr7xxfybs3h407g76yfp5yq5r9i0wg2ahvvbqh03ky")))) + (base32 "08kf5apbv15n2kcr3qhyr3rvsf2lg25ackr3x9kfgiiqc0p3sz40")))) (build-system dune-build-system) (inputs `(("ocaml" ,ocaml))) From cebc0e54a473c78bf0ad4c255ae7bef660b05e78 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:20:42 +0100 Subject: [PATCH 126/234] gnu: Add ocaml4.07-base64. * gnu/packages/ocaml.scm (ocaml4.07-base64): New variable. --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 146040702b..8bbc6fb6a3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2986,6 +2986,7 @@ (define-public ocaml-base64 `(("ocaml-alcotest" ,ocaml-alcotest) ("ocaml-bos" ,ocaml-bos) ("ocaml-rresult" ,ocaml-rresult))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64)))) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") (description "Base64 is a group of similar binary-to-text encoding schemes @@ -2993,6 +2994,25 @@ (define-public ocaml-base64 radix-64 representation. It is specified in RFC 4648.") (license license:isc))) +(define-public ocaml4.07-base64 + (package-with-ocaml4.07 + (package + (inherit ocaml-base64) + (version "3.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-base64") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml-base64" version)) + (sha256 + (base32 + "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) + (arguments + ;; Tests are likely incompatible with our recent alcotest + `(#:tests? #f)) + (properties '())))) + (define-public ocamlify (package (name "ocamlify") From e1a8ba10ecfb7ca29f9efb0a75dc960f5cb49f71 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:22:50 +0100 Subject: [PATCH 127/234] gnu: Add ocaml4.07-cstruct. * gnu/packages/ocaml.scm (ocaml4.07-cstruct): New variable. --- gnu/packages/ocaml.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8bbc6fb6a3..4f3afd8a3b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3459,6 +3459,7 @@ (define-public ocaml-cstruct `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-cstruct)))) (home-page "https://github.com/mirage/ocaml-cstruct") (synopsis "Access C structures via a camlp4 extension") (description "Cstruct is a library and syntax extension to make it easier @@ -3466,6 +3467,22 @@ (define-public ocaml-cstruct writing to these structures, and they are accessed via the Bigarray module.") (license license:isc))) +(define-public ocaml4.07-cstruct + (package-with-ocaml4.07 + (package + (inherit ocaml-cstruct) + (version "5.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-cstruct") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml-cstruct" version)) + (sha256 + (base32 + "0jj3whs8r3jc524i9bb67rffh7y7r157hjgvws0bkxijxpjzwkbk")))) + (properties '())))) + (define-public ocaml-hex (package (name "ocaml-hex") From 5f7fb8bd37768174981e2e5c497bd01da3675f17 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:35:10 +0100 Subject: [PATCH 128/234] gnu: coq-flocq: Update home-page. * gnu/packages/coq.scm (coq-flocq)[home-page]: Update. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index a0579f8869..a53c63593b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -237,7 +237,7 @@ (define-public coq-flocq (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "https://flocq.gforge.inria.fr/") + (home-page "https://flocq.gitlabpages.inria.fr/") (synopsis "Floating-point formalization for the Coq system") (description "Flocq (Floats for Coq) is a floating-point formalization for the Coq system. It provides a comprehensive library of theorems on a multi-radix From d326fdb7af55dcfac696954d8663d95c849b8d09 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:36:57 +0100 Subject: [PATCH 129/234] gnu: coq-gappa: Update home-page. * gnu/packages/coq.scm (coq-gappa)[home-page]: Update. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index a53c63593b..d413beab26 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -237,7 +237,7 @@ (define-public coq-flocq (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "https://flocq.gitlabpages.inria.fr/") + (home-page "https://flocq.gitlabpages.inria.fr") (synopsis "Floating-point formalization for the Coq system") (description "Flocq (Floats for Coq) is a floating-point formalization for the Coq system. It provides a comprehensive library of theorems on a multi-radix @@ -295,7 +295,7 @@ (define-public coq-gappa ;; (lambda _ (invoke "./remake" "check"))) (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "https://gappa.gforge.inria.fr/") + (home-page "https://gappa.gitlabpages.inria.fr/") (synopsis "Verify and formally prove properties on numerical programs") (description "Gappa is a tool intended to help verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point From 27c701a17bd86b8fee5196013d3d17b401476be5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 00:37:46 +0100 Subject: [PATCH 130/234] gnu: coq-interval: Update home-page. * gnu/packages/coq.scm (coq-interval)[home-page]: Update. --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index d413beab26..91290c8584 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -476,7 +476,7 @@ (define-public coq-interval (lambda _ (invoke "./remake" "check"))) (replace 'install (lambda _ (invoke "./remake" "install")))))) - (home-page "http://coq-interval.gforge.inria.fr/") + (home-page "https://coqinterval.gitlabpages.inria.fr/") (synopsis "Coq tactics to simplify inequality proofs") (description "Interval provides vernacular files containing tactics for simplifying the proofs of inequalities on expressions of real numbers for the From 718700cc95c1d17dbbde45af8c115a361edacb0e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 01:12:45 +0100 Subject: [PATCH 131/234] gnu: ocaml-bitsring: Update to 4.1.0. * gnu/packages/ocaml.scm (ocaml-bitstring): Update to 4.1.0. (ocaml4.07-bitstring): New variable. --- gnu/packages/ocaml.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4f3afd8a3b..c6ea943482 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1845,22 +1845,23 @@ (define-public ocaml-ppx-tools-versioned (define-public ocaml-bitstring (package (name "ocaml-bitstring") - (version "3.1.0") + (version "4.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/thanatonauts/bitstring/" - "get/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xguerin/bitstring") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) + "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b")))) (build-system dune-build-system) (native-inputs `(("time" ,time) ("autoconf" ,autoconf) ("automake" ,automake))) (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) (arguments `(#:package "bitstring" #:tests? #f; Tests fail to build @@ -1870,6 +1871,7 @@ (define-public ocaml-bitstring (lambda _ (invoke "dune" "upgrade") #t))))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-bitstring)))) (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as @@ -1878,6 +1880,23 @@ (define-public ocaml-bitstring as primitives to the language, making it exceptionally simple to use and very powerful.") (license license:isc))) + +(define-public ocaml4.07-bitstring + (package-with-ocaml4.07 + (package + (inherit ocaml-bitstring) + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/thanatonauts/bitstring/" + "get/v" version ".tar.gz")) + (file-name (string-append "ocaml-bitsring-" version ".tar.gz")) + (sha256 + (base32 + "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) + (propagated-inputs + `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) + (properties '())))) (define-public ocaml-result (package From 58d65f9da834dd07bf224a448cd6917bc2c24da8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 03:08:21 +0100 Subject: [PATCH 132/234] gnu: ocaml-menhir: Make it its own variant. * gnu/packages/ocaml.scm (ocaml-menhir)[properties]: Use the same menhir even with ocaml-4.07. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c6ea943482..29499dda1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1075,6 +1075,7 @@ (define-public ocaml-menhir `(("ocaml" ,ocaml))) (arguments `(#:tests? #f)) ; No check target + (properties `((ocaml4.07-variant . ,(delay (strip-ocaml4.07-variant ocaml-menhir))))) (home-page "http://gallium.inria.fr/~fpottier/menhir/") (synopsis "Parser generator") (description "Menhir is a parser generator. It turns high-level grammar From 25be347f0052a273a006f74e573116ec491f182a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 02:00:25 +0100 Subject: [PATCH 133/234] gnu: ocaml-compiler-libs: Update to 0.12.4. * gnu/packages/ocaml.scm (ocaml-compiler-libs): Update to 0.12.4. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 29499dda1c..d431286676 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5003,7 +5003,7 @@ (define-public ocaml4.07-base (define-public ocaml-compiler-libs (package (name "ocaml-compiler-libs") - (version "0.12.3") + (version "0.12.4") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source (origin @@ -5014,7 +5014,7 @@ (define-public ocaml-compiler-libs (file-name (git-file-name name version)) (sha256 (base32 - "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5")))) + "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ;no tests (properties `((upstream-name . "ocaml-compiler-libs") From 8e15801f2322ca56ebaa4e4dac1a9bb8de363fe0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 02:47:42 +0100 Subject: [PATCH 134/234] gnu: ocaml-csexp: Update to 1.5.1. * gnu/packages/ocaml.scm (ocaml-csexp): Update to 1.5.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d431286676..73884847b5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1718,7 +1718,7 @@ (define-public ocaml4.07-dune (define-public ocaml-csexp (package (name "ocaml-csexp") - (version "1.3.2") + (version "1.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -1727,7 +1727,7 @@ (define-public ocaml-csexp (file-name (git-file-name name version)) (sha256 (base32 - "190zppgvdjgghmrnx67ayzzk86qdjy3yn5fcrcw08wsh93384pl0")))) + "1v5y4x1a21193h8q536c0s0d8hv3hyyky4pgzm2dw9807v36s2x4")))) (build-system dune-build-system) (arguments `(#:tests? #f; FIXME: needs ppx_expect, but which version? From b8f950cf9d7b13172c83a1c9f2a88e59658a8521 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 02:49:04 +0100 Subject: [PATCH 135/234] gnu: ocaml-csv: Update to 2.4. * gnu/packages/ocaml.scm (ocaml-csv): Update to 2.4. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 73884847b5..111b9e31a3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2048,7 +2048,7 @@ (define-public ocaml4.07-sqlite3 (define-public ocaml-csv (package (name "ocaml-csv") - (version "2.3") + (version "2.4") (source (origin (method git-fetch) @@ -2058,7 +2058,7 @@ (define-public ocaml-csv (file-name (git-file-name name version)) (sha256 (base32 - "19k48517s8y1zb91a1312a0n94cbh5i5dixndcrqjmf87kkz61zx")))) + "0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf")))) (build-system dune-build-system) (arguments `(#:package "csv" From 32cecfa057b11969c60c2d41e79b17ce74e80d12 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 02:57:53 +0100 Subject: [PATCH 136/234] gnu: ocaml-fileutils: Update to 0.6.3. * gnu/packages/ocaml.scm (ocaml-fileutils): Update to 0.6.3. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 111b9e31a3..23b022984d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3258,7 +3258,7 @@ (define-public ocaml-stdlib-shims (define-public ocaml-fileutils (package (name "ocaml-fileutils") - (version "0.6.2") + (version "0.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -3267,7 +3267,7 @@ (define-public ocaml-fileutils (file-name (git-file-name name version)) (sha256 (base32 - "01qf51b8pb7vyfba7y0kb7ajwj1950im25d7f59821zwsibns3d9")))) + "0aa7p5qymi8p7iqym42yk2akjd1ff81fvaks82nhjc533zl01pnf")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) From 42eeea188d03e5c9943d653ec0afa6ff0ae2a9ad Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 03:05:18 +0100 Subject: [PATCH 137/234] gnu: ocaml-frontc: Update to 4.1.0. * gnu/packages/ocaml.scm (ocaml-frontc): Update to 4.1.0. (ocaml4.07-frontc): New variable. --- gnu/packages/ocaml.scm | 80 ++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 23b022984d..a15842a8b6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1478,41 +1478,29 @@ (define-public ocaml-zarith (define-public ocaml-frontc (package (name "ocaml-frontc") - (version "3.4.2") + (version "4.1.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/BinaryAnalysisPlatform/FrontC") - (commit (string-append - "V_" (string-join (string-split version #\.) "_"))))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102")))) - (build-system ocaml-build-system) + "1mi1vh4qgscnb470qwidccaqd068j1bqlz6pf6wddk21paliwnqb")))) + (build-system dune-build-system) (arguments - `(#:phases + `(#:test-target "test.t" + #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'install 'install-meta - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-output-to-file - (string-append out "/lib/ocaml/frontc/META") - (lambda _ - (display - (string-append - "description = \"Parser for the C language\" -version = \"" ,version "\" -requires = \"unix\" -archive(byte) = \"frontc.cma\" -archive(native) = \"frontc.cmxa\"")))) - (symlink (string-append out "/lib/ocaml/frontc") - (string-append out "/lib/ocaml/FrontC")))))) - #:make-flags (list (string-append "PREFIX=" - (assoc-ref %outputs "out")) - "OCAML_SITE=$(LIB_DIR)/ocaml/"))) - (properties `((upstream-name . "FrontC"))) + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files "." "."))))))) + (native-inputs + `(("ocaml-menhir" ,ocaml-menhir) + ("ocaml-odoc" ,ocaml-odoc))) + (properties `((upstream-name . "FrontC") + (ocaml4.07-variant . ,(delay ocaml4.07-frontc)))) (home-page "https://www.irit.fr/FrontC") (synopsis "C parser and lexer library") (description "FrontC is an OCAML library providing a C parser and lexer. @@ -1521,6 +1509,46 @@ (define-public ocaml-frontc GNU CC attributes. It provides also a C pretty printer as an example of use.") (license license:lgpl2.1))) +(define-public ocaml4.07-frontc + (package-with-ocaml4.07 + (package + (inherit ocaml-frontc) + (version "3.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-base64") + (commit (string-append + "V_" (string-join (string-split version #\.) "_"))))) + (file-name (git-file-name "ocaml-frontc" version)) + (sha256 + (base32 + "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102")))) + (build-system ocaml-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'install-meta + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-output-to-file + (string-append out "/lib/ocaml/frontc/META") + (lambda _ + (display + (string-append + "description = \"Parser for the C language\" +version = \"" ,version "\" +requires = \"unix\" +archive(byte) = \"frontc.cma\" +archive(native) = \"frontc.cmxa\"")))) + (symlink (string-append out "/lib/ocaml/frontc") + (string-append out "/lib/ocaml/FrontC")))))) + #:make-flags (list (string-append "PREFIX=" + (assoc-ref %outputs "out")) + "OCAML_SITE=$(LIB_DIR)/ocaml/"))) + (properties '())))) + (define-public ocaml-qcheck (package (name "ocaml-qcheck") From 70a88dac11d3cb47c1058ed65d3970fe27517c77 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 04:02:54 +0100 Subject: [PATCH 138/234] gnu: laby: Fix build. * gnu/packages/games.scm (laby)[inputs]: Use lablgtk3. [arguments]: Remove allow-unsafe-strings phase. --- gnu/packages/games.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 395b108ef4..3b40a8babd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5642,7 +5642,7 @@ (define-public laby (patches (search-patches "laby-make-install.patch")))) (build-system gnu-build-system) (inputs - `(("lablgtk" ,lablgtk) + `(("lablgtk3" ,lablgtk3) ("ocaml" ,ocaml) ("ocaml-findlib" ,ocaml-findlib) ("ocamlbuild" ,ocamlbuild))) @@ -5650,15 +5650,9 @@ (define-public laby '(#:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'build 'allow-unsafe-strings - ;; Fix a build failure with ocaml >=4.06.0. - ;; See . - (lambda _ - (setenv "OCAMLPARAM" "safe-string=0,_") - #t)) (add-before 'build 'set-library-path (lambda* (#:key inputs #:allow-other-keys) - (let ((lablgtk (assoc-ref inputs "lablgtk"))) + (let ((lablgtk (assoc-ref inputs "lablgtk3"))) (setenv "LD_LIBRARY_PATH" (string-append lablgtk "/lib/ocaml/stublibs")))))) #:tests? #f ; no 'check' target From 2afe2fe85e05e2f0e4c5b385d1d9d0c2b71077ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 20 Nov 2021 09:42:46 +0100 Subject: [PATCH 139/234] gnu: emacs-iter2: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-iter2): Update to 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 7f895b9321..99589fd9c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29352,7 +29352,7 @@ (define-public emacs-html-to-hiccup (define-public emacs-iter2 (package (name "emacs-iter2") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -29361,7 +29361,7 @@ (define-public emacs-iter2 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx")))) + (base32 "12flc98nv353cqr9qbkasgdmiyf9c3iw4apzh899xw857j1h5qdr")))) (build-system emacs-build-system) (home-page "https://github.com/doublep/iter2") (synopsis "Reimplementation of Elisp generators") From 5c0e4cb107515310b0a28c48520bb34ad80102ac Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 20 Nov 2021 09:52:20 +0100 Subject: [PATCH 140/234] gnu: python-folium: Fix build. * gnu/packages/python-xyz.scm (python-folium): Update hash. Upstream apparently re-tagged a different commit. --- 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 a6f8b10bf7..6dd4c1a59c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23531,7 +23531,7 @@ (define-public python-folium (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yi5y9pfpbc4bc4ibr8cblif8ls1wf3k0zawyx86r2qwxxkkyd6k")))) + (base32 "1q05pzca3wfwgnbg03l3bagnhh348yx68w4aa91rg3g8zlviwjz1")))) (build-system python-build-system) (propagated-inputs `(("python-branca" ,python-branca) From b7a515c5102d0c463bfdcd064e5946ffc8936725 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sat, 20 Nov 2021 09:26:47 +0000 Subject: [PATCH 141/234] gnu: Add litecli. * gnu/packages/databases.scm (litecli): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/databases.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dfa833b62a..5edc4e2cce 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -617,6 +617,34 @@ (define-public python-pylibmc (define-public python2-pylibmc (package-with-python2 python-pylibmc)) +(define-public litecli + (package + (name "litecli") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "litecli" version)) + (sha256 + (base32 "1yb706mgzizzijm1k0fbny98jf58qh5q6f2870rbplxlfla4w9sd")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cli-helpers" ,python-cli-helpers) + ("python-click" ,python-click) + ("python-configobj" ,python-configobj) + ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-pygments" ,python-pygments) + ("python-sqlparse" ,python-sqlparse))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://litecli.com") + (synopsis "CLI for SQLite databases") + (description + "@code{litecli} is a command-line client for SQLite databases that has +auto-completion and syntax highlighting.") + (license license:bsd-3))) + (define-public mycli (package (name "mycli") From 60bb03605af73c7af60274ecc5e07d79d63a285e Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 18 Nov 2021 15:24:01 +0000 Subject: [PATCH 142/234] gnu: Add libresprite. * gnu/packages/game-development.scm (libresprite): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/game-development.scm | 54 +++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 51ec4a5fc2..55bbad30e6 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Dmitry Polyakov ;;; Copyright © 2020-2021 James Smith +;;; Copyright © 2021 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -1016,6 +1017,59 @@ (define-public aseprite (home-page "https://www.aseprite.org/") (license license:gpl2+))) +(define-public libresprite + (package + (name "libresprite") + (version "1.0") + ;; TODO: Unbundle third party software. + ;; - duktape is bundled inside the project but it's hard to unbundle: + ;; there are many differences from a version to the next and it is not + ;; really designed to work as a shared lib. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LibreSprite/LibreSprite") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0djbjjh21ahlxzh0b0jp4mpfycam8h9157i4wbxkd618fraadhbp")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (list "-DWITH_WEBP_SUPPORT=1") + ;; Tests are unmaintained + #:tests? #f)) + (native-inputs + `(("gcc@10" ,gcc-10) ; Requires 8.5 or higher + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("googletest" ,googletest) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libwebp" ,libwebp) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxxf86dga" ,libxxf86dga) + ("libxxf86vm" ,libxxf86vm) + ("lua" ,lua) ; Optional + ("pixman" ,pixman) + ("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("tinyxml" ,tinyxml) + ("zlib" ,zlib))) + (synopsis "Animated sprite editor and pixel art tool") + (description "LibreSprite is a tool for creating 2D pixel art for video +games. In addition to basic pixel editing features, it can assist in the +creation of animations, tiled graphics, texture atlases, and more. +LibreSprite is a fork of the latest GPLv2 commit of Aseprite.") + (home-page "https://libresprite.github.io/") + (license license:gpl2+))) + (define-public qqwing (package (name "qqwing") From 740854ff06fbde8a3f3554ae4591f0944671e4ee Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Thu, 18 Nov 2021 06:46:00 +0000 Subject: [PATCH 143/234] gnu: Add cl-assoc-utils. * gnu/packages/lisp-xyz.scm (cl-assoc-utils, ecl-assoc-utils, sbcl-assoc-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 077f8ed007..b978a4dd1b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17385,6 +17385,47 @@ (define-public ecl-cl-gserver (define-public cl-gserver (sbcl-package->cl-source-package sbcl-cl-gserver)) +(define-public sbcl-assoc-utils + (let ((commit "74af16a3c0f10ad35e406167de02984744fc7854") + (revision "1")) + (package + (name "sbcl-assoc-utils") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/assoc-utils") + (commit commit))) + (file-name (git-file-name "cl-assoc-utils" version)) + (sha256 + (base32 "1yac1v7zmdxj0p6rvwrrhyqvy7yjfhmqbchkwqhhr89gpjvvaick")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; All test cases pass, but tests successfully fail at the end: + ;; + ;; Summary: + ;; All 1 file passed. + ;; Unhandled ASDF/FIND-COMPONENT:MISSING-DEPENDENCY in thread + ;; #: + ;; Component ASSOC-UTILS-ASD::ASSOC-UTILS-TEST not found, required by + ;; # + `(#:tests? #f)) + (native-inputs + `(("prove" ,sbcl-prove))) + (home-page "https://github.com/fukamachi/assoc-utils") + (synopsis "Utilities for manipulating association lists in Common Lisp") + (description + "@code{assoc-utils} provides utilities for manipulating association +lists in Common Lisp.") + (license license:public-domain)))) + +(define-public cl-assoc-utils + (sbcl-package->cl-source-package sbcl-assoc-utils)) + +(define-public ecl-assoc-utils + (sbcl-package->ecl-package sbcl-assoc-utils)) + (define-public sbcl-cl-posix-mqueue (let ((commit "8977370c7206d1f62bd1be80f4254af40654b83f") (revision "1")) From 118382b2a4e7c1d65c216f8c674c17b86ad76a3f Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Thu, 18 Nov 2021 06:47:16 +0000 Subject: [PATCH 144/234] gnu: Add cl-let-over-lambda. * gnu/packages/lisp-xyz.scm (cl-let-over-lambda, ecl-let-over-lambda, sbcl-let-over-lambda): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b978a4dd1b..d9eb5dc6a0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17426,6 +17426,51 @@ (define-public cl-assoc-utils (define-public ecl-assoc-utils (sbcl-package->ecl-package sbcl-assoc-utils)) +(define-public sbcl-let-over-lambda + (let ((commit "481b2e3ab4646186451dfdd2062113203287d520") + (revision "1")) + (package + (name "sbcl-let-over-lambda") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thephoeron/let-over-lambda") + (commit commit))) + (file-name (git-file-name "cl-let-over-lambda" version)) + (sha256 + (base32 "114p781lwi9lrbzg27dnkymz9m4cvm1k430j7qsykwd0b58d8qbk")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; All test cases pass, but tests successfully fail at the end: + ;; + ;; Summary: + ;; All 1 file passed. + ;; Unhandled ASDF/FIND-COMPONENT:MISSING-DEPENDENCY in thread + ;; #: + ;; Component LET-OVER-LAMBDA-ASD::LET-OVER-LAMBDA-TEST not found, + ;; required by # + `(#:tests? #f)) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("named-readtables" ,sbcl-named-readtables))) + (native-inputs + `(("prove" ,sbcl-prove))) + (home-page "https://github.com/thephoeron/let-over-lambda") + (synopsis "Macros from Let Over Lambda") + (description + "This package provides Doug Hoyte's \"Production\" version of macros +from the Let Over Lambda book, including community updates.") + (license license:bsd-3)))) + +(define-public cl-let-over-lambda + (sbcl-package->cl-source-package sbcl-let-over-lambda)) + +(define-public ecl-let-over-lambda + (sbcl-package->ecl-package sbcl-let-over-lambda)) + (define-public sbcl-cl-posix-mqueue (let ((commit "8977370c7206d1f62bd1be80f4254af40654b83f") (revision "1")) From 5b96e9651029d68c17a05e9ca75b25a0f129ecca Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Thu, 18 Nov 2021 06:48:31 +0000 Subject: [PATCH 145/234] gnu: Add cl-flute. * gnu/packages/lisp-xyz.scm (cl-flute, ecl-flute, sbcl-flute): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 d9eb5dc6a0..f891164fc8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17471,6 +17471,40 @@ (define-public cl-let-over-lambda (define-public ecl-let-over-lambda (sbcl-package->ecl-package sbcl-let-over-lambda)) +(define-public sbcl-flute + (let ((commit "90ebcd6e82f637f49b6de7d625ccc51ec4c92900") + (revision "1")) + (package + (name "sbcl-flute") + (version (git-version "0.2-dev" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ailisp/flute") + (commit commit))) + (file-name (git-file-name "cl-flute" version)) + (sha256 + (base32 "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("assoc-utils" ,sbcl-assoc-utils) + ("let-over-lambda" ,sbcl-let-over-lambda))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/ailisp/flute") + (synopsis "HTML5 generation library in Common Lisp") + (description + "Flute is an easily composable HTML5 generation library in Common +Lisp.") + (license license:expat)))) + +(define-public cl-flute + (sbcl-package->cl-source-package sbcl-flute)) + +(define-public ecl-flute + (sbcl-package->ecl-package sbcl-flute)) + (define-public sbcl-cl-posix-mqueue (let ((commit "8977370c7206d1f62bd1be80f4254af40654b83f") (revision "1")) From c618f4a9cc4dd8aea32cea0b444322a5500a5c24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Nov 2021 16:30:58 +0100 Subject: [PATCH 146/234] gnu: pigx-bsseq: Update to 0.1.6. * gnu/packages/bioinformatics.scm (pigx-bsseq): Update to 0.1.6. --- 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 3fa378de13..67335daead 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11092,7 +11092,7 @@ (define-public pigx-chipseq (define-public pigx-bsseq (package (name "pigx-bsseq") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_bsseq/" @@ -11100,7 +11100,7 @@ (define-public pigx-bsseq "/pigx_bsseq-" version ".tar.gz")) (sha256 (base32 - "05al5dacfp1vf1x3cq20jhd6w4xj5vaxslzaka6yrpg0av8sh3k3")) + "1dipikph0xdr8fp0h1flpafcrg60y4aabljg8fl1v92j3gxdggmw")) (patches (search-patches "pigx-bsseq-no-citeproc.patch")))) (build-system gnu-build-system) (arguments From 426faa76d1646fdc35d1f28d6319963d3f881324 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 12:45:36 +0100 Subject: [PATCH 147/234] gnu: ocaml-fmt: Update to 0.9.0. * gnu/packages/ocaml.scm (ocaml-fmt): Update to 0.9.0. (ocaml4.07-fmt): New variable. --- gnu/packages/ocaml.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a15842a8b6..537e8bcfed 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2222,14 +2222,14 @@ (define-public ocaml-cmdliner (define-public ocaml-fmt (package (name "ocaml-fmt") - (version "0.8.9") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" version ".tbz")) (sha256 (base32 - "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) + "0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) @@ -2245,12 +2245,27 @@ (define-public ocaml-fmt #:phases (modify-phases %standard-phases (delete 'configure)))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-fmt)))) (home-page "https://erratique.ch/software/fmt") (synopsis "OCaml Format pretty-printer combinators") (description "Fmt exposes combinators to devise Format pretty-printing functions.") (license license:isc))) +(define-public ocaml4.07-fmt + (package-with-ocaml4.07 + (package + (inherit ocaml-fmt) + (version "0.8.9") + (source (origin + (method url-fetch) + (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" + version ".tbz")) + (sha256 + (base32 + "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) + (properties '())))) + (define-public ocaml-astring (package (name "ocaml-astring") From e7bf93e5cc050510f7099949263ef459524cdc72 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 14:04:32 +0100 Subject: [PATCH 148/234] gnu: ocaml-integers: Update to 0.5.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 537e8bcfed..85287465e2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4102,7 +4102,7 @@ (define-public ocaml4.07-utop (define-public ocaml-integers (package (name "ocaml-integers") - (version "0.4.0") + (version "0.5.1") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin (method git-fetch) @@ -4112,7 +4112,7 @@ (define-public ocaml-integers (file-name (git-file-name name version)) (sha256 (base32 - "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd")))) + "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ; no tests From 63e5e127cb84c1d87750e06805f562bad7285ac5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 14:09:38 +0100 Subject: [PATCH 149/234] gnu: ocaml-mdx: Remove unneeded dependency. * gnu/packages/ocaml.scm (ocaml-mdx)[inputs]: remove ocaml-migrate-parsetree. --- gnu/packages/ocaml.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 85287465e2..c67be570be 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6981,7 +6981,6 @@ (define-public ocaml-mdx ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-odoc-parser" ,ocaml-odoc-parser) ("ocaml-version" ,ocaml-version))) From e46621ca6c90027aabe79b8391773184a163bac9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 14:20:35 +0100 Subject: [PATCH 150/234] gnu: ocaml-mtime: Update to 1.3.0. * gnu/packages/ocaml.scm (ocaml-mtime): Update to 1.3.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c67be570be..eb63f5febd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2105,14 +2105,14 @@ (define-public ocaml-csv (define-public ocaml-mtime (package (name "ocaml-mtime") - (version "1.1.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/mtime/releases/" "mtime-" version ".tbz")) (sha256 (base32 - "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3")))) + "0syilgk4nzscacsswnvgwqlf0n0lhs221jss8gc8z9igw2x4sgsq")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) From 1277bd9fc01ca0f267ca60b91d79c0c72b40631a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 14:41:50 +0100 Subject: [PATCH 151/234] gnu: ocaml-ocplib-endian: Update to 1.2. * gnu/packages/ocaml.scm (ocaml-ocplib-endian): Update to 1.2. --- gnu/packages/ocaml.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eb63f5febd..5a3f32ea6d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3478,7 +3478,7 @@ (define-public ocaml4.07-re (define-public ocaml-ocplib-endian (package (name "ocaml-ocplib-endian") - (version "1.0") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -3486,12 +3486,13 @@ (define-public ocaml-ocplib-endian (commit version))) (sha256 (base32 - "0s1ld3kavz892b8awyxyg1mr98h2g61gy9ci5v6yb49bsii6wicw")) + "1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c")) (file-name (git-file-name name version)))) - (build-system ocaml-build-system) + (build-system dune-build-system) + (arguments + `(#:test-target "tests")) (native-inputs - `(("cppo" ,ocaml-cppo) - ("ocamlbuild" ,ocamlbuild))) + `(("cppo" ,ocaml-cppo))) (home-page "https://github.com/OCamlPro/ocplib-endian") (synopsis "Optimised functions to read and write int16/32/64 from strings and bigarrays") From 95e6a977fa1c41792e2074a12d4efeffa36218c1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 15:04:43 +0100 Subject: [PATCH 152/234] gnu: ocaml-odoc: Update to 2.0.0. * gnu/packages/ocaml.scm (ocaml-odoc): Update to 2.0.0. [inputs, native-inputs]: Adjust inputs. (ocaml4.07-odoc)[inputs, native-inputs]: Keep previous inputs. --- gnu/packages/ocaml.scm | 70 +++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5a3f32ea6d..d378bf4560 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6743,7 +6743,7 @@ (define-public ocaml4.07-bisect-ppx (define-public ocaml-odoc (package (name "ocaml-odoc") - (version "1.5.2") + (version "2.0.0") (source (origin (method git-fetch) @@ -6752,23 +6752,39 @@ (define-public ocaml-odoc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fqfyz48q7ss5bc4c5phmp4s3ka3vc08b8gfk8fvyryvb4bq27jm")))) + (base32 "0lkmanfn8pc0rgcn9cc4mv48i29q2w1nl01n21qqxpyyfavgc98s")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda _ + ;; test results expects #!/bin/sh but gets a store path instead + (substitute* "test/xref2/with.t/run.t" + (("#!/bin/sh") (string-append "#!" (which "sh"))))))))) (inputs - `(("ocaml-alcotest" ,ocaml-alcotest) - ("ocaml-markup" ,ocaml-markup) - ("ocaml-sexplib" ,ocaml-sexplib) - ("ocaml-re" ,ocaml-re) - ("ocaml-uutf" ,ocaml-uutf))) - (native-inputs - `(("ocaml-astring" ,ocaml-astring) - ("ocaml-cmdliner" ,ocaml-cmdliner) - ("ocaml-cppo" ,ocaml-cppo) - ("ocaml-fpath" ,ocaml-fpath) - ("ocaml-result" ,ocaml-result) - ("ocaml-tyxml" ,ocaml-tyxml) - ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) - ("tidy-html" ,tidy-html))) + `(("ocaml-astring" ,ocaml-astring) + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-fmt" ,ocaml-fmt) + ("ocaml-fpath" ,ocaml-fpath) + ("ocaml-logs" ,ocaml-logs) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-odoc-parser" ,ocaml-odoc-parser) + ("ocaml-re" ,ocaml-re) + ("ocaml-result" ,ocaml-result) + ("ocaml-tyxml" ,ocaml-tyxml))) + (native-inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-bos" ,ocaml-bos) + ("ocaml-cppo" ,ocaml-cppo) + ("ocaml-findlib" ,ocaml-findlib) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-markup" ,ocaml-markup) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-version" ,ocaml-version) + ("ocaml-yojson" ,ocaml-yojson) + ("jq" ,jq))) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-odoc)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") @@ -6826,12 +6842,22 @@ (define-public ocaml4.07-odoc (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))) + (arguments '()) + (inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-markup" ,ocaml-markup) + ("ocaml-sexplib" ,ocaml-sexplib) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf))) + (native-inputs + `(("ocaml-astring" ,ocaml-astring) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-cppo" ,ocaml-cppo) + ("ocaml-fpath" ,ocaml-fpath) + ("ocaml-result" ,ocaml-result) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) + ("tidy-html" ,tidy-html))) (properties '())))) (define-public ocaml4.07-fftw3 From 97fd67edea951edd53d62250975edf93ed90c1a5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 15:30:56 +0100 Subject: [PATCH 153/234] gnu: ocaml-ppx-js-style: Update to 0.14.1. * gnu/packages/ocaml.scm (ocaml-ppx-js-style): Update to 0.14.1. --- gnu/packages/ocaml.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d378bf4560..b52c6803b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6143,10 +6143,17 @@ (define-public ocaml4.07-ppx-expect (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") - (version "0.14.0") + (version "0.14.1") (source - (janestreet-origin "ppx_js_style" version - "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_js_style") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16ax6ww9h36xyn9acbm8zxv0ajs344sm37lgj2zd2bvgsqv24kxj")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ; No tests (propagated-inputs From 0df82727a6e2ac2389d8e94aa66a641687bf4039 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 15:34:21 +0100 Subject: [PATCH 154/234] gnu: ocaml-ppx-variants-conv: Update to 0.14.2. * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): Update to 0.14.2. [origin]: Remove patch. * gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/ocaml.scm | 8 +--- ...ocaml-ppx-variants-ppxlib-api-change.patch | 42 ------------------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7cc06c8212..a8540f6e12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1533,7 +1533,6 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ - %D%/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b52c6803b3..3db79032c4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5465,21 +5465,17 @@ (define-public ocaml4.07-ppx-sexp-conv (define-public ocaml-ppx-variants-conv (package (name "ocaml-ppx-variants-conv") - (version "0.14.1") + (version "0.14.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/janestreet/ppx_variants_conv") (commit (string-append "v" version)))) - (patches - (search-patches - ;; Fix build when building with ocaml-ppxlib@0.23.0. - "ocaml-ppx-variants-ppxlib-api-change.patch")) (file-name (git-file-name name version)) (sha256 (base32 - "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) + "1p11fiz4m160hs0xzg4g9rxchp053sz3s3d1lyciqixad1xi47a4")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml-base) diff --git a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch deleted file mode 100644 index b437bfb061..0000000000 --- a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001 -From: Sonja Heinze -Date: Tue, 9 Mar 2021 12:57:47 +0100 -Subject: [PATCH] Adapt to Ppxlib's API change - -Ppxlib is removing Lexer.keyword_table from the API in exchange for -the more lightweight Keyword.is_keyword. - -Signed-off-by: Sonja Heinze ---- -Patch from . - - ppx_variants_conv.opam | 2 +- - src/ppx_variants_conv.ml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ppx_variants_conv.opam b/ppx_variants_conv.opam -index 7e7148d..b56040f 100644 ---- a/ppx_variants_conv.opam -+++ b/ppx_variants_conv.opam -@@ -15,7 +15,7 @@ depends: [ - "base" {>= "v0.14" & < "v0.15"} - "variantslib" {>= "v0.14" & < "v0.15"} - "dune" {>= "2.0.0"} -- "ppxlib" {>= "0.14.0"} -+ "ppxlib" {>= "0.23.0"} - ] - synopsis: "Generation of accessor and iteration functions for ocaml variant types" - description: " -diff --git a/src/ppx_variants_conv.ml b/src/ppx_variants_conv.ml -index 8d60086..112fc78 100644 ---- a/src/ppx_variants_conv.ml -+++ b/src/ppx_variants_conv.ml -@@ -66,7 +66,7 @@ end - - let variant_name_to_string v = - let s = String.lowercase v in -- if Caml.Hashtbl.mem Lexer.keyword_table s -+ if Keyword.is_keyword s - then s ^ "_" - else s - From b0e76b0828d6b1aee225e8268634547c33f9ba8d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 15:43:35 +0100 Subject: [PATCH 155/234] gnu: ocaml-qcheck: Update to 0.18. * gnu/packages/ocaml.scm (ocaml-qcheck): Update to 0.18. * gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 24 ++++++++++++++++--- .../ocaml-qcheck-fix-test-whitespace.patch | 24 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch diff --git a/gnu/local.mk b/gnu/local.mk index a8540f6e12..2513530d0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1533,6 +1533,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ + %D%/packages/patches/ocaml-qcheck-fix-test-whitespace.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3db79032c4..ecd64ccf20 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1552,16 +1552,17 @@ (define-public ocaml4.07-frontc (define-public ocaml-qcheck (package (name "ocaml-qcheck") - (version "0.12") + (version "0.18") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/c-cube/qcheck") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "ocaml-qcheck-fix-test-whitespace.patch")) (sha256 - (base32 "1llnfynhlndwyjig7wrayjnds2b3mggp5lw20dwxhn2i2lkkb22m")))) + (base32 "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x")))) (build-system dune-build-system) (arguments `(#:test-target "." @@ -1577,6 +1578,7 @@ (define-public ocaml-qcheck ("ocaml-ounit" ,ocaml-ounit))) (native-inputs `(("ocamlbuild" ,ocamlbuild))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck)))) (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This @@ -1585,6 +1587,22 @@ (define-public ocaml-qcheck instances and printing them.") (license license:lgpl3+))) +(define-public ocaml4.07-qcheck + (package-with-ocaml4.07 + (package + (inherit ocaml-qcheck) + (version "0.12") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/c-cube/qcheck") + (commit version))) + (file-name (git-file-name "ocaml-qcheck" version)) + (sha256 + (base32 + "1llnfynhlndwyjig7wrayjnds2b3mggp5lw20dwxhn2i2lkkb22m")))) + (properties '())))) + (define-public ocaml-qtest (package (name "ocaml-qtest") diff --git a/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch b/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch new file mode 100644 index 0000000000..012f5de31c --- /dev/null +++ b/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch @@ -0,0 +1,24 @@ +From 0cb666fffcbeb78c8c14d271b3ba65ea514bfc44 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Fri, 19 Nov 2021 03:03:21 +0100 +Subject: [PATCH] Fix whitespace issue in test + +--- + example/alcotest/output.txt.expected | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/example/alcotest/output.txt.expected b/example/alcotest/output.txt.expected +index bde0b83..9f1417c 100644 +--- a/example/alcotest/output.txt.expected ++++ b/example/alcotest/output.txt.expected +@@ -16,7 +16,6 @@ test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) + [exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) + + +- + ────────────────────────────────────────────────────────────────────────────── + + 3 failures! 5 tests run. +-- +2.33.1 + From 40f7eb975b2956a46e467133c6bac4a12e98cfac Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 15:46:40 +0100 Subject: [PATCH 156/234] gnu: ocaml-qtest: Update to 2.11.2. * gnu/packages/ocaml.scm (ocaml-qtest): Update to 2.11.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ecd64ccf20..52676b7078 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1606,7 +1606,7 @@ (define-public ocaml4.07-qcheck (define-public ocaml-qtest (package (name "ocaml-qtest") - (version "2.10.1") + (version "2.11.2") (source (origin (method git-fetch) (uri (git-reference @@ -1615,7 +1615,7 @@ (define-public ocaml-qtest (file-name (git-file-name name version)) (sha256 (base32 - "0gddzan4vzs0vklsxhirdjrvx3rp7hhh2yr20vi13nq8rwkn9w29")))) + "04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl")))) (build-system dune-build-system) (arguments `(#:test-target "tests")) From 5a3fcf0cac7bdd6b2e82bb72cca4530a996606af Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 14:11:21 +0100 Subject: [PATCH 157/234] gnu: ocaml-sedlex: Update to 2.4. * gnu/packages/ocaml.scm (ocaml-sedlex): Update to 2.4. [native-inputs]: Remove ocamlbuild. [propagated-inputs]: Remove ocaml-ppx-tools-versioned. (ocaml4.07-sedlex)[propagated-inputs]: Add ocaml-ppx-tools-versioned. --- gnu/packages/ocaml.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 52676b7078..d1356f5a2d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2722,7 +2722,7 @@ (define-public ocaml-gen (define-public ocaml-sedlex (package (name "ocaml-sedlex") - (version "2.3") + (version "2.4") (source (origin (method git-fetch) (uri (git-reference @@ -2731,7 +2731,7 @@ (define-public ocaml-sedlex (file-name (git-file-name name version)) (sha256 (base32 - "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) + "13g8az4zqg6hrnxmy3qrasslppzlag13dd1dsr8vlpg2vpfmfv6i")))) (build-system dune-build-system) (arguments `(#:tests? #f ; no tests @@ -2755,12 +2755,9 @@ (define-public ocaml-sedlex (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("ocaml-gen" ,ocaml-gen) ("ocaml-ppxlib" ,ocaml-ppxlib) - ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. @@ -2807,6 +2804,9 @@ (define-public ocaml4.07-sedlex (sha256 (base32 "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + (propagated-inputs + `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ,@(package-propagated-inputs ocaml-sedlex))) (properties '())))) (define-public ocaml-uchar From 972c6fe87bb6f1f89ba62c950c96681e2988671f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 16:21:53 +0100 Subject: [PATCH 158/234] gnu: ocaml-stdlib-shims: Update to 0.3.0. * gnu/packages/ocaml.scm (ocaml-stdlib-shims): Update to 0.3.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d1356f5a2d..64fb129bc2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3297,7 +3297,7 @@ (define-public ocaml-expect (define-public ocaml-stdlib-shims (package (name "ocaml-stdlib-shims") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3306,7 +3306,7 @@ (define-public ocaml-stdlib-shims (file-name (git-file-name name version)) (sha256 (base32 - "007dwywsr5285z0np6a9nr0h8iqmyzfrlx6s5xaqcwj69zabsrjm")))) + "0gmg8w67j3ww17llk7hl4dx0vq7p50rn5s4ib9sy984k543rz59h")))) (build-system dune-build-system) (home-page "https://github.com/ocaml/stdlib-shims") (synopsis "OCaml stdlib features backport to older OCaml compilers") From c2242284ab6e087721a21ee5402d18d49024eb75 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 16:35:58 +0100 Subject: [PATCH 159/234] gnu: ocaml-topkg: Update to 1.0.4. * gnu/packages/ocaml.scm (ocaml-topkg): Update to 1.0.4. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 64fb129bc2..848f56b14c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1983,14 +1983,14 @@ (define-public ocaml4.09-result (define-public ocaml-topkg (package (name "ocaml-topkg") - (version "1.0.0") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/topkg/releases/" "topkg-" version ".tbz")) (sha256 (base32 - "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw")))) + "1kzw5cxkizcvh4rgzwgpjlj9hfxfk6yr686bxx6wrbsfs8as371k")))) (build-system ocaml-build-system) (native-inputs `(("opam" ,opam) From 4378eb9a15fd0f4167ff1f7d798d3a6dc945dc1e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 16:38:56 +0100 Subject: [PATCH 160/234] gnu: ocaml-tyxml: Update to 4.5.0. * gnu/packages/ocaml.scm (ocaml-tyxml): Update to 4.5.0. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 848f56b14c..49ee3ac460 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6668,7 +6668,7 @@ (define-public ocaml-markup0.8.0 (define-public ocaml-tyxml (package (name "ocaml-tyxml") - (version "4.4.0") + (version "4.5.0") (source (origin (method git-fetch) @@ -6678,17 +6678,16 @@ (define-public ocaml-tyxml (file-name (git-file-name name version)) (sha256 (base32 - "1hw4phyadcfgywgh5sj87i76gp56qwxzwlcpfdwjbf6ggag9clmd")))) + "0bh66wknc7sx2r63kscp0hg6h73dkv6qpkx0cdz2qp7p28pg2ixz")))) (build-system dune-build-system) (inputs `(("ocaml-re" ,ocaml-re) ("ocaml-seq" ,ocaml-seq) - ("ocaml-uutf" ,ocaml-uutf) - ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) - ("ocaml-markup" ,ocaml-markup))) + ("ocaml-uutf" ,ocaml-uutf))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest))) (arguments `(#:package "tyxml")) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-tyxml)))) (home-page "https://github.com/ocsigen/tyxml/") (synopsis "TyXML is a library for building correct HTML and SVG documents") (description "TyXML provides a set of convenient combinators that uses the @@ -6700,6 +6699,22 @@ (define-public ocaml-tyxml combinators.") (license license:lgpl2.1))) +(define-public ocaml4.07-tyxml + (package-with-ocaml4.07 + (package + (inherit ocaml-tyxml) + (version "4.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/tyxml") + (commit version))) + (file-name (git-file-name "ocaml-tyxml" version)) + (sha256 + (base32 + "1hw4phyadcfgywgh5sj87i76gp56qwxzwlcpfdwjbf6ggag9clmd")))) + (properties '())))) + (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") From 0a4656f1c130b4da5e0d902b14fb46a8c91ccb37 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Nov 2021 16:48:30 +0100 Subject: [PATCH 161/234] gnu: ocaml-version: Update to 3.4.0. * gnu/packages/ocaml.scm (ocaml-version): Update to 3.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 49ee3ac460..990b33752a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6999,7 +6999,7 @@ (define-public ocaml-cairo2 (define-public ocaml-version (package (name "ocaml-version") - (version "3.0.0") + (version "3.4.0") (source (origin (method git-fetch) @@ -7009,7 +7009,7 @@ (define-public ocaml-version (file-name (git-file-name name version)) (sha256 (base32 - "13770mp6adjjbx63zsbh6506dqxz241chw8c3y403sxpw45hnaw6")))) + "1c13zk1qna59m5z9jx7da3p7cxd48scpyk7zg7gi6gc6hx5hhjx8")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ; no tests (properties '((upstream-name . "ocaml-version"))) From d2f5bc7da866240f3cc43dd3852c15da1d8cba23 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Nov 2021 20:11:50 -0500 Subject: [PATCH 162/234] gnu: linux-libre: Update to 5.14.20. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.20. (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 1d005de1db..8352dcfd92 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -347,7 +347,7 @@ (define (%upstream-linux-source version hash) ;; 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.19") +(define-public linux-libre-5.14-version "5.14.20") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -357,7 +357,7 @@ (define deblob-scripts-5.14 (base32 "1xmmr26lpffc4dfmrkvh3gdkkr8666fcyvgam560vbyd2b2qkd78"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "1dw7hcqwv4w4rbrh9c4xjy9vgd4d63v97mf7jdf0s80f36mcfh8l"))) + (hash (base32 "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) From 40239e23e8154ce3bfe1a98c5a2df1a0094789e4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Nov 2021 20:12:12 -0500 Subject: [PATCH 163/234] gnu: linux-libre 5.10: Update to 5.10.80. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.80. (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 8352dcfd92..4d167dc522 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,7 +365,7 @@ (define-public linux-libre-5.14-pristine-source ;; 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.79") +(define-public linux-libre-5.10-version "5.10.80") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -375,7 +375,7 @@ (define deblob-scripts-5.10 (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1bd86ywff2mv73sybjdjlvvvhnmsv891jlm17h5nvqifdbhmb6g4"))) + (hash (base32 "0ffvgxaq2ipylzavvgnnqk56pw2a6gy5zhhgdhsf8qs2cbvyhz27"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) From e9d3f3656bd8a16deb1f643c9ed9f5706a6f9eaf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:39 +0200 Subject: [PATCH 164/234] gnu: Add ocaml-lacaml. * gnu/packages/ocaml.scm (ocaml4.07-lacaml): Replace with... (ocaml-lacaml): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 990b33752a..56c56dd929 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6922,7 +6922,7 @@ (define-public ocaml4.07-fftw3 ("fftwf" ,fftwf))) (native-inputs `(("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-lacaml" ,ocaml4.07-lacaml))) + ("ocaml-lacaml" ,(package-with-ocaml4.07 ocaml-lacaml)))) (home-page "https://github.com/Chris00/fftw-ocaml") (synopsis @@ -6932,10 +6932,10 @@ (define-public ocaml4.07-fftw3 library FFTW.") (license license:lgpl2.1))) ; with static linking exception. -(define-public ocaml4.07-lacaml +(define-public ocaml-lacaml (package - (name "ocaml4.07-lacaml") - (version "11.0.5") + (name "ocaml-lacaml") + (version "11.0.8") (source (origin (method git-fetch) @@ -6945,18 +6945,15 @@ (define-public ocaml4.07-lacaml (file-name (git-file-name name version)) (sha256 (base32 - "180yb79a3qgx067qcpm50q12hrimjygf06rgkzbish9d1zfm670c")))) + "115535kphchh2a434b48b408x9794j8zzrsdmacsgqdsrgy3rck4")))) (build-system dune-build-system) (arguments - `(#:tests? #f ; No test target. - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) ; No test target. (native-inputs `(("openblas" ,openblas) ("lapack" ,lapack) - ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) + ("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK") From 0481810ebfaae1973643455088b4e2cab0a941f1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:40 +0200 Subject: [PATCH 165/234] gnu: Add ocaml-fftw3. * gnu/packages/ocaml.scm (ocaml4.07-fftw3): Replace with... (ocaml-fftw3) ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 56c56dd929..99a6058e63 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6896,9 +6896,9 @@ (define-public ocaml4.07-odoc ("tidy-html" ,tidy-html))) (properties '())))) -(define-public ocaml4.07-fftw3 +(define-public ocaml-fftw3 (package - (name "ocaml4.07-fftw3") + (name "ocaml-fftw3") (version "0.8.4") (source (origin @@ -6912,17 +6912,13 @@ (define-public ocaml4.07-fftw3 "0l66yagjkwdcib6q55wd8wiap50vi23qiahkghlvm28z7nvbclfk")))) (build-system dune-build-system) (arguments - `(#:tests? #t - #:test-target "tests" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target "tests")) (propagated-inputs `(("fftw" ,fftw) ("fftwf" ,fftwf))) (native-inputs - `(("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-lacaml" ,(package-with-ocaml4.07 ocaml-lacaml)))) + `(("ocaml-cppo" ,ocaml-cppo) + ("ocaml-lacaml" ,ocaml-lacaml))) (home-page "https://github.com/Chris00/fftw-ocaml") (synopsis From f9bf7de5b4c208804efbe84bd8b3c019d3caee05 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:41 +0200 Subject: [PATCH 166/234] gnu: Add ocaml-gsl. * gnu/packages/ocaml.scm (ocaml4.07-gsl): Replace with... (ocaml-gsl): ...this. Use latest ocaml package. (ocaml4.07-gsl-1): Adapt accordingly. --- gnu/packages/ocaml.scm | 53 +++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 99a6058e63..72cc3df230 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4764,9 +4764,9 @@ (define-public ocaml-merlin Atom.") (license license:expat))) -(define-public ocaml4.07-gsl +(define-public ocaml-gsl (package - (name "ocaml4.07-gsl") + (name "ocaml-gsl") (version "1.24.0") (source (origin @@ -4786,16 +4786,12 @@ (define-public ocaml4.07-gsl (add-after 'unpack 'fix-gsl-directory (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/config/discover.ml" - (("/usr") (assoc-ref inputs "gsl"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (("/usr") (assoc-ref inputs "gsl")))))))) (inputs `(("gsl" ,gsl))) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4804,26 +4800,25 @@ (define-public ocaml4.07-gsl (license license:gpl3+))) (define-public ocaml4.07-gsl-1 - (package - (inherit ocaml4.07-gsl) - (version "1.19.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mmottl/gsl-ocaml" - "/releases/download/v" - version "/gsl-ocaml-" version ".tar.gz")) - (sha256 - (base32 - "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) - (build-system ocaml-build-system) - (inputs - `(("gsl" ,gsl))) - (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) - (propagated-inputs '()))) + (package-with-ocaml4.07 + (package + (inherit ocaml-gsl) + (version "1.19.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mmottl/gsl-ocaml" + "/releases/download/v" + version "/gsl-ocaml-" version ".tar.gz")) + (sha256 + (base32 + "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) + (build-system ocaml-build-system) + (inputs + `(("gsl" ,gsl))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) + (arguments '()) + (propagated-inputs '())))) (define-public cubicle (package From 0846e7d3265f9fc1b7d83676ef75c55f78faa587 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:42 +0200 Subject: [PATCH 167/234] gnu: Add ocaml-charinfo-width. * gnu/packages/ocaml.scm (ocaml4.07-charinfo-width): Replace with... (ocaml-charinfo-width): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 72cc3df230..ead2adfb9f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3990,9 +3990,9 @@ (define-public ocaml-camomile ;; with an exception for linked libraries to use a different license (license license:lgpl2.0+))) -(define-public ocaml4.07-charinfo-width +(define-public ocaml-charinfo-width (package - (name "ocaml4.07-charinfo-width") + (name "ocaml-charinfo-width") (version "1.1.0") (source (origin (method url-fetch) @@ -4003,15 +4003,11 @@ (define-public ocaml4.07-charinfo-width (base32 "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) (native-inputs - `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -4041,7 +4037,7 @@ (define-public ocaml4.07-zed #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) - ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) + ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width)) ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react)))) (home-page "https://github.com/diml/zed") (synopsis "Abstract engine for text editing in OCaml") From 348f1f7cb5e0a37f66268c4204777238f26ae947 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 04:13:46 +0100 Subject: [PATCH 168/234] gnu: camlboot: Update to latest commit. * gnu/packages/ocaml.scm (camlboot): Update to latest commit. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ead2adfb9f..8924f9c0ae 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -111,8 +111,8 @@ (define (janestreet-origin name version hash) (sha256 (base32 hash)))) (define-public camlboot - (let ((commit "506280c6e0813e0e794988151a8e46be55373ebc") - (revision "0")) + (let ((commit "45045d0afa82f7e9b7ea07314aab08be2d3cd64b") + (revision "1")) (package (name "camlboot") (version (git-version "0.0.0" revision commit)) @@ -125,7 +125,7 @@ (define-public camlboot (file-name (git-file-name name version)) (sha256 (base32 - "0vimxl4karw9ih3npyc5rhxg85cjh6fqjbq3dzj7j2iymlhwfbkv")) + "1f5gl3hzvixbgk0v3kmxiyn432znyy3jh5fa65cfzcaxzgfv1i1c")) (modules '((guix build utils))) (snippet `(begin From 9bfbba8af5b7efb952292c8b7d5e9ee57300c2bc Mon Sep 17 00:00:00 2001 From: Jaft Date: Sat, 20 Nov 2021 23:38:55 +0000 Subject: [PATCH 169/234] gnu: Add gsimplecal. * gnu/packages/calendar.scm (gsimplecal): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/calendar.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 8ec36d4fa2..44d1331e32 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Peng Mei Yu +;;; Copyright © 2021 Wamm K. D. ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages calendar) #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages dav) @@ -405,3 +407,31 @@ (define-public ccal ;; COPYING.LESSER specifies LGPL 3.0, but all source files say ;; 'Lesser GPL version 2 or later'. (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public gsimplecal + (let ((version "2.2")) + (package + (name "gsimplecal") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dmedvinsky/gsimplecal/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "1qyf65l088dqsz25hm6s1cv18j52yaias0llqvpqwjfnvssa5cxg")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (inputs `(("gtk+" ,gtk+))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (home-page "https://dmedvinsky.github.io/gsimplecal/") + (synopsis "Lightweight calendar applet") + (description "@command{gsimplecal} is a lightweight calendar application +written in C++ using GTK. Launched once, it pops up a small calendar applet, +launched again it closes the running instance. It can additionally be +configured to show the current time in different timezones.") + (license license:bsd-3)))) From 7cc2f02281d93a1f9a032de4f4d3604575cce877 Mon Sep 17 00:00:00 2001 From: Songlin Jiang Date: Sun, 21 Nov 2021 14:10:32 +0800 Subject: [PATCH 170/234] gnu: Add gnome-shell-extension-customize-ibus. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-customize-ibus): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 6d8d02fb9c..9d8ec1bdef 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Ellis Kenyo ;;; Copyright © 2020 Stefan Reichör ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Songlin Jiang ;;; ;;; This file is part of GNU Guix. ;;; @@ -281,6 +282,39 @@ (define-public gnome-shell-extension-clipboard-indicator that caches clipboard history.") (license license:expat))) +(define-public gnome-shell-extension-customize-ibus + (package + (name "gnome-shell-extension-customize-ibus") + (version "78") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openSUSE/Customize-IBus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hnnsjriq7xaakk8biwz55mn077lnm9nsmi4wz5zk7clgxmasvq9")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "VERSION=" ,version) + (string-append "INSTALLBASE=" (assoc-ref %outputs "out") + "/share/gnome-shell/extensions")) + #:tests? #f ; No test target + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin"))) + (home-page "https://github.com/openSUSE/Customize-IBus") + (synopsis "GNOME Shell Extension for IBus Customization") + (description "Customize IBus provides full customization of appearance, +behavior, system tray and input source indicator for IBus.") + (license license:gpl3+))) + (define-public gnome-shell-extension-topicons-redux (package (name "gnome-shell-extension-topicons-redux") From 6972c4f21247b6b5802c0f6e0b4240e4ba4d0223 Mon Sep 17 00:00:00 2001 From: Songlin Jiang Date: Sun, 21 Nov 2021 14:17:32 +0800 Subject: [PATCH 171/234] gnu: Add ibus-theme-tools. * gnu/packages/ibus.scm (ibus-theme-tools): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/ibus.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 48a2445c7d..fe7fb33836 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Peng Mei Yu ;;; Copyright © 2020 kanichos ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Songlin Jiang ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages ibus) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages anthy) @@ -51,6 +53,7 @@ (define-module (gnu packages ibus) #:use-module (gnu packages logging) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) @@ -771,3 +774,33 @@ (define-public ibus-libhangul (description "ibus-hangul is a Korean input method engine for IBus.") (license gpl2+))) + +(define-public ibus-theme-tools + (package + (name "ibus-theme-tools") + (version "4.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openSUSE/IBus-Theme-Tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'check)))) + (propagated-inputs + `(("python-tinycss2" ,python-tinycss2) + ("python-pygobject" ,python-pygobject))) + (native-inputs + `(("gettext" ,gettext-minimal))) + (home-page "https://github.com/openSUSE/IBus-Theme-Tools") + (synopsis "Tool for IBus Themes") + (description "IBus Theme Tools can extract IBus-specific settings from +GTK themes to apply both within and without GNOME Shell.") + (license gpl3+))) From f0a30bf8aac0f2178543f9cd629011eb85f6df48 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 21 Nov 2021 15:15:49 +0100 Subject: [PATCH 172/234] gnu: ibus-theme-tools: Do not delete check phase. * gnu/packages/ibus.scm (ibus-theme-tools)[#:tests?]: Add with value #f and an appropriate comment. [#:phases]: Drop. --- gnu/packages/ibus.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index fe7fb33836..ab4b82284e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -791,9 +791,7 @@ (define-public ibus-theme-tools "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2")))) (build-system python-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'check)))) + `(#:tests? #f)) ; No tests (propagated-inputs `(("python-tinycss2" ,python-tinycss2) ("python-pygobject" ,python-pygobject))) From 29e9dc49cc104bf606a642627d537e8e496d1fc1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 16:18:07 +0100 Subject: [PATCH 173/234] gnu: camlboot: Increase max-silent-time. * gnu/packages/ocaml.scm (camlboot)[properties]: Set max-silent-time to 10 hours. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8924f9c0ae..f6824561fd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -161,7 +161,8 @@ (define-public camlboot (native-inputs `(("guile" ,guile-3.0))) (properties - `((max-silent-time . 14400))) ; 4 hours, expected even on x86_64 + ;; 10 hours, mostly for arm, more than 1 expected even on x86_64 + `((max-silent-time . 36000))) (home-page "https://github.com/Ekdohibs/camlboot") (synopsis "OCaml source bootstrap") (description "OCaml is written in OCaml. Its sources contain a pre-compiled From 45bc66dbe9cd7aa3f5d8189f3286867594768089 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 16:48:35 +0100 Subject: [PATCH 174/234] gnu: coq-flocq: Update to 3.4.2. * gnu/packages/coq.scm (coq-flocq): Update to 3.4.2. --- gnu/packages/coq.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 91290c8584..15b920af69 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -191,7 +191,7 @@ (define-public proof-general (define-public coq-flocq (package (name "coq-flocq") - (version "3.3.1") + (version "3.4.2") (source (origin (method git-fetch) @@ -201,7 +201,7 @@ (define-public coq-flocq (file-name (git-file-name name version)) (sha256 (base32 - "01gdykva0lcw6y3dm8j0djxayb87szfg9vn0mxd6z3pks644misl")))) + "0j7vq7ifqcdaj2x881aha2rl51l2p72y1cn7r2xya0fjgsssfigy")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -211,16 +211,10 @@ (define-public coq-flocq ("coq" ,coq))) (arguments `(#:configure-flags - (list (string-append "--libdir=" (assoc-ref %outputs "out") - "/lib/coq/user-contrib/Flocq")) + (list (string-append "COQUSERCONTRIB=" (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-failing-examples - (lambda _ - (substitute* "Remakefile.in" - ;; Fails on a union error. - (("Double_rounding_odd_radix.v") "")) - #t)) (add-before 'configure 'fix-remake (lambda _ (substitute* "remake.cpp" From 67fbcd437c9906f52b5311058b1c6b48e4c94d02 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 16:53:46 +0100 Subject: [PATCH 175/234] gnu: coq-gappa: Update to 1.5.0. * gnu/packages/coq.scm (coq-gappa): Update to 1.5.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 15b920af69..c31a1227cc 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -242,7 +242,7 @@ (define-public coq-flocq (define-public coq-gappa (package (name "coq-gappa") - (version "1.4.6") + (version "1.5.0") (source (origin (method git-fetch) @@ -252,7 +252,7 @@ (define-public coq-gappa (file-name (git-file-name name version)) (sha256 (base32 - "0492i0ksrz6dnc1d57jzsbmdlb9fp9hrh9ib5v8j0yqxpyi0x8f4")))) + "1ivh8xm1c8191rm4riamjzya2x6ls96qax5byir1fywf9hbxr1vg")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) From 698e5c38b44dad82b90c744b387486dec98e413f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 17:12:18 +0100 Subject: [PATCH 176/234] gnu: coq-mathcomp: Update to 1.13.0. * gnu/packages/coq.scm (coq-mathcomp): Update to 1.13.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index c31a1227cc..e88f2e6e29 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -303,7 +303,7 @@ (define-public coq-gappa (define-public coq-mathcomp (package (name "coq-mathcomp") - (version "1.12.0") + (version "1.13.0") (source (origin (method git-fetch) @@ -312,7 +312,7 @@ (define-public coq-mathcomp (commit (string-append "mathcomp-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12cgrmzlcjnp9kv9zxsk34fgf0qfa35jdb23cbf13kmg8dyfi3h5")))) + (base32 "0aj8hsdzzds5w0p1858s2b6k9zssjcxa6kgpi0q1nvaml4zfpkcc")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) From 5bcf0101b295a2d5e3f227b2f122cdff45294e58 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 17:32:02 +0100 Subject: [PATCH 177/234] gnu: coq-coquelicot: Update to 3.2.0. * gnu/packages/coq.scm (coq-coquelicot): Update to 3.2.0. --- gnu/packages/coq.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index e88f2e6e29..64ada8cace 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -342,7 +342,7 @@ (define-public coq-mathcomp (define-public coq-coquelicot (package (name "coq-coquelicot") - (version "3.1.0") + (version "3.2.0") (source (origin (method git-fetch) @@ -352,7 +352,7 @@ (define-public coq-coquelicot (file-name (git-file-name name version)) (sha256 (base32 - "0mz3pxan1237fr5fi79c66y7b9z7bmi0sc45kwrmkczsjm5462jm")))) + "146s5y2xsc7wb43m1pq1n4p14hw99gqbzx0ic3a4naxq16v7cv4w")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -364,8 +364,8 @@ (define-public coq-coquelicot `(("mathcomp" ,coq-mathcomp))) (arguments `(#:configure-flags - (list (string-append "--libdir=" (assoc-ref %outputs "out") - "/lib/coq/user-contrib/Coquelicot")) + (list (string-append "COQUSERCONTRIB=" (assoc-ref %outputs "out") + "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-remake From 07fc7046d2ca8c8a7574408c2e3ce9c1e1bb5ff6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 17:40:58 +0100 Subject: [PATCH 178/234] gnu: coq-interval: Update to 4.3.1. * gnu/packages/coq.scm (coq-interval): Update to 4.3.1. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 64ada8cace..5cfe0b1cf3 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -429,7 +429,7 @@ (define-public coq-bignums (define-public coq-interval (package (name "coq-interval") - (version "4.3.0") + (version "4.3.1") (source (origin (method git-fetch) @@ -439,7 +439,7 @@ (define-public coq-interval (file-name (git-file-name name version)) (sha256 (base32 - "1jqvd17czhliscf40idhnxgrha620039ilrdyfahn71dg2jmzqnm")))) + "0sr9psildc0sda07r2r47rfgyry49yklk38bg04yyvry5j5pryb6")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) From 63d8c7a82f54a338b0ffb1d1b93faa1d44303bf9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 17:50:10 +0100 Subject: [PATCH 179/234] gnu: coq-stdpp: Update to 1.6.0. * gnu/packages/coq.scm (coq-stdpp): Update to 1.6.0. --- gnu/packages/coq.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 5cfe0b1cf3..1665afc5aa 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -611,7 +611,7 @@ (define-public coq-semantics (define-public coq-stdpp (package (name "coq-stdpp") - (version "1.5.0") + (version "1.6.0") (synopsis "Alternative Coq standard library std++") (source (origin (method git-fetch) @@ -621,7 +621,7 @@ (define-public coq-stdpp (file-name (git-file-name name version)) (sha256 (base32 - "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf")))) + "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v")))) (build-system gnu-build-system) (inputs `(("coq" ,coq))) From b1c2ad312dcb5f94d0b647effd17aa8ebf69494f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Nov 2021 19:30:05 +0100 Subject: [PATCH 180/234] gnu: emacs-citar: Update to 0.9. * gnu/packages/emacs-xyz.scm (emacs-citar): Update to 0.9. --- 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 99589fd9c8..d3338d45bd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17894,7 +17894,7 @@ (define-public emacs-biblio (define-public emacs-citar (package (name "emacs-citar") - (version "0.8") + (version "0.9") (source (origin (method git-fetch) @@ -17903,7 +17903,7 @@ (define-public emacs-citar (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jrfcfr976c9nb2vpfrh6yhck5gm34wcjzbk0m6gq2xg3qfv2g6p")))) + (base32 "15jhpl2j4rm97cvvqzlfzxarvxvcsg64raz068psrsd2y7y2zh4c")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-auctex" ,emacs-auctex) From 8b140f393e8682d07699d58926e299511c50bdfd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Nov 2021 19:48:56 +0100 Subject: [PATCH 181/234] gnu: ocaml-merlin-reader: Update to 4.3.1-411. * gnu/packages/ocaml.scm (ocaml-merlin-reader): Update to 4.3.1-411. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f6824561fd..123f05d568 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4710,7 +4710,7 @@ (define-public ocaml-craml (define-public ocaml-dot-merlin-reader (package (name "ocaml-dot-merlin-reader") - (version "4.2-411") + (version "4.3.1-411") (source (origin (method git-fetch) @@ -4720,7 +4720,7 @@ (define-public ocaml-dot-merlin-reader (file-name (git-file-name name version)) (sha256 (base32 - "1vl6p8m2pag5j283h5g2gzxxfm599k6qhyrjkdf3kyc476fc9lw8")))) + "1nwgc9nyy80dc9cgkskyfwv9c785yjyg39s005d4wiagj4fy68v8")))) (build-system dune-build-system) (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests From 80efc5d005738b0bb207c31179ee1cce5412fdba Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 21 Nov 2021 18:35:47 +0000 Subject: [PATCH 182/234] gnu: guix-build-coordinator: Update to 0-38.d46e9ac. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-38.d46e9ac. --- 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 b15298019b..416090ac48 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca") - (revision "37")) + (let ((commit "d46e9ac5936a4d3e6f6b2c00c6f35ba96259128c") + (revision "38")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s")) + "004ib2wq2d7gfpy2mbs243gll66iy524sv5n2r6g5lfns726y5hf")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments From 16dda28fd71fe80513fdd55af5bec62c6e67f113 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 20 Nov 2021 22:45:26 +0000 Subject: [PATCH 183/234] gnu: sameboy: Update to 0.14.7. * gnu/packages/emulators.scm (sameboy): Update to 0.14.7. Signed-off-by: Nicolas Goaziou --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b31d1ae491..5d3590399a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -769,7 +769,7 @@ (define-public mgba (define-public sameboy (package (name "sameboy") - (version "0.14.5") + (version "0.14.7") (source (origin (method git-fetch) @@ -778,7 +778,7 @@ (define-public sameboy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qqribyksm51fhq923rdhrzb9c4yf16szymprbw8fsz0nzv8frm3")))) + (base32 "1r391jdh0gjnx8bwmr63dcdmq58lpm162mng2ncrx53ydbb13xxf")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) From 9092b3865149d8b02551eea90ef1840d651aade2 Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Thu, 18 Nov 2021 18:56:52 -0800 Subject: [PATCH 184/234] gnu: Add libplacebo. * gnu/packages/video.scm (libplacebo): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/video.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3bfdde7184..ff1abb308f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1422,6 +1422,44 @@ (define-public libmatroska libebml is a C++ library to read and write EBML files.") (license license:lgpl2.1))) +(define-public libplacebo + (package + (name "libplacebo") + (version "4.157.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://code.videolan.org/videolan/libplacebo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + `("-Dopengl=enabled" + ,(string-append "-Dvulkan-registry=" + (assoc-ref %build-inputs "vulkan-headers") + "/share/vulkan/registry/vk.xml")))) + (native-inputs + `(("python-mako" ,python-mako) + ("pkg-config" ,pkg-config))) + (inputs + `(("lcms" ,lcms) + ("libepoxy" ,libepoxy) + ("mesa" ,mesa) + ("shaderc" ,shaderc) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader))) + (home-page "https://code.videolan.org/videolan/libplacebo") + (synopsis "GPU-accelerated image/video processing library") + (description "libplacebo is, in a nutshell, the core rendering algorithms +and ideas of mpv rewritten as an independent library. As of today, libplacebo +contains a large assortment of video processing shaders, focusing on both +quality and performance.") + (license license:lgpl2.1+))) + (define-public libva (package (name "libva") From 97a8d0edda15194c47f41ce0027ee404f0f55ef0 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Wed, 17 Nov 2021 04:26:11 -0500 Subject: [PATCH 185/234] gnu: Add devour. * gnu/packages/wm.scm (devour): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6874b591f2..3bf3c47cff 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2569,6 +2569,37 @@ (define-public hikari capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) +(define-public devour + (package + (name "devour") + (version "12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/salman-abedin/devour") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (delete 'configure)) ;no configure script + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "BIN_DIR=" %output "/bin")))) + (home-page "https://github.com/salman-abedin/devour") + (synopsis "X11 window swallower") + (description + "@command{devour} hides your current window before launching an external +program and unhides it after quitting.") + (license license:gpl2))) + (define-public wlogout (package (name "wlogout") From b2d8174400369d69c27d6dd3914f77cc34388ea8 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 17 Nov 2021 23:43:29 +0000 Subject: [PATCH 186/234] gnu: Add qxmpp. * gnu/packages/messaging.scm (qxmpp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9f4134362a..6a84f43bad 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020, 2021 Robert Karszniewicz ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Denis 'GNUtoo' Carikli +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -391,6 +392,47 @@ (define-public silc-toolkit license:gpl2+ license:bsd-2)))) +(define-public qxmpp + (package + (name "qxmpp") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/qxmpp-project/qxmpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DBUILD_EXAMPLES=false" + "-DWITH_GSTREAMER=true") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" + (string-join ;; These tests use the network. + (list "tst_qxmppiceconnection" + "tst_qxmppcallmanager" + "tst_qxmpptransfermanager") + "|")))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gstreamer" ,gstreamer) + ("qtbase" ,qtbase-5))) + (home-page "https://github.com/qxmpp-project/qxmpp") + (synopsis "XMPP client and server library") + (description + "QXmpp is a XMPP client and server library written in C++ and uses the Qt +framework. It builds XMPP clients complying with the XMPP Compliance Suites +2021 for IM and Advanced Mobile.") + (license license:lgpl2.1+))) + (define-public meanwhile (package (name "meanwhile") From 24aa7b3c21309b63cc6e8e18d6417d2cddccf6c6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 22 Nov 2021 00:16:52 +0100 Subject: [PATCH 187/234] import: opam: Fix error on unknown field value. * guix/import/opam.scm (metadata-ref): Return #f if field is present, but its content is of unknown form. --- guix/import/opam.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 0804526e3a..eb384ba426 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -230,7 +230,8 @@ (define (metadata-ref file lookup) (('list-pat . stuff) stuff) (('string-pat stuff) stuff) (('multiline-string stuff) stuff) - (('dict records ...) records)) + (('dict records ...) records) + (_ #f)) acc)))) #f file)) From 82f8ac4c291e80ef94ee57ff1e0f62f1307c0afb Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Sun, 21 Nov 2021 13:31:42 -0500 Subject: [PATCH 188/234] gnu: Add babeltrace. * gnu/packages/linux.scm (babeltrace): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/linux.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d167dc522..81589955cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -131,6 +131,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages slang) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) @@ -8199,6 +8200,61 @@ (define-public lttng-tools @code{lttng-relayd} for network streaming.") (license (list license:gpl2 license:lgpl2.1)))) +(define-public babeltrace + (package + (name "babeltrace") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://www.efficios.com/files/babeltrace/babeltrace2-" + version ".tar.bz2")) + (sha256 + (base32 "1jlv925pr7hykc48mdvbmqm4ipy1r11xwzapa6fdpdfshmk12kvp")))) + + (build-system gnu-build-system) + + (arguments + `(;; FIXME - When Python's bindings are enabled, tests do not pass. + #:configure-flags '("--enable-debug-info" + "--enable-man-pages" + "--disable-python-bindings" + "--disable-python-plugins") + #:phases + (modify-phases %standard-phases + ;; These are recommended in the project's README for a development + ;; build configuration. + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "BABELTRACE_DEV_MODE" "1") + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")))))) + (inputs + `(("glib" ,glib))) + ;; NOTE - elfutils is used for the LTTng debug information filter + ;; component class. This can be moved to `native-inputs` if + ;; `--enable-debug-info` is replaced by `--disable-debug-info` in + ;; `#:configure-flags`. + (propagated-inputs + `(("elfutils" ,elfutils))) + ;; NOTE - python-3 is set here for generating the bindings. Users need to + ;; install python-3 in their profile in order to use these bindings. + (native-inputs + `(("asciidoc" ,asciidoc) + ("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ("python-3" ,python-3) + ("python-sphinx" ,python-sphinx) + ("swig", swig) + ("xmltoman" ,xmltoman))) + (home-page "https://babeltrace.org/") + (synopsis "Trace manipulation toolkit") + (description "Babeltrace 2 is a framework for viewing, converting, +transforming, and analyzing traces. It is also the reference parser +implementation of the Common Trace Format (CTF), produced by tools such as +LTTng and barectf. This package provides a library with a C API, Python 3 +bindings, and the command-line tool @command{babeltrace2}.") + (license license:expat))) + (define-public kexec-tools (package (name "kexec-tools") From ea48a87f1f8f508ede70a8a30b38b67b80ba9812 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Sun, 21 Nov 2021 12:37:20 -0500 Subject: [PATCH 189/234] gnu: lttng-ust: Update to 2.13.0. * gnu/packages/linux.scm (lttng-ust): Bump version. [native-inputs]: Add pkg-config. Signed-off-by: Maxim Cournoyer --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 81589955cc..cc2af190c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8113,20 +8113,21 @@ (define-public ell (define-public lttng-ust (package (name "lttng-ust") - (version "2.12.2") + (version "2.13.0") (source (origin (method url-fetch) (uri (string-append "https://lttng.org/files/lttng-ust/" "lttng-ust-" version ".tar.bz2")) (sha256 (base32 - "1iwz6p79zvibj8sl8qqw84lcir9a8z1ylq77hhnwg26anrjg1l5w")))) + "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l")))) (build-system gnu-build-system) (inputs `(("liburcu" ,liburcu) ("numactl" ,numactl))) (native-inputs - `(("python" ,python-3))) + `(("python" ,python-3) + ("pkg-config", pkg-config))) (home-page "https://lttng.org/") (synopsis "LTTng userspace tracer libraries") (description "The user space tracing library, liblttng-ust, is the LTTng From 9d370029c21487c54b7bda4aa53e49251107a71f Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Sun, 21 Nov 2021 12:41:39 -0500 Subject: [PATCH 190/234] gnu: lttng-tools: Update to 2.13.1. * gnu/packages/linux.scm (lttng-tools): Bump version. Signed-off-by: Maxim Cournoyer --- 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 cc2af190c5..f2f3cfa933 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8139,14 +8139,14 @@ (define-public lttng-ust (define-public lttng-tools (package (name "lttng-tools") - (version "2.12.5") + (version "2.13.1") (source (origin (method url-fetch) (uri (string-append "https://lttng.org/files/lttng-tools/" "lttng-tools-" version ".tar.bz2")) (sha256 (base32 - "0bgk35423v6z17j1w80m7dcza7gigs1pwyq24sdmgqwg6j2d1zmc")))) + "1df8ag2a1yyjn6hz6wxgcz0p847cq91b8inf0zyhgz1im1yxzrng")))) (build-system gnu-build-system) (arguments `(;; FIXME - Currently there's a segmentation fault by swig when enabling From 586a1ef9710532cd9e632e21edcb7226f203f1c5 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sun, 21 Nov 2021 22:43:15 +0100 Subject: [PATCH 191/234] gnu: Add lz4json. * gnu/packages/gnuzilla.scm (lz4json): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnuzilla.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9edfcaa2ab..df344a1749 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. ;;; @@ -1992,3 +1993,41 @@ (define-public firefox-decrypt (description "Firefox Decrypt is a tool to extract passwords from Mozilla (Firefox, Waterfox, Thunderbird, SeaMonkey) profiles.") (license license:gpl3+))) + +(define-public lz4json + (package + (name "lz4json") + (version "2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/andikleen/lz4json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xxn8yzr6j8j6prmbj6mxspdczigarfiv3vlm9k70yxmky65ijh3")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("lz4" ,lz4))) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install ; no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "lz4jsoncat" bin) + (install-file "lz4jsoncat.1" man))))) + #:make-flags `(,(string-append "CC=" ,(cc-for-target))))) + (home-page "https://github.com/andikleen/lz4json") + (synopsis "C decompress tool for mozilla lz4json format") + (description + "@code{lz4json} is a little utility to unpack lz4json files as generated +by Firefox's bookmark backups and session restore. This is a different format +from what the normal lz4 utility expects. The data is dumped to stdout.") + (license license:bsd-2))) From 3edadb421934f0d20b240c1c2e29f83fa1d2e1be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Nov 2021 11:37:49 +0100 Subject: [PATCH 192/234] gnu: emacs-evil-multiedit: Update to 1.4.3. * gnu/packages/emacs-xyz.scm (emacs-evil-multiedit): Update to 1.4.3. --- 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 d3338d45bd..19a268169c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20767,7 +20767,7 @@ (define-public emacs-evil-magit (define-public emacs-evil-multiedit (package (name "emacs-evil-multiedit") - (version "1.4.1") + (version "1.4.3") (source (origin (method git-fetch) @@ -20776,7 +20776,7 @@ (define-public emacs-evil-multiedit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0iwrfkgs0964kxj3kwi8dqn42flhg2pnp4iswc07xi8ri2lflnkv")))) + (base32 "08ycwss58zh2zikk79jfj074q78yjcd7vbjgv5ssqvws09x5rgfq")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) From 616216b0adf063d2f714d38f4440ff20d8981b94 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Nov 2021 11:43:08 +0100 Subject: [PATCH 193/234] gnu: emacs-eldev: Update to 0.10.1. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 0.10.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 19a268169c..eb58952b6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17628,7 +17628,7 @@ (define-public emacs-peg (define-public emacs-eldev (package (name "emacs-eldev") - (version "0.10") + (version "0.10.1") (source (origin (method git-fetch) @@ -17637,7 +17637,7 @@ (define-public emacs-eldev (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y1gc37vn8k1yhp6b069sg8hdh1bn22icdqn4b28c2k5iiw9g7gi")))) + (base32 "0ff74scwmixyawsdypvix0cchsbp1d9ac95ym96b4f8hj5gijjms")))) (build-system emacs-build-system) (arguments `(#:tests? #t From e26a149e22e46fa37d0b34e1d0341a227d3fa907 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 23:50:18 -0600 Subject: [PATCH 194/234] gnu: cl-yxorp: Update to 0.2. * gnu/packages/lisp-xyz.scm (sbcl-yxorp): Update to 0.2. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f891164fc8..0b8bcd0427 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17896,11 +17896,11 @@ (define-public cl-aserve (sbcl-package->cl-source-package sbcl-aserve)) (define-public sbcl-yxorp - (let ((commit "d2e8f9304549e47ae5c7fa35a6b114804603eac9") - (revision "1")) + (let ((commit "041d0a535d6406df703f5f037d3d2cad4159c74d") + (revision "2")) (package (name "sbcl-yxorp") - (version (git-version "0" revision commit)) + (version (git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -17909,7 +17909,7 @@ (define-public sbcl-yxorp (commit commit))) (file-name (git-file-name "cl-yxorp" version)) (sha256 - (base32 "1zz1j678vzwkf817h2z0pf0fcyf4mldv4hiv1wyam58hd4bcrjsw")))) + (base32 "14fvncisig6h2qamczbx9cifp3rbjfw0cmc2ffifvr82x2bwab1f")))) (build-system asdf-build-system/sbcl) (inputs `(("cl+ssl" ,sbcl-cl+ssl) From abd856b50520b6f57d4f367f9db933d1b6b821b4 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 23:57:01 -0600 Subject: [PATCH 195/234] gnu: cl-portal: Update to 1.2. * gnu/packages/lisp-xyz.scm (sbcl-portal): Update to 1.2. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0b8bcd0427..a40ce00ed3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18107,11 +18107,11 @@ (define-public cl-issr-core (sbcl-package->cl-source-package sbcl-issr-core)) (define-public sbcl-portal - (let ((commit "cc7ba6a54cea6ef63b17dcc6e653d91d9907f59e") - (revision "1")) + (let ((commit "416589fa04cb239971422a1272acba236c8333be") + (revision "2")) (package (name "sbcl-portal") - (version (git-version "1" revision commit)) + (version (git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -18120,7 +18120,7 @@ (define-public sbcl-portal (commit commit))) (file-name (git-file-name "portal" version)) (sha256 - (base32 "0fc81iwb4lpp8d2scdwafkixxwkfmq4gqns522zyb4bh6c1rfmwy")))) + (base32 "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) From e5ac7670b156b45fa8aca06a5b553ff7f00c5c02 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Nov 2021 11:50:54 +0100 Subject: [PATCH 196/234] gnu: emacs-form-feed: Update to 0.2.3. * gnu/packages/emacs-xyz.scm (emacs-form-feed): Update to 0.2.3. --- 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 eb58952b6c..35722002c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3025,18 +3025,18 @@ (define-public emacs-elf-mode (define-public emacs-form-feed (package (name "emacs-form-feed") - (version "0.2.2") + (version "0.2.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/form-feed") + (url "https://depp.brause.cc/form-feed.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2")))) + (base32 "10mcj4x2fjq0ikq9adkd72k9zp6caqib628bmj8d67wwabvzj6mk")))) (build-system emacs-build-system) - (home-page "https://github.com/wasamasa/form-feed") + (home-page "https://depp.brause.cc/form-feed") (synopsis "Display ^L glyphs as horizontal lines") (description "This package provides a minor mode @code{form-feed-mode} to display page From 1d7e603a774e5771da394895a6cd16643f8d0ac7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 22 Nov 2021 10:25:13 +0100 Subject: [PATCH 197/234] gnu: pari-gp: Update to 2.13.3. * gnu/packages/algebra.scm (pari-gp): Update to 2.13.3. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 58873c7a60..0ef9423898 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -237,7 +237,7 @@ (define-public python-fpylll (define-public pari-gp (package (name "pari-gp") - (version "2.13.2") + (version "2.13.3") (source (origin (method url-fetch) (uri (string-append @@ -245,7 +245,7 @@ (define-public pari-gp version ".tar.gz")) (sha256 (base32 - "095s7vdlsxmxa0n0l1a082m6gjaypqfqkaj99z8j7dx0ji89hy8n")))) + "1jm1cz1687cz8pl8lgvmyk3l33cms1xbayv38ca4z1f60qb7zfnc")))) (build-system gnu-build-system) (native-inputs `(("texlive" ,(texlive-union From 7f4b31578d1c4b6ad72677da328c0ecacd4ca6b2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 22 Nov 2021 11:36:40 +0100 Subject: [PATCH 198/234] gnu: flint: Update to 2.8.4. * gnu/packages/algebra.scm (flint): Update to 2.8.4. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 0ef9423898..76bb288181 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -431,13 +431,13 @@ (define-public giac (define-public flint (package (name "flint") - (version "2.8.1") + (version "2.8.4") (source (origin (method url-fetch) (uri (string-append "http://flintlib.org/flint-" version ".tar.gz")) (sha256 - (base32 "0zj2zgn3cbb08pxhfq38i62pgjfbb6938l70am7dnixqgixdmzgd")))) + (base32 "1gp4wm2s8c27g2hh53d09cys62da1bsxfwbcsj9cd7cfikm95pv1")))) (build-system gnu-build-system) (inputs `(("ntl" ,ntl))) From e1dce8faf0a4f052082465db0e348a5f604859b6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 22 Nov 2021 13:27:16 +0100 Subject: [PATCH 199/234] gnu: arb: Update to 2.21.1. * gnu/packages/algebra.scm (arb): Update to 2.21.1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 76bb288181..b704d98dde 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -485,7 +485,7 @@ (define-public flint (define-public arb (package (name "arb") - (version "2.21.0") + (version "2.21.1") (source (origin (method git-fetch) (uri (git-reference @@ -494,7 +494,7 @@ (define-public arb (file-name (git-file-name name version)) (sha256 (base32 - "0c7q8bbm2izh0j0342v0dkgg1lgd6f0fn3i9x9x80brjjhg65q7b")))) + "1lmcl122qy6mr1g1y65bm7dk9fj0sym7gzmvar5vdgk7ln03c5iq")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h From 36e2d993da0c5cd70f16e399502b768d52cc69c3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 21 Nov 2021 17:06:41 -0500 Subject: [PATCH 200/234] gnu: linux-libre: Update to 5.14.21. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.21. (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 f2f3cfa933..ed4949b2a3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -348,7 +348,7 @@ (define (%upstream-linux-source version hash) ;; 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.20") +(define-public linux-libre-5.14-version "5.14.21") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -358,7 +358,7 @@ (define deblob-scripts-5.14 (base32 "1xmmr26lpffc4dfmrkvh3gdkkr8666fcyvgam560vbyd2b2qkd78"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj"))) + (hash (base32 "1cr381c179nfdrq95l4j56c4ygw09sxv493553ix4b80naf2a6pl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) From 5bff28e0895289edbdb5a8f88246ed2066ee27d9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 21 Nov 2021 17:07:14 -0500 Subject: [PATCH 201/234] gnu: linux-libre 5.10: Update to 5.10.81. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.81. (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 ed4949b2a3..bb858b9169 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,7 +366,7 @@ (define-public linux-libre-5.14-pristine-source ;; 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.80") +(define-public linux-libre-5.10-version "5.10.81") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -376,7 +376,7 @@ (define deblob-scripts-5.10 (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0ffvgxaq2ipylzavvgnnqk56pw2a6gy5zhhgdhsf8qs2cbvyhz27"))) + (hash (base32 "1nssv94zivx08vrxxflq4dxk5fxl3azsqlnzvw58qnf469hniqd2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) From 4df826f3404b469b88b9f234102bab973bf6c48a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 21 Nov 2021 17:07:29 -0500 Subject: [PATCH 202/234] gnu: linux-libre 5.4: Update to 5.4.161. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.161. (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 bb858b9169..ece3c588e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -381,7 +381,7 @@ (define-public linux-libre-5.10-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.160") +(define-public linux-libre-5.4-version "5.4.161") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -391,7 +391,7 @@ (define deblob-scripts-5.4 (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0n04nlg44l7p855lxkdz80x2avwm1pmrx1761cjmqv4w1qlq1c6l"))) + (hash (base32 "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) From 3d2e41adf2d907311035d60557168696aaeeb381 Mon Sep 17 00:00:00 2001 From: pinoaffe Date: Sun, 14 Nov 2021 02:15:48 +0100 Subject: [PATCH 203/234] gnu: emacs-ryo-modal: Update to 0.45. * gnu/packages/emacs-xyz.scm (emacs-ryo-modal): Update to 0.45. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35722002c8..4a26ce1295 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10727,11 +10727,11 @@ (define-public emacs-rainbow-mode (define-public emacs-ryo-modal ;; Package has no release. Version is extracted from "Version:" keyword in ;; main file. - (let ((commit "3a54312eea7023a86ca3f8eb3c03c872554bff2f") + (let ((commit "a10f564474cc8fa28a74b04e3b15375315223c44") (revision "0")) (package (name "emacs-ryo-modal") - (version (git-version "0.4" revision commit)) + (version (git-version "0.45" revision commit)) (source (origin (method git-fetch) @@ -10740,7 +10740,7 @@ (define-public emacs-ryo-modal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95")))) + (base32 "0ypm1rnyry6hb4znb8sgwfi0la6q46ihm8k99kisk0mkgz7im93d")))) (build-system emacs-build-system) (home-page "https://github.com/Kungsgeten/ryo-modal") (synopsis "Emacs minor mode for defining modal editing environments") From cb296dfa2e2938d18ae0ee347bed0cc94bc79cf8 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 10 Nov 2021 20:37:48 +0100 Subject: [PATCH 204/234] gnu: proof-general: Adjust autoloads for Emacs. Fixes . * gnu/packages/coq.scm (proof-general)[native-inputs]: Remove 'which'. [inputs]: Remove 'coq' and 'emacs'. [arguments]<#:make-flags>: Adjust to find 'emacs'. Set 'ELISP' and 'DEST_LISP'. <#:modules, #:imported-modules>: Remove. <#:phases>: Remove call to 'which' in Makefile. Add copy file allowing Emacs autoloads. Clean unnecessary code. Signed-off-by: Nicolas Goaziou --- gnu/packages/coq.scm | 95 +++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 1665afc5aa..a27ec53ecb 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -136,50 +136,65 @@ (define-public proof-general "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa")))) (build-system gnu-build-system) (native-inputs - `(("which" ,which) - ("emacs" ,emacs-minimal) + `(("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) (inputs - `(("host-emacs" ,emacs) - ("perl" ,perl) - ("coq" ,coq))) + `(("perl" ,perl))) (arguments - `(#:tests? #f ; no check target - #:make-flags (list (string-append "PREFIX=" %output) - (string-append "DEST_PREFIX=" %output) - (string-append "ELISP_START=" %output - "/share/emacs/site-lisp/ProofGeneral")) - #:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'disable-byte-compile-error-on-warn - (lambda _ - (substitute* "Makefile" - (("\\(setq byte-compile-error-on-warn t\\)") - "(setq byte-compile-error-on-warn nil)")))) - (add-after 'unpack 'patch-hardcoded-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coq (assoc-ref inputs "coq")) - (emacs (assoc-ref inputs "host-emacs"))) + (let ((base-directory "/share/emacs/site-lisp/ProofGeneral")) + `(#:tests? #f ; no check target + #:make-flags (list (string-append "PREFIX=" %output) + (string-append "EMACS=" (assoc-ref %build-inputs "emacs") + "/bin/emacs") + (string-append "DEST_PREFIX=" %output) + (string-append "ELISP=" %output ,base-directory) + (string-append "DEST_ELISP=" %output ,base-directory) + (string-append "ELISP_START=" %output ,base-directory)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'disable-byte-compile-error-on-warn + (lambda _ (substitute* "Makefile" - (("/sbin/install-info") "install-info"))))) - (add-after 'unpack 'clean - (lambda _ - ;; Delete the pre-compiled elc files for Emacs 23. - (invoke "make" "clean"))) - (add-after 'install 'install-doc - (lambda* (#:key make-flags #:allow-other-keys) - ;; XXX FIXME avoid building/installing pdf files, - ;; due to unresolved errors building them. - (substitute* "Makefile" - ((" [^ ]*\\.pdf") "")) - (apply invoke "make" "install-doc" make-flags)))))) + (("\\(setq byte-compile-error-on-warn t\\)") + "(setq byte-compile-error-on-warn nil)")))) + (add-after 'unpack 'patch-hardcoded-paths + (lambda _ + (substitute* "Makefile" + (("/sbin/install-info") "install-info")))) + (add-after 'unpack 'remove-which + (lambda _ + (substitute* "Makefile" + (("`which perl`") "perl") + (("`which bash`") "bash")))) + (add-after 'unpack 'clean + (lambda _ + ;; Delete the pre-compiled elc files for Emacs 23. + (invoke "make" "clean"))) + (add-after 'install 'install-doc + (lambda* (#:key make-flags #:allow-other-keys) + ;; XXX FIXME avoid building/installing pdf files, + ;; due to unresolved errors building them. + (substitute* "Makefile" + ((" [^ ]*\\.pdf") "")) + (apply invoke "make" "install-doc" make-flags))) + (add-after 'install 'allow-subfolders-autoloads + ;; Autoload cookies are present in sub-directories. A friendly + ;; wrapper proof-general.el around generic/proof-site.el is + ;; provided for execution on Emacs start-up. It serves two + ;; purposes: + ;; + ;; * Setting up the load path when byte-compiling pg. + ;; * Loading a minimal PG setup on startup (not all of Proof + ;; General, of course; mostly mode hooks and autoloads). + ;; + ;; The renaming to proof-general-autoloads.el is Guix + ;; specific. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-file "proof-general.el" + (string-append out ,base-directory + "/proof-general-autoloads.el"))))))))) (home-page "https://proofgeneral.github.io/") (synopsis "Generic front-end for proof assistants based on Emacs") (description From 6ac283bad7ace27ecd66dd8718b94db4628b48e5 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 22 Nov 2021 13:35:50 -0500 Subject: [PATCH 205/234] gnu: Add cl-cmn. * gnu/packages/lisp-xyz.scm (cl-cmn, sbcl-cmn, ecl-cmn): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a40ce00ed3..bb697c4c60 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2021 Cameron Chaparro ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -19695,6 +19696,31 @@ (define-public sbcl-vernacular (define-public cl-vernacular (sbcl-package->cl-source-package sbcl-vernacular)) +(define-public sbcl-cmn + (package + (name "sbcl-cmn") + (version "2021.11.22") + (source + (origin + (method url-fetch) + (uri "https://ccrma.stanford.edu/software/cmn/cmn.tar.gz") + (file-name (string-append "cmn-" version ".tar.gz")) + (sha256 + (base32 "04j1l57cdyfi2zzxqwmvmf1hl899ffgs3bl4r42ba47zsw45kq14")))) + (build-system asdf-build-system/sbcl) + (home-page "https://ccrma.stanford.edu/software/cmn/") + (synopsis "Western music notation package written in Common Lisp") + (description + "CMN provides a package of functions to hierarchically describe a musical +score. When evaluated, the musical score is rendered to an image.") + (license license:expat))) + +(define-public cl-cmn + (sbcl-package->cl-source-package sbcl-cmn)) + +(define-public ecl-cmn + (sbcl-package->ecl-package sbcl-cmn)) + (define-public sbcl-cl-https-everywhere ;; No release. ;; Don't forget to update the https-everywhere input. From 882dad5085b00baefbc91c39314eea74d69549a2 Mon Sep 17 00:00:00 2001 From: Frank Pursel Date: Sun, 21 Nov 2021 09:29:18 -0800 Subject: [PATCH 206/234] gnu: Add xlispstat. * gnu/packages/statistics.scm (xlispstat): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/statistics.scm | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e69baee8bd..9c2187d5ba 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Tim Howes ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Lars-Dominik Braun +;;; Copyright © 2021 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ (define-module (gnu packages statistics) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -74,6 +76,7 @@ (define-module (gnu packages statistics) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages tcl) @@ -6830,3 +6833,55 @@ (define-public r-desctools from contributed R packages as well.") (license license:gpl2+))) +(define-public xlispstat + (let ((commit "f1bea6053df658ee48612bf1f63c35de99e2c649") + (revision "0")) + (package + (name "xlispstat") + (version (git-version "3.52.23" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhbadger/xlispstat.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p0cmgy19kbkxia139cb5w9dnkp2cdqp5n3baag6cq3prn3n71mf")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-build? #f ; Parallel builds are not supported + #:configure-flags (list "--with-gcc") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-output-to-file "exit.lsp" + (lambda () (display "(exit)"))) + (invoke "./xlisp" "tests/test" "exit"))))))) + (inputs `(("tcsh" ,tcsh) + ("libx11" ,libx11) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libxpm" ,libxpm) + ("libxaw" ,libxaw) + ("ncurses" ,ncurses) + ("gnuplot" ,gnuplot))) + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "Statistical analysis environment with interactive graphics") + (description "XLISP-STAT is a statistical environment based on a Lisp +dialect called XLISP. To facilitate statistical computations, standard +functions for addition, logarithms, etc., have been modified to operate on +lists and arrays of numbers, and a number of basic statistical functions have +been added. Many of these functions have been written in Lisp, and additional +functions can be added easily by a user. Several basic forms of plots, +including histograms, scatterplots, rotatable plots and scatterplot matrices +are provided. These plots support various forms of interactive highlighting +operations and can be linked so points highlighted in one plot will be +highlighted in all linked plots. Interactions with the plots are controlled +by the mouse, menus and dialog boxes. An object-oriented programming system +is used to allow menus, dialogs, and the response to mouse actions to be + customized.") + (home-page "http://homepage.divms.uiowa.edu/~luke/xls/xlsinfo/") + (license license:expat)))) From 8cae6dbc889b4ed36fd04688b2bfd3ea2c850672 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Mon, 22 Nov 2021 21:12:51 +0100 Subject: [PATCH 207/234] gnu: statistics: Delete trailing whitespace. * gnu/packages/statistics.scm: Delete trailing whitespace. --- gnu/packages/statistics.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9c2187d5ba..f60b299eac 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3230,7 +3230,7 @@ (define-public r-dt ("https://cdn.datatables.net/1.10.20/js/dataTables.semanticui.js" "1477f49xyxs4phias789mbspv23w8alxchhl5b5iy0aw6vd35c43" "datatables") - + ("https://cdn.datatables.net/autofill/2.3.4/js/dataTables.autoFill.js" "04i6n7r3512gzfihl5wnhrvm0klnjp41g1z6cny3j803hvmnp8zk" "datatables-extensions/AutoFill") @@ -3309,7 +3309,7 @@ (define-public r-dt ("https://cdn.datatables.net/colreorder/1.5.2/js/colReorder.jqueryui.js" "1rd8hijz3prg2y36fvqczrpdzixibjy2dxgs2fmgr8wrm8k01rrm" "datatables-extensions/ColReorder") - + ("https://cdn.datatables.net/fixedcolumns/3.3.0/js/dataTables.fixedColumns.js" "0vsqk2fv59n351bdfcbvhmvpq38qwf41j1cn810xz1l1i07cg4hg" "datatables-extensions/FixedColumns") @@ -3328,7 +3328,7 @@ (define-public r-dt ("https://cdn.datatables.net/fixedcolumns/3.3.0/js/fixedColumns.semanticui.js" "1kqsap9y0d25a7m5zjakipifl5qi2qr72kfj4ap3zxavd8md2wyn" "datatables-extensions/FixedColumns") - + ("https://cdn.datatables.net/fixedheader/3.1.6/js/dataTables.fixedHeader.js" "1ml5ilnm8nirr6rsgmzn75l1k0hcjz3sqk6h1y1gy8cpwpklvqri" "datatables-extensions/FixedHeader") @@ -3347,7 +3347,7 @@ (define-public r-dt ("https://cdn.datatables.net/fixedheader/3.1.6/js/fixedHeader.semanticui.js" "1v0i6dc68h8l8673fb5970igzkl7as36riv504iyg82glfi7n877" "datatables-extensions/FixedHeader") - + ("https://cdn.datatables.net/keytable/2.5.1/js/dataTables.keyTable.js" "16iib2icxsjh93x5hd42gpsl7bzpcsqb7zjgj0m1s02ls45bdlv5" "datatables-extensions/KeyTable") @@ -3385,7 +3385,7 @@ (define-public r-dt ("https://cdn.datatables.net/responsive/2.2.3/js/responsive.bootstrap4.js" "1zjh15p7n1038sggaxv1xvcwbkhw2nk1ndx745s6cxiqb69y3i0h" "datatables-extensions/Responsive") - + ("https://cdn.datatables.net/rowgroup/1.1.1/js/dataTables.rowGroup.js" "0s4q7ir2d6q36g29nn9mqk7vrqrdig2mm5zbcv0sn2lixqi29pkj" "datatables-extensions/RowGroup") @@ -3423,7 +3423,7 @@ (define-public r-dt ("https://cdn.datatables.net/rowreorder/1.2.6/js/rowReorder.semanticui.js" "1zjrx2rlgw3qannsqa88pcp3i4pc87pwv7rmgfw1dar8namkr9kk" "datatables-extensions/RowReorder") - + ("https://cdn.datatables.net/scroller/2.0.1/js/dataTables.scroller.js" "0zfjjdvwwlsnps24i9l4c97hmway2qs6addks1is5bxl4k1r6d16" "datatables-extensions/Scroller") @@ -3442,7 +3442,7 @@ (define-public r-dt ("https://cdn.datatables.net/scroller/2.0.1/js/scroller.semanticui.js" "1dfbblbzbryjgiv31qfdjnijz19lmyijg12win3y8gsgfd4fp9zz" "datatables-extensions/Scroller") - + ("https://cdn.datatables.net/searchbuilder/1.0.0/js/dataTables.searchBuilder.js" "0n5g0j0yfzqvdpsmwb27bj1rd8zx864fsx2k7b2kpv6mqqavzpqc" "datatables-extensions/SearchBuilder") @@ -3477,7 +3477,7 @@ (define-public r-dt ("https://cdn.datatables.net/searchpanes/1.1.1/js/searchPanes.semanticui.js" "1781d0xmx7xz0jly0wsw2zbrdmfc1crahmcdbsfbj5s66kdsnd7c" "datatables-extensions/SearchPanes") - + ("https://cdn.datatables.net/select/1.3.1/js/dataTables.select.js" "0a7bkbz1cizhiq4h417b4rcdr7998pn8q4dlyzx8449xdp0h0n0v" "datatables-extensions/Select") From bb3fbb4d9d5c1e789958bc0f37026eccf64e8e93 Mon Sep 17 00:00:00 2001 From: Taiju HIGASHI Date: Mon, 22 Nov 2021 11:58:34 +0900 Subject: [PATCH 208/234] gnu: Add emacs-ddskk-nicola. * gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a26ce1295..4fe1633485 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28631,6 +28631,38 @@ (define-public emacs-ddskk conversion program}, a Japanese input method on Emacs.") (license license:gpl2+)))) +(define-public emacs-ddskk-nicola + (package + (inherit emacs-ddskk) + (name "emacs-ddskk-nicola") + (propagated-inputs + `(("emacs-ddskk" ,emacs-ddskk))) + (arguments + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (append + (list (string-append "PREFIX=" out) + (string-append "LISPDIR=" out "/share/emacs/site-lisp")))) + #:tests? #f ; no tests in this subtree + ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "nicola") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (make-file-writable "NICOLA-DDSKK-CFG") + (emacs-substitute-sexps "NICOLA-DDSKK-CFG" + ("setq NICOLA-DDSKK_PREFIX" "")) + #t))))))) + (synopsis "Nicola layout for Daredevil SKK") + (description + "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji +conversion program}, a Japanese input method on Emacs. This package adds +support for the Nicola keyboard layout to it."))) + (define-public emacs-objed (package (name "emacs-objed") From c4bc557c3a2e59b0d127f1a8a963e1a19daf6cdb Mon Sep 17 00:00:00 2001 From: Jorge Gomez Date: Thu, 18 Nov 2021 20:22:18 -0500 Subject: [PATCH 209/234] gnu: Add sc-im. * gnu/packages/spreadsheet.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 + gnu/packages/spreadsheet.scm | 80 ++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 gnu/packages/spreadsheet.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2513530d0d..50caafdc6b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -519,6 +519,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/sawfish.scm \ %D%/packages/scanner.scm \ %D%/packages/scheme.scm \ + %D%/packages/spreadsheet.scm \ %D%/packages/screen.scm \ %D%/packages/scribus.scm \ %D%/packages/scsi.scm \ diff --git a/gnu/packages/spreadsheet.scm b/gnu/packages/spreadsheet.scm new file mode 100644 index 0000000000..2c0b539c55 --- /dev/null +++ b/gnu/packages/spreadsheet.scm @@ -0,0 +1,80 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2021 Jorge Gomez +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages spreadsheet) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages base) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages maths) + #:use-module (gnu packages statistics) + #:use-module (gnu packages xml) + #:use-module (gnu packages compression) + #:use-module (gnu packages bison) + #:use-module (gnu packages ncurses)) + +(define-public sc-im + (package + (name "sc-im") + (version "0.8.2") + (home-page "https://github.com/andmarti1424/sc-im") + (source (origin + (method git-fetch) + (uri + (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nrjnw8sg75i0hkcbvjv7gydjddxjm27d5m1qczpg29fk9991q8z")))) + (build-system gnu-build-system) + (arguments + ;; There are no tests at the moment. + ;; https://github.com/andmarti1424/sc-im/issues/537 + ;; https://github.com/andmarti1424/sc-im/pull/385 + `(#:tests? #f + #:make-flags (list "-C" "src" + (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" %output)) + #:phases + (modify-phases + %standard-phases + (delete 'configure)))) + (inputs + `(("gnuplot" ,gnuplot) + ("libxls" ,libxls) + ("libxlsxwriter" ,libxlsxwriter) + ("libxml2" ,libxml2) + ("libzip" ,libzip) + ("ncurses" ,ncurses))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which) + ("bison" ,bison))) + (synopsis "Spreadsheet program with vim-like keybindings") + (description + "@code{sc-im} is a highly configurable spreadsheet program + providing a vim-like experience. @code{sc-im} supports @{gnuplot} interaction, + functions for sorting and filtering, 256 color support, and much more.") + (license bsd-4))) From 10fad03fcf6fdd2edbdab5f939e3c0edb11a88e2 Mon Sep 17 00:00:00 2001 From: Jorge Gomez Date: Thu, 18 Nov 2021 20:22:19 -0500 Subject: [PATCH 210/234] gnu: Move visidata to (gnu packages spreadsheet). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See . * gnu/packages/visidata.scm (visidata): Move from here… * gnu/packages/spreadsheet.scm (visidata): …to here. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/spreadsheet.scm | 53 +++++++++++++++++++++++++---- gnu/packages/visidata.scm | 64 ------------------------------------ 3 files changed, 47 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/visidata.scm diff --git a/gnu/local.mk b/gnu/local.mk index 50caafdc6b..3227fc3835 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -586,7 +586,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/video.scm \ %D%/packages/vim.scm \ %D%/packages/virtualization.scm \ - %D%/packages/visidata.scm \ %D%/packages/vlang.scm \ %D%/packages/vnc.scm \ %D%/packages/vpn.scm \ diff --git a/gnu/packages/spreadsheet.scm b/gnu/packages/spreadsheet.scm index 2c0b539c55..99ff1bbff0 100644 --- a/gnu/packages/spreadsheet.scm +++ b/gnu/packages/spreadsheet.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2021 Jorge Gomez ;;; @@ -23,15 +24,20 @@ (define-module (gnu packages spreadsheet) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix licenses) #:use-module (gnu packages base) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages maths) - #:use-module (gnu packages statistics) - #:use-module (gnu packages xml) - #:use-module (gnu packages compression) #:use-module (gnu packages bison) - #:use-module (gnu packages ncurses)) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages time) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages statistics) + #:use-module (gnu packages xml)) (define-public sc-im (package @@ -78,3 +84,38 @@ (define-public sc-im providing a vim-like experience. @code{sc-im} supports @{gnuplot} interaction, functions for sorting and filtering, 256 color support, and much more.") (license bsd-4))) + +(define-public visidata + (package + (name "visidata") + (version "2.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "visidata" version)) + (sha256 + (base32 + "19fbjr9j91pcazcz0bqx3qrasmr8xdsb13haf5lfbpyxj23f7f1j")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest")) + #t))))) + (inputs + `(("dateutil" ,python-dateutil) + ("requests" ,python-requests) + ("lxml" ,python-lxml) + ("openpyxl" ,python-openpyxl) + ("xlrd" ,python-xlrd))) + (native-inputs + `(("pytest" ,python-pytest))) + (synopsis "Terminal spreadsheet multitool for discovering and arranging data") + (description + "VisiData is an interactive multitool for tabular data. It combines the +clarity of a spreadsheet, the efficiency of the terminal, and the power of +Python, into a lightweight utility which can handle millions of rows.") + (home-page "https://www.visidata.org/") + (license gpl3))) diff --git a/gnu/packages/visidata.scm b/gnu/packages/visidata.scm deleted file mode 100644 index a1b16e5ca6..0000000000 --- a/gnu/packages/visidata.scm +++ /dev/null @@ -1,64 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Ryan Prior -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages visidata) - #:use-module (gnu packages check) - #:use-module (gnu packages time) - #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages xml) - #:use-module (guix build-system python) - #:use-module (guix build utils) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) - -(define-public visidata - (package - (name "visidata") - (version "2.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "visidata" version)) - (sha256 - (base32 - "19fbjr9j91pcazcz0bqx3qrasmr8xdsb13haf5lfbpyxj23f7f1j")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? (invoke "pytest")) - #t))))) - (inputs - `(("dateutil" ,python-dateutil) - ("requests" ,python-requests) - ("lxml" ,python-lxml) - ("openpyxl" ,python-openpyxl) - ("xlrd" ,python-xlrd))) - (native-inputs - `(("pytest" ,python-pytest))) - (synopsis "Terminal spreadsheet multitool for discovering and arranging data") - (description - "VisiData is an interactive multitool for tabular data. It combines the -clarity of a spreadsheet, the efficiency of the terminal, and the power of -Python, into a lightweight utility which can handle millions of rows.") - (home-page "https://www.visidata.org/") - (license license:gpl3))) From 7239ad676c746999df2e537e882123e4ce6c2cb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 22 Nov 2021 23:39:43 +0100 Subject: [PATCH 211/234] gnu: nss-pam-ldapd: Update to 0.9.12. * gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.12. [arguments]: Remove trailing #T. --- gnu/packages/openldap.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 400f10600f..1f3e775451 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016, 2021 Leo Famulari -;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Lars-Dominik Braun @@ -150,14 +150,14 @@ (define-public openldap-2.4.57 (define-public nss-pam-ldapd (package (name "nss-pam-ldapd") - (version "0.9.11") + (version "0.9.12") (source (origin (method url-fetch) (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/" "nss-pam-ldapd-" version ".tar.gz")) (sha256 (base32 - "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh")))) + "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -178,8 +178,7 @@ (define-public nss-pam-ldapd (substitute* "Makefile.in" (("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") (string-append (assoc-ref outputs "out") - "/etc/nslcd.conf.example"))) - #t))))) + "/etc/nslcd.conf.example")))))))) (inputs `(("linux-pam" ,linux-pam) ("openldap" ,openldap) From 21d390bf64ed96ad24363ae270408721eeed4f88 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 22 Nov 2021 23:21:07 +0000 Subject: [PATCH 212/234] gnu: guix-build-coordinator: Update to 0-39.c9c55c0. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-39.c9c55c0. --- 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 416090ac48..979d76b566 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "d46e9ac5936a4d3e6f6b2c00c6f35ba96259128c") - (revision "38")) + (let ((commit "c9c55c0a16c0d72ad11389baf722ce90644c45d7") + (revision "39")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "004ib2wq2d7gfpy2mbs243gll66iy524sv5n2r6g5lfns726y5hf")) + "1sxbfc3fy9x8vvhkpj68m5gz0rj6h66w8xcsqi26zx85d7jcs3h3")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments From da54ccdeb2046e7515b70f27544f7104889b9cd2 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 21 Nov 2021 17:45:26 +0000 Subject: [PATCH 213/234] gnu: oil: Update to 0.9.4. * gnu/packages/shells.scm (oil): Update to 0.9.4. Signed-off-by: Timothy Sample --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0d93a1b5cc..33290862bf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -829,14 +829,14 @@ (define-public mksh (define-public oil (package (name "oil") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "1js5i25wgvz7avsrfygxy96axanc97yvlc69arp0ja9vkcrxv5px")))) + (base32 "13wm1p22hak45j91p7kc8nxcizcykdi467wxlqbhb7s57ywcck59")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary From e469eee10e0bba18ecd365345b4b5e5c4b21d745 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Nov 2021 10:18:02 +0100 Subject: [PATCH 214/234] gnu: wireshark: Update to 3.6.0. * gnu/packages/networking.scm (wireshark): Update to 3.6.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 02041924f6..b583d2531f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1468,14 +1468,14 @@ (define-public whois (define-public wireshark (package (name "wireshark") - (version "3.4.10") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "1vvw30lkga1zwmdysxqfbqq9ffy05hg7dkv3nj6vnqmf8i5fz9wa")))) + (base32 "01nzzqig1z7ix4xb7ycs7wq3qqwq3ipdwp7rznynzmmibgyggj4w")))) (build-system cmake-build-system) (arguments `(#:phases From 47886391c52e2236d0da0bdd3fd3fc5b3582d67b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Nov 2021 10:21:41 +0100 Subject: [PATCH 215/234] gnu: emacs-fullframe: Update to 0.5.1. * gnu/packages/emacs-xyz.scm (emacs-fullframe): Update to 0.5.1. [source]: Update URI. [home-page]: Update home-page accordingly. --- gnu/packages/emacs-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4fe1633485..f4e484dec2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27387,22 +27387,22 @@ (define-public emacs-org-present (define-public emacs-fullframe (package (name "emacs-fullframe") - (version "0.5.0") + (version "0.5.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tomterl/fullframe") + (url "https://git.sr.ht/~tomterl/fullframe") (commit version))) (sha256 - (base32 - "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi")) + (base32 "1q276p3bagx9fhzyzjmz449f95k1z287x4p34980d06klj11lrab")) (file-name (git-file-name name version)))) (build-system emacs-build-system) - (home-page "https://github.com/tomterl/fullframe") + (home-page "https://git.sr.ht/~tomterl/fullframe") (synopsis "Generalized automatic execution in a single frame") - (description "This library provides helpers for single-window-per-frame -execution of buffer-exposing commands.") + (description + "This library provides helpers for single-window-per-frame execution of +buffer-exposing commands.") (license license:gpl3+))) (define-public emacs-eshell-toggle From bdf5c16ac052af2ca9d5c3acc4acbc08fd9fdbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 23 Nov 2021 09:06:49 +0100 Subject: [PATCH 216/234] maint: "make dist" builds tarballs in 'ustar' format. This allows us to have file names longer than 99 characters. * configure.ac: Pass 'tar-ustar' to 'AM_INIT_AUTOMAKE'. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 84592f6041..341cff8fbd 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_INIT([GNU Guix], [https://www.gnu.org/software/guix/]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.14 gnu silent-rules subdir-objects \ +AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules subdir-objects \ color-tests parallel-tests -Woverride -Wno-portability]) # Enable silent rules by default. From 3091ca3ee380509925174e367051c4418570332f Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 11 Nov 2021 22:45:02 -0500 Subject: [PATCH 217/234] gnu: Add python-tinydb. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (python-tinydb): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5edc4e2cce..159f89ec8b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4098,6 +4098,29 @@ (define-public freetds connecting to MS SQL and Sybase servers over TCP/IP.") (license license:lgpl2.0+))) +(define-public python-tinydb + (package + (name "python-tinydb") + (version "4.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "tinydb" version)) + (sha256 + (base32 "1x9c4s42930wwal3ds0plwb57kg5c3gj7kbpy64c29vq478b463x")))) + (build-system python-build-system) + ;; PyPi tarball does not contain tests and github repository does not + ;; have a setup.py file (only pyproject). + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-typing-extensions" ,python-typing-extensions))) + (home-page "https://github.com/msiemens/tinydb") + (synopsis "TinyDB is a lightweight document oriented database") + (description + "TinyDB is a small document oriented database written in pure Python +with no external dependencies. The targets are small apps that would +be blown away by a SQL-DB or an external database server.") + (license license:expat))) + (define-public sequeler (package (name "sequeler") From 82930f6fc04fe065777f4df8c5efb0e73106a285 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 18 Oct 2021 13:16:54 -0400 Subject: [PATCH 218/234] gnu: Add stcgal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/embedded.scm (stcgal): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/embedded.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index f388c11c3d..4315cc0618 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2020, 2021 Simon South ;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. @@ -1350,6 +1351,38 @@ (define-public fc-host-tools (home-page "https://www.freecalypso.org/") (license license:public-domain))) +(define-public stcgal + (package + (name "stcgal") + (version "1.6") + (source (origin + ;; Neither the unit tests nor the "doc" subdirectory referred to + ;; by stcgal's setup.py is present in the source distribution on + ;; PyPI, so we fetch directly from the project's git repository + ;; instead. + (method git-fetch) + (uri (git-reference + (url "https://github.com/grigorig/stcgal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pyserial" ,python-pyserial) + ("python-pyusb" ,python-pyusb) + ("python-tqdm" ,python-tqdm))) + (native-inputs + ;; For tests. + `(("python-pyyaml" ,python-pyyaml))) + (home-page "https://github.com/grigorig/stcgal") + (synopsis "Programmer for STC 8051-compatible microcontrollers") + (description "stcgal is a command-line flash-programming tool for STC +MCU's line of Intel 8051-compatible microcontrollers, including those in the +STC89, STC90, STC10, STC11, STC12, STC15 and STC8 series.") + (license license:expat))) + (define-public stlink (package (name "stlink") From 54223d262c8a9c3b10e4358dee021714e409c87b Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 18 Oct 2021 12:48:30 -0500 Subject: [PATCH 219/234] gnu: python-xcffib: Upgrade to 0.11.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required for qtile. * gnu/packages/python-xyz.scm (python-xcffib): Upgrade to 0.11.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6dd4c1a59c..abcb36e9bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7408,14 +7408,14 @@ (define-public python-pywinrm (define-public python-xcffib (package (name "python-xcffib") - (version "0.6.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (pypi-uri "xcffib" version)) (sha256 (base32 - "04k91yxyb3pgc5lvxmivh8w71yjrap2g57yk3s73x4rm4nvjq51n")))) + "0nkglsm9nbhv238iagmmsjcz6lf1yfdvp5kmspphdj385vz9r50j")))) (build-system python-build-system) (inputs `(("libxcb" ,libxcb))) @@ -7431,7 +7431,8 @@ (define-public python-xcffib (lambda* (#:key inputs #:allow-other-keys) (let ((libxcb (assoc-ref inputs "libxcb"))) (substitute* '("xcffib/__init__.py") - (("^soname = \"") (string-append "soname = \"" libxcb "/lib/"))) + (("soname = ctypes.util.find_library.*xcb.*") + (string-append "soname = \"" libxcb "/lib/libxcb.so\"\n"))) #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) From 135161ded936e206d5e5c307dc69c1a50b53f27b Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 18 Oct 2021 12:48:31 -0500 Subject: [PATCH 220/234] gnu: Add python-dbus-next. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-debus-next): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index abcb36e9bb..00204123ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8964,6 +8964,31 @@ (define-public python2-dbus (package-inputs python-dbus) equal?))))) +(define-public python-dbus-next + (package + (name "python-dbus-next") + (version "0.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/altdesktop/python-dbus-next") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ahaz52kny1p9xxv6phvk4iq56rg8li390wywlxf2yslaij1188h")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/altdesktop/python-dbus-next") + (synopsis "Zero-dependency DBus library for Python with asyncio support") + (description + "This DBus library for Python aims to be a fully-featured high-level +library primarily geared towards integration of applications into desktop and +mobile environments.") + (license license:expat))) + (define-public python-notify2 (package (name "python-notify2") From 5e21fc56edb817c1f327963c9ca9e2330efc2a39 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 18 Oct 2021 12:48:32 -0500 Subject: [PATCH 221/234] gnu: Add python-iwlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-iwlib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 00204123ea..fdbca24b6e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28062,3 +28062,23 @@ (define-public python-sgmllib3k It is used to parse text files formatted in @acronym{SGML,Standard Generalized Mark-up Language}.") (license license:bsd-3))) + +(define-public python-iwlib + (package + (name "python-iwlib") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iwlib" version)) + (sha256 + (base32 "18bd35wn7zclalpqbry42pf7bjrdggxkkw58mc0k1vkhg9czc1d8")))) + (build-system python-build-system) + (inputs + `(("wireless-tools" ,wireless-tools))) + (propagated-inputs `(("python-cffi" ,python-cffi))) + (home-page "https://github.com/nhoad/python-iwlib") + (synopsis "Python module to interface with iwlib") + (description + "This package provides a Python interface to iw wireless tools.") + (license license:gpl2))) From 571e9b293d215c5696095751dcd75e99d6fd2613 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 18 Oct 2021 12:48:33 -0500 Subject: [PATCH 222/234] gnu: Add qtile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (qtile): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3bf3c47cff..4740d26024 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -83,6 +83,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages calendar) + #:use-module (gnu packages check) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -101,6 +102,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-check) #:use-module (gnu packages lisp-xyz) @@ -116,12 +118,15 @@ (define-module (gnu packages wm) #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -543,6 +548,60 @@ (define-public python-i3-py (define-public python2-i3-py (package-with-python2 python-i3-py)) +(define-public qtile + (package + (name "qtile") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "qtile" version)) + (sha256 + (base32 "14hb26xkza7brvkd4276j60mxd3zsas72ih6y0cq3j060izm1865")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; Tests require Xvfb and writable temp/cache space + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libqtile/pangocffi.py" + (("^gobject = ffi.dlopen.*") + (string-append "gobject = ffi.dlopen(\"" + (assoc-ref inputs "glib") "/lib/libgobject-2.0.so.0\")\n")) + (("^pango = ffi.dlopen.*") + (string-append "pango = ffi.dlopen(\"" + (assoc-ref inputs "pango") "/lib/libpango-1.0.so.0\")\n")) + (("^pangocairo = ffi.dlopen.*") + (string-append "pangocairo = ffi.dlopen(\"" + (assoc-ref inputs "pango") "/lib/libpangocairo-1.0.so.0\")\n")))))))) + (inputs + `(("glib" ,glib) + ("pango" ,pango) + ("pulseaudio" ,pulseaudio))) + (propagated-inputs + `(("python-cairocffi" ,python-cairocffi) + ("python-cffi" ,python-cffi) + ("python-dateutil" ,python-dateutil) + ("python-dbus-next" ,python-dbus-next) + ("python-iwlib" ,python-iwlib) + ("python-keyring" ,python-keyring) + ("python-mpd2" ,python-mpd2) + ("python-pyxdg" ,python-pyxdg) + ("python-xcffib" ,python-xcffib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-flake8" ,python-flake8) + ("python-pep8-naming" ,python-pep8-naming) + ("python-psutil" ,python-psutil) + ("python-pytest-cov" ,python-pytest-cov) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "http://qtile.org") + (synopsis "Hackable tiling window manager written and configured in Python") + (description "Qtile is simple, small, and extensible. It's easy to write +your own layouts, widgets, and built-in commands.") + (license license:expat))) + (define-public quickswitch-i3 (let ((commit "ed692b1e8f43b95bd907ced26238ce8ccb2ed28f") (revision "1")) ; Guix package revision From b6e39292056d1d7951bdfbd520179c01551b158e Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 30 Oct 2021 23:41:27 +1100 Subject: [PATCH 223/234] gnu: libratbag: Update to 0.16. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libratbag): Update to 0.16. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 28d4432334..f1bef5ec0c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 nee ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Mohammed Sadiq -;;; Copyright © 2017, 2020 Brendan Tildesley +;;; Copyright © 2017, 2020, 2021 Brendan Tildesley ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu @@ -11705,7 +11705,7 @@ (define-public apostrophe (define-public libratbag (package (name "libratbag") - (version "0.14") + (version "0.16") (source (origin (method git-fetch) @@ -11714,7 +11714,7 @@ (define-public libratbag (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x")))) + (base32 "0jjf6xc3a37icp5dvbxla3ai9is2ns31m0llbfq1bmb6dk8cd4n0")))) (build-system meson-build-system) (arguments `(#:configure-flags From 69be242750ccef86c866fb9ac60a1a41ac4cd59b Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 30 Oct 2021 23:41:28 +1100 Subject: [PATCH 224/234] gnu: piper: Update to 0.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (piper): Update to 0.6. [inputs]: Add libratbag. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f1bef5ec0c..387d08819b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11772,7 +11772,7 @@ (define-public libratbag (define-public piper (package (name "piper") - (version "0.5.1") + (version "0.6") (source (origin (method git-fetch) @@ -11780,7 +11780,7 @@ (define-public piper (url "https://github.com/libratbag/piper") (commit version))) (sha256 - (base32 "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj")) + (base32 "02x4d4n0078slj2pl0rvgayrrxvna6y6vj8fxfamvazsh5xyfzwk")) (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs @@ -11793,6 +11793,7 @@ (define-public piper `(("adwaita-icon-theme" ,adwaita-icon-theme) ("gtk" ,gtk+) ("gtk:bin" ,gtk+ "bin") + ("libratbag" ,libratbag) ("librsvg" ,librsvg) ("python-evdev" ,python-evdev) ("python-lxml" ,python-lxml) From ec724d162892607e8c673ea76a4d6a6180a4f8fd Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sun, 21 Nov 2021 13:21:12 -0500 Subject: [PATCH 225/234] gnu: pipe-viewer: Update to 0.1.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (pipe-viewer): Update to 0.1.7. Signed-off-by: Ludovic Courtès --- 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 ff1abb308f..baf9f99749 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1073,7 +1073,7 @@ (define-public mkvtoolnix (define-public pipe-viewer (package (name "pipe-viewer") - (version "0.1.5") + (version "0.1.7") (source (origin (method git-fetch) @@ -1083,7 +1083,7 @@ (define-public pipe-viewer (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "075xc5kvnmyqqj7zijvdrvbkna931h7xf8f8z0ick7yx5fy3pn5j")))) + (base32 "1fh8b77vchpsar88dszsz5h1gzd4jz0v902igp2880vnpvacmfi9")))) (build-system perl-build-system) (arguments `(#:imported-modules From 9f00e7429df88538246652056ef9497cd2a817b5 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Fri, 19 Nov 2021 16:12:03 -0500 Subject: [PATCH 226/234] docker: Enable arm64 docker image building for 'guix pack'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/docker.scm (build-docker-image): Recognize "aarch64". Signed-off-by: Ludovic Courtès --- guix/docker.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/docker.scm b/guix/docker.scm index a6f73d423c..5e6460f43f 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -214,10 +214,11 @@ (define transformation-options (else (error "unsupported system" system))))))) - (cond* ("x86_64" "amd64") - ("i686" "386") - ("arm" "arm") - ("mips64" "mips64le"))))) + (cond* ("x86_64" "amd64") + ("i686" "386") + ("arm" "arm") + ("aarch64" "arm64") + ("mips64" "mips64le"))))) ;; Make sure we start with a fresh, empty working directory. (mkdir directory) (with-directory-excursion directory From c984076a7df5f24d0c1d1d02343a845171b111f6 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Thu, 18 Nov 2021 13:20:40 +0100 Subject: [PATCH 227/234] doc: Fix the example of "Using virt-viewer with Spice". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Running Guix in a Virtual Machine): add missing line continuation char '\'. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 59ceb4477a..8b86d55075 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35109,7 +35109,7 @@ VM@. To enable that you'll also have to pass the following flags to @command{qe @example -device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5 -chardev spicevmc,name=vdagent,id=vdagent --device virtserialport,nr=1,bus=virtio-serial0.0,chardev=vdagent, +-device virtserialport,nr=1,bus=virtio-serial0.0,chardev=vdagent,\ name=com.redhat.spice.0 @end example From 133a61ae263520378ac44482810d7adecfb017d9 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 15 Nov 2021 20:26:27 +0000 Subject: [PATCH 228/234] system: Rework swap space support, add dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/file-systems.scm (swap-space): Add it. * gnu/system.scm (operating-system)[swap-devices]: Update comment. * gnu/services/base.scm (swap-space->shepherd-service-name, swap-deprecated->shepherd-service-name, swap->shepherd-service-name): Add them. * gnu/services/base.scm (swap-service-type, swap-service): Use the new records. Signed-off-by: Ludovic Courtès --- gnu/services/base.scm | 96 +++++++++++++++++++++++++------------ gnu/system.scm | 4 +- gnu/system/file-systems.scm | 18 ++++++- 3 files changed, 84 insertions(+), 34 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 50865055fe..35f38c7e09 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -63,6 +63,8 @@ (define-module (gnu services base) #:use-module (guix records) #:use-module (guix modules) #:use-module ((guix self) #:select (make-config.scm)) + #:use-module (guix diagnostics) + #:use-module (guix i18n) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -2146,62 +2148,94 @@ (define* (udev-rules-service name rules #:key (groups '())) udev-service-type udev-extension)))))) (service type #f))) +(define (swap-space->shepherd-service-name space) + (let ((target (swap-space-target space))) + (symbol-append 'swap- + (string->symbol + (cond ((uuid? target) + (uuid->string target)) + ((file-system-label? target) + (file-system-label->string target)) + (else + target)))))) + +; TODO Remove after deprecation +(define (swap-deprecated->shepherd-service-name sdep) + (symbol-append 'swap- + (string->symbol + (cond ((uuid? sdep) + (string-take (uuid->string sdep) 6)) + ((file-system-label? sdep) + (file-system-label->string sdep)) + (else + sdep))))) + +(define swap->shepherd-service-name + (match-lambda ((? swap-space? space) + (swap-space->shepherd-service-name space)) + (sdep + (swap-deprecated->shepherd-service-name sdep)))) + (define swap-service-type (shepherd-service-type 'swap - (lambda (device) - (define requirement - (if (and (string? device) - (string-prefix? "/dev/mapper/" device)) - (list (symbol-append 'device-mapping- - (string->symbol (basename device)))) - '())) + (lambda (swap) + (define requirements + (cond ((swap-space? swap) + (map dependency->shepherd-service-name + (swap-space-dependencies swap))) + ; TODO Remove after deprecation + ((and (string? swap) (string-prefix? "/dev/mapper/" swap)) + (list (symbol-append 'device-mapping- + (string->symbol (basename swap))))) + (else + '()))) - (define (device-lookup device) + (define device-lookup ;; The generic 'find-partition' procedures could return a partition ;; that's not swap space, but that's unlikely. - (cond ((uuid? device) - #~(find-partition-by-uuid #$(uuid-bytevector device))) - ((file-system-label? device) + (cond ((swap-space? swap) + (let ((target (swap-space-target swap))) + (cond ((uuid? target) + #~(find-partition-by-uuid #$(uuid-bytevector target))) + ((file-system-label? target) + #~(find-partition-by-label + #$(file-system-label->string target))) + (else + target)))) + ; TODO Remove after deprecation + ((uuid? swap) + #~(find-partition-by-uuid #$(uuid-bytevector swap))) + ((file-system-label? swap) #~(find-partition-by-label - #$(file-system-label->string device))) + #$(file-system-label->string swap))) (else - device))) - - (define service-name - (symbol-append 'swap- - (string->symbol - (cond ((uuid? device) - (string-take (uuid->string device) 6)) - ((file-system-label? device) - (file-system-label->string device)) - (else - device))))) + swap))) (with-imported-modules (source-module-closure '((gnu build file-systems))) (shepherd-service - (provision (list service-name)) - (requirement `(udev ,@requirement)) - (documentation "Enable the given swap device.") + (provision (list (swap->shepherd-service-name swap))) + (requirement `(udev ,@requirements)) + (documentation "Enable the given swap space.") (modules `((gnu build file-systems) ,@%default-modules)) (start #~(lambda () - (let ((device #$(device-lookup device))) + (let ((device #$device-lookup)) (and device (begin (restart-on-EINTR (swapon device)) #t))))) (stop #~(lambda _ - (let ((device #$(device-lookup device))) + (let ((device #$device-lookup)) (when device (restart-on-EINTR (swapoff device))) #f))) (respawn? #f)))) (description "Turn on the virtual memory swap area."))) -(define (swap-service device) - "Return a service that uses @var{device} as a swap device." - (service swap-service-type device)) +(define (swap-service swap) + "Return a service that uses @var{swap} as a swap space." + (service swap-service-type swap)) (define %default-gpm-options ;; Default options for GPM. diff --git a/gnu/system.scm b/gnu/system.scm index 73e6b58f2a..3281c0e79b 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -233,8 +233,8 @@ (define-record-type* operating-system (mapped-devices operating-system-mapped-devices ; list of (default '())) (file-systems operating-system-file-systems) ; list of fs - (swap-devices operating-system-swap-devices ; list of strings - (default '())) + (swap-devices operating-system-swap-devices ; list of string | + (default '()) (users operating-system-users ; list of user accounts (default %base-user-accounts)) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index c6c1b96d16..027df7e966 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -97,7 +97,12 @@ (define-module (gnu system file-systems) %store-mapping %network-configuration-files - %network-file-mappings)) + %network-file-mappings + + swap-space + swap-space? + swap-space-target + swap-space-dependencies)) ;;; Commentary: ;;; @@ -712,4 +717,15 @@ (define (prepend-slash/maybe s) (G_ "Use the @code{subvol} Btrfs file system option.")))))))) +;;; +;;; Swap space +;;; + +(define-record-type* swap-space make-swap-space + swap-space? + this-swap-space + (target swap-space-target) + (dependencies swap-space-dependencies + (default '()))) + ;;; file-systems.scm ends here From f574dbd163f8b2d417c6d7ee08559626ae52b7c5 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 15 Nov 2021 20:26:28 +0000 Subject: [PATCH 229/234] system: Warn about swap-devices format change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system.scm (warn-swap-devices-change, %warn-swap-devices-change): Add them. * gnu/system.scm (operating-system) [swap-devices]: Use it. Signed-off-by: Ludovic Courtès --- gnu/system.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/system.scm b/gnu/system.scm index 3281c0e79b..2e5a5ff7c8 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -235,6 +235,8 @@ (define-record-type* operating-system (file-systems operating-system-file-systems) ; list of fs (swap-devices operating-system-swap-devices ; list of string | (default '()) + (delayed) + (sanitize warn-swap-devices-change)) (users operating-system-users ; list of user accounts (default %base-user-accounts)) @@ -583,6 +585,20 @@ (define (device-mapping-services os) (map device-mapping-service (operating-system-user-mapped-devices os))) +(define-syntax-rule (warn-swap-devices-change value) + (%warn-swap-devices-change value (current-source-location))) + +(define (%warn-swap-devices-change value location) + (map (lambda (x) + (unless (swap-space? x) + (warning + (source-properties->location + location) + (G_ "List elements of the field 'swap-devices' should \ +now use the record, as the old method is deprecated. \ +See \"(guix) operating-system Reference\" for more details.~%"))) + x) value)) + (define (swap-services os) "Return the list of swap services for OS." (map swap-service (operating-system-swap-devices os))) From 0831dfab75b4db9c8bcbc9b2d1e52d8db54d0ad9 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 15 Nov 2021 20:26:29 +0000 Subject: [PATCH 230/234] system: Add swap flags. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/file-systems.scm (swap-space)[priority, discard?]: Add them. * guix/build/syscalls.scm (SWAP_FLAG_PREFER, SWAP_FLAG_PRIO_MASK, SWAP_FLAG_PRIO_SHIFT, SWAP_FLAG_DISCARD): Add them. * gnu/build/file-systems.scm (swap-space->flags-bit-mask): Add it. * gnu/services/base.scm (swap-service-type): Use it. Signed-off-by: Ludovic Courtès --- gnu/build/file-systems.scm | 36 +++++++++++++++++++++++++++++++++++- gnu/services/base.scm | 7 +++++-- gnu/system/file-systems.scm | 10 ++++++++-- guix/build/syscalls.scm | 12 ++++++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index d8a5ddf1e5..d95340df83 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -29,6 +29,8 @@ (define-module (gnu build file-systems) #:use-module (guix build bournish) #:use-module ((guix build syscalls) #:hide (file-system-type)) + #:use-module (guix diagnostics) + #:use-module (guix i18n) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) @@ -54,7 +56,9 @@ (define-module (gnu build file-systems) mount-flags->bit-mask check-file-system - mount-file-system)) + mount-file-system + + swap-space->flags-bit-mask)) ;;; Commentary: ;;; @@ -227,6 +231,36 @@ (define (linux-swap-superblock-volume-name sblock) "Return the label of Linux-swap superblock SBLOCK as a string." (null-terminated-latin1->string (sub-bytevector sblock (+ 1024 4 4 4 16) 16))) + +(define (swap-space->flags-bit-mask swap) + "Return the number suitable for the 'flags' argument of 'mount' +that corresponds to the swap-space SWAP." + (define prio-flag + (let ((p (swap-space-priority swap)) + (max (ash SWAP_FLAG_PRIO_MASK (- SWAP_FLAG_PRIO_SHIFT)))) + (if p + (logior SWAP_FLAG_PREFER + (ash (cond + ((< p 0) + (begin (warning + (G_ "Given swap priority ~a is +negative, defaulting to 0.~%") p) + 0)) + ((> p max) + (begin (warning + (G_ "Limiting swap priority ~a to +~a.~%") + p max) + max)) + (else p)) + SWAP_FLAG_PRIO_SHIFT)) + 0))) + (define delayed-flag + (if (swap-space-discard? swap) + SWAP_FLAG_DISCARD + 0)) + (logior prio-flag delayed-flag)) + ;;; diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 35f38c7e09..20736eb13f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -58,7 +58,8 @@ (define-module (gnu services base) #:use-module (gnu packages linux) #:use-module (gnu packages terminals) #:use-module ((gnu build file-systems) - #:select (mount-flags->bit-mask)) + #:select (mount-flags->bit-mask + swap-space->flags-bit-mask)) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) @@ -2223,7 +2224,9 @@ (define device-lookup (let ((device #$device-lookup)) (and device (begin - (restart-on-EINTR (swapon device)) + (restart-on-EINTR (swapon device + #$(swap-space->flags-bit-mask + swap))) #t))))) (stop #~(lambda _ (let ((device #$device-lookup)) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 027df7e966..e1d1fb72cc 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -102,7 +102,9 @@ (define-module (gnu system file-systems) swap-space swap-space? swap-space-target - swap-space-dependencies)) + swap-space-dependencies + swap-space-priority + swap-space-discard?)) ;;; Commentary: ;;; @@ -726,6 +728,10 @@ (define-record-type* swap-space make-swap-space this-swap-space (target swap-space-target) (dependencies swap-space-dependencies - (default '()))) + (default '())) + (priority swap-space-priority + (default #f)) + (discard? swap-space-discard? + (default #f))) ;;; file-systems.scm ends here diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index b305133c37..63bd017d1d 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -71,6 +71,11 @@ (define-module (guix build syscalls) mounts mount-points + SWAP_FLAG_PREFER + SWAP_FLAG_PRIO_MASK + SWAP_FLAG_PRIO_SHIFT + SWAP_FLAG_DISCARD + swapon swapoff @@ -685,6 +690,13 @@ (define (mount-points) "Return the mounts points for currently mounted file systems." (map mount-point (mounts))) +;; Pulled from glibc's sysdeps/unix/sysv/linux/sys/swap.h + +(define SWAP_FLAG_PREFER #x8000) ;; Set if swap priority is specified. +(define SWAP_FLAG_PRIO_MASK #x7fff) +(define SWAP_FLAG_PRIO_SHIFT 0) +(define SWAP_FLAG_DISCARD #x10000) ;; Discard swap cluster after use. + (define swapon (let ((proc (syscall->procedure int "swapon" (list '* int)))) (lambda* (device #:optional (flags 0)) From 4af3262d9857405aff0a4a855403247f0f485e15 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 15 Nov 2021 20:26:30 +0000 Subject: [PATCH 231/234] system: Filter out boot dependencies from swap-space. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/systems.scm (swap-services): Filter them. Signed-off-by: Ludovic Courtès --- gnu/system.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 2e5a5ff7c8..9de0f79b44 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -601,7 +601,25 @@ (define (%warn-swap-devices-change value location) (define (swap-services os) "Return the list of swap services for OS." - (map swap-service (operating-system-swap-devices os))) + (define early-userspace-file-systems + (filter file-system-needed-for-boot? + (operating-system-file-systems os))) + + (define early-userspace-mapped-devices + (operating-system-boot-mapped-devices os)) + + (define (filter-deps swap) + (if (swap-space? swap) + (swap-space + (inherit swap) + (dependencies (remove (lambda (dep) + (or (member dep early-userspace-mapped-devices) + (member dep early-userspace-file-systems))) + (swap-space-dependencies swap)))) + swap)) + + (map (compose swap-service filter-deps) + (operating-system-swap-devices os))) (define* (system-linux-image-file-name #:optional (target (or (%current-target-system) From 9685c0637decec77880cec65547a2e57c300761a Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 15 Nov 2021 20:26:31 +0000 Subject: [PATCH 232/234] doc: Add new Swap Space section. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (operating-system Reference): Update swap-devices. * doc/guix.texi (Swap Space): Add it. * gnu/system/examples/desktop.tmpl: Add swap-devices example. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 147 +++++++++++++++++++++++-------- gnu/system/examples/desktop.tmpl | 7 +- 2 files changed, 116 insertions(+), 38 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8b86d55075..2a166e3a89 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -319,6 +319,7 @@ System Configuration * operating-system Reference:: Detail of operating-system declarations. * File Systems:: Configuring file system mounts. * Mapped Devices:: Block device extra processing. +* Swap Space:: Backing RAM with disk space. * User Accounts:: Specifying user accounts. * Keyboard Layout:: How the system interprets key strokes. * Locales:: Language and cultural convention settings. @@ -2515,10 +2516,9 @@ system relative to this path. If you have opted for @file{/boot/efi} as an EFI mount point for example, mount it at @file{/mnt/boot/efi} now so it is found by @code{guix system init} afterwards. -Finally, if you plan to use one or more swap partitions (@pxref{Memory -Concepts, swap space,, libc, The GNU C Library Reference Manual}), make -sure to initialize them with @command{mkswap}. Assuming you have one -swap partition on @file{/dev/sda3}, you would run: +Finally, if you plan to use one or more swap partitions (@pxref{Swap +Space}), make sure to initialize them with @command{mkswap}. Assuming +you have one swap partition on @file{/dev/sda3}, you would run: @example mkswap /dev/sda3 @@ -13987,6 +13987,7 @@ instance to support new system services. * operating-system Reference:: Detail of operating-system declarations. * File Systems:: Configuring file system mounts. * Mapped Devices:: Block device extra processing. +* Swap Space:: Backing RAM with disk space. * User Accounts:: Specifying user accounts. * Keyboard Layout:: How the system interprets key strokes. * Locales:: Language and cultural convention settings. @@ -14155,7 +14156,7 @@ configuration, but with a few modifications. @cindex encrypted disk The configuration for a typical ``desktop'' usage, with an encrypted -root partition, the X11 display +root partition, a swap file on the root partition, the X11 display server, GNOME and Xfce (users can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power management, and more, would look like this: @@ -14353,38 +14354,9 @@ A list of mapped devices. @xref{Mapped Devices}. @item @code{file-systems} A list of file systems. @xref{File Systems}. -@cindex swap devices -@cindex swap space @item @code{swap-devices} (default: @code{'()}) -A list of UUIDs, file system labels, or strings identifying devices or -files to be used for ``swap -space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference -Manual}). Here are some examples: - -@table @code -@item (list (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")) -Use the swap partition with the given UUID@. You can learn the UUID of a -Linux swap partition by running @command{swaplabel @var{device}}, where -@var{device} is the @file{/dev} file name of that partition. - -@item (list (file-system-label "swap")) -Use the partition with label @code{swap}. Again, the -@command{swaplabel} command allows you to view and change the label of a -Linux swap partition. - -@item (list "/swapfile") -Use the file @file{/swapfile} as swap space. - -@item (list "/dev/sda3" "/dev/sdb2") -Use the @file{/dev/sda3} and @file{/dev/sdb2} partitions as swap space. -We recommend referring to swap devices by UUIDs or labels as shown above -instead. -@end table - -It is possible to specify a swap file in a file system on a mapped -device (under @file{/dev/mapper}), provided that the necessary device -mapping and file system are also specified. @xref{Mapped Devices} and -@ref{File Systems}. +@cindex swap devices +A list of swap spaces. @xref{Swap Space}. @item @code{users} (default: @code{%base-user-accounts}) @itemx @code{groups} (default: @code{%base-groups}) @@ -14974,7 +14946,8 @@ It is also desirable to encrypt swap space, since swap space may contain sensitive data. One way to accomplish that is to use a swap file in a file system on a device mapped via LUKS encryption. In this way, the swap file is encrypted because the entire device is encrypted. -@xref{Preparing for Installation,,Disk Partitioning}, for an example. +@xref{Swap Space}, or @xref{Preparing for Installation,,Disk +Partitioning}, for an example. A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows: @@ -15006,6 +14979,106 @@ Devices @file{/dev/mapper/vg0-alpha} and @file{/dev/mapper/vg0-beta} can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}). +@node Swap Space +@section Swap Space +@cindex swap space + +Swap space, as it is commonly called, is a disk area specifically +designated for paging: the process in charge of memory management +(the Linux kernel or Hurd's default pager) can decide that some memory +pages stored in RAM which belong to a running program but are unused +should be stored on disk instead. It unloads those from the RAM, +freeing up precious fast memory, and writes them to the swap space. If +the program tries to access that very page, the memory management +process loads it back into memory for the program to use. + +A common misconception about swap is that it is only useful when small +amounts of RAM are available to the system. However, it should be noted +that kernels often use all available RAM for disk access caching to make +I/O faster, and thus paging out unused portions of program memory will +expand the RAM available for such caching. + +For a more detailed description of how memory is managed from the +viewpoint of a monolithic kernel, @xref{Memory +Concepts,,, libc, The GNU C Library Reference Manual}. + +The Linux kernel has support for swap partitions and swap files: the +former uses a whole disk partition for paging, whereas the second uses a +file on a file system for that (the file system driver needs to support +it). On a comparable setup, both have the same performance, so one +should consider ease of use when deciding between them. Partitions are +``simpler'' and do not need file system support, but need to be +allocated at disk formatting time (logical volumes notwithstanding), +whereas files can be allocated and deallocated at any time. + +Note that swap space is not zeroed on shutdown, so sensitive data (such +as passwords) may linger on it if it was paged out. As such, you should +consider having your swap reside on an encrypted device (@pxref{Mapped +Devices}). + +@deftp {Data Type} swap-space +Objects of this type represent swap spaces. They contain the following +members: + +@table @asis +@item @code{target} +The device or file to use, either a UUID, a @code{file-system-label} or +a string, as in the definition of a @code{file-system} (@pxref{File +Systems}). + +@item @code{dependencies} (default: @code{'()}) +A list of @code{file-system} or @code{mapped-device} objects, upon which +the availability of the space depends. Note that just like for +@code{file-system} objects, dependencies which are needed for boot and +mounted in early userspace are not managed by the Shepherd, and so +automatically filtered out for you. + +@item @code{priority} (default: @code{#f}) +Only supported by the Linux kernel. Either @code{#f} to disable swap +priority, or an integer between 0 and 32767. The kernel will first use +swap spaces of higher priority when paging, and use same priority spaces +on a round-robin basis. The kernel will use swap spaces without a set +priority after prioritized spaces, and in the order that they appeared in +(not round-robin). + +@item @code{discard?} (default: @code{#f}) +Only supported by the Linux kernel. When true, the kernel will notify +the disk controller of discarded pages, for example with the TRIM +operation on Solid State Drives. + +@end table +@end deftp + +Here are some examples: + +@lisp +(swap-space (target (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb"))) +@end lisp + +Use the swap partition with the given UUID@. You can learn the UUID of a +Linux swap partition by running @command{swaplabel @var{device}}, where +@var{device} is the @file{/dev} file name of that partition. + +@lisp +(swap-space + (target (file-system-label "swap")) + (dependencies (list lvm-device))) +@end lisp + +Use the partition with label @code{swap}, which can be found after the +@var{lvm-device} mapped device has been opened. Again, the +@command{swaplabel} command allows you to view and change the label of a +Linux swap partition. + +@lisp +(swap-space + (target "/btrfs/swapfile") + (dependencies (list btrfs-fs))) +@end lisp + +Use the file @file{/btrfs/swapfile} as swap space, which is present on the +@var{btrfs-fs} filesystem. + @node User Accounts @section User Accounts diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index c928008c92..6df53844b1 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -1,6 +1,6 @@ ;; This is an operating system configuration template ;; for a "desktop" setup with GNOME and Xfce where the -;; root partition is encrypted with LUKS. +;; root partition is encrypted with LUKS, and a swap file. (use-modules (gnu) (gnu system nss)) (use-service-modules desktop xorg) @@ -42,6 +42,11 @@ (type "vfat"))) %base-file-systems)) + ;; Specify a swap file for the system, which resides on the + ;; root file system. + (swap-devices (list (swap-space + (target "/swapfile")))) + ;; Create user `bob' with `alice' as its initial password. (users (cons (user-account (name "bob") From 0632ea98b362e8a6551435c72a78a28cac92049f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 23 Nov 2021 10:16:36 +0100 Subject: [PATCH 233/234] guix graph: Show '-M' in '--help' output. * guix/scripts/graph.scm (show-help): Add -M shorthand. --- guix/scripts/graph.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 439fae0b52..8943e87099 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -542,7 +542,7 @@ (define (show-help) (display (G_ " --list-types list the available graph types")) (display (G_ " - --max-depth=DEPTH limit to nodes within distance DEPTH")) + -M, --max-depth=DEPTH limit to nodes within distance DEPTH")) (display (G_ " --path display the shortest path between the given nodes")) (display (G_ " From daf7b5ecef8de0e536ffd8d2957f022d010767a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 23 Nov 2021 10:17:55 +0100 Subject: [PATCH 234/234] Update NEWS. --- NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index ab21645a19..a24256a7bb 100644 --- a/NEWS +++ b/NEWS @@ -14,15 +14,22 @@ Please send Guix bug reports to bug-guix@gnu.org. * Changes in 1.4.0 (since 1.3.0) ** Package management +*** New ‘guix home’ command, for home environment management +*** New ‘guix shell’ command, the successor to ‘guix environment’ *** New ‘deb’ format for the ‘guix pack’ command *** New ‘guix import minetest’ command, to import Minetest extensions +*** ‘guix import texlive’ rewritten to use the TLPDB as its source *** ‘guix import elpa’ now supports the non-GNU ELPA repository +*** ‘guix import pypi’ can now import a specific version +*** ‘guix import cran’ can now import a specific version *** New updater (see ‘guix refresh’): ‘generic-git’ +*** ‘guix graph’ has a new ‘--max-depth’ option *** ‘--with-commit’ option now accepts strings returned by ‘git describe’ ** Distribution *** The installation script can now enable local substitute servers discovery *** More control over boot-time file system checks and repairs *** XFS file systems can be created by the installer and mounted by label/UUID +*** New interface for declaring swap space ** Programming interfaces *** (guix records) now supports “field sanitizers” ** Noteworthy bug fixes @@ -32,6 +39,10 @@ Please send Guix bug reports to bug-guix@gnu.org. () *** Fix pathological profile building performance in the presence of grafts () +*** Deduplication phase of the garbage collector is now faster + () +*** File system flags are validated before system instantiation + () * Changes in 1.3.0 (since 1.2.0) ** Package management