From f62f3a7352d884475d62f53c1bc1448e87af9d6d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 30 Jan 2023 11:54:48 +0100 Subject: gnu: sbcl-nhooks: Update to 1.2.0. * gnu/packages/lisp-xyz.scm (sbcl-nhooks): Update to 1.2.0. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2ac2b8a465..3551da7bb6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23674,7 +23674,7 @@ JavaScript code.") (define-public sbcl-nhooks (package (name "sbcl-nhooks") - (version "1.1.1") + (version "1.2.0") (source (origin (method git-fetch) @@ -23684,7 +23684,7 @@ JavaScript code.") (file-name (git-file-name "nhooks" version)) (sha256 (base32 - "1379q1wbh38xlkwlpf0xy9wgbbc869zznak3l4yzwfgiw6l2hxa1")))) + "1cpd9ydxkrl4vxn2clfwljl4q5hdybxkc96qshq7dczq2jvg1nfs")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-serapeum)) -- cgit 1.4.1 From 0ec8c973446cbe0e263da2f5ddfabb048da9290e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Jan 2023 20:51:43 -0500 Subject: gnu: rpm: Add a debug output. * gnu/packages/package-management.scm (rpm) [outputs]: New field. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6ae6f58b6b..85c1c3a9fa 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -839,6 +839,7 @@ features of Stow with some extensions.") (sha256 (base32 "0m250plyananjn0790xmwy6kixmxcdj5iyy2ybnk1aw7f4nia5ra")))) + (outputs '("out" "debug")) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-python") -- cgit 1.4.1 From de2729bd962616c86c4a3c1c29a1eb9cfd7ab199 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Jan 2023 20:52:05 -0500 Subject: gnu: rpm: Set localstatedir to /var. * gnu/packages/package-management.scm (rpm) [configure-flags]: Add --localstatedir=/var. [phases] {patch-build-system}: New phase. --- gnu/packages/package-management.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 85c1c3a9fa..820c9bb468 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -842,13 +842,22 @@ features of Stow with some extensions.") (outputs '("out" "debug")) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-python") + '(#:configure-flags '("--enable-python" + ;; The RPM database must be writable. + "--localstatedir=/var") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-lua-check (lambda _ (substitute* "configure" (("lua >= ?.?") - "lua-5.3 >= 5.3"))))))) + "lua-5.3 >= 5.3")))) + (add-after 'unpack 'patch-build-system + (lambda _ + ;; The build system attempts to create /var in the build + ;; chroot, and fails. + (substitute* "Makefile.in" + ((".*MKDIR_P) \\$\\(DESTDIR)\\$\\(localstatedir.*") + ""))))))) (native-inputs (list pkg-config python)) -- cgit 1.4.1 From 09e1962b448df6f553e9897c644d80ff45b73067 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Mon, 30 Jan 2023 17:09:05 +0000 Subject: gnu: mpv: Update to 0.35.1. * gnu/packages/video.scm (mpv): Update to 0.35.1. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 60d39c38dc..adec7d9269 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2181,7 +2181,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.35.0") + (version "0.35.1") (source (origin (method git-fetch) (uri (git-reference @@ -2189,7 +2189,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jnk1arwhf82s6q90jp70izk1wy0bkx3lr3il2jgbqsp355l6wsk")))) + (base32 "1lzaijqddr4ir9nb27cv9ki20b0k5jns2k47v4xvmi30v1gi71ha")))) (build-system waf-build-system) (arguments (list -- cgit 1.4.1 From 3aca271587684c7ce8118af71acd0d5340dbd2ac Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 30 Jan 2023 15:13:20 -0500 Subject: gnu: guile-goblins: Update to 0.10. * gnu/packages/guile-xyz.scm (guile-goblins): Update to 0.1.0. --- gnu/packages/guile-xyz.scm | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0befff1576..31ee576d32 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5493,44 +5493,37 @@ This module implements this interface by use of Guile's dynamic FFI.") (define-public guile-goblins (package (name "guile-goblins") - (version "0.8") + (version "0.10") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/spritely/guile-goblins/") - (commit (string-append "v" version)))) - (file-name (string-append name "-" version)) + (method url-fetch) + (uri (string-append "https://spritely.institute/files/releases" + "/guile-goblins/guile-goblins-" + version ".tar.gz")) (sha256 (base32 - "1mmyykh79jwhrfgnhhw94aw7a8m6qw249kj7k60ynj16mcfm5iyy")))) + "02riz8rqva3anhwp19xcp27w05g1ryhzs69n9h4sna95a1yfr7h1")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list "GUILE_AUTO_COMPILE=0"))) (native-inputs - (list autoconf automake pkg-config texinfo)) + (list pkg-config texinfo)) (inputs (list guile-3.0)) (propagated-inputs (list guile-fibers guile-gcrypt)) (home-page "https://spritely.institute/goblins") (synopsis "Distributed programming environment for Guile") - ;; In guile-goblins 0.9, OCapN support will be added (it already - ;; exists in racket-goblins). At that point we should add the - ;; following to this description: - ;; - ;; Goblins allows for cooperation between networked programs - ;; in a mutually suspicious network through OCapN, the Object - ;; Capability Network. This includes collaboration across - ;; runtimes; for instance, programs written in the Guile and Racket - ;; versions of Goblins are able to speak to each other. (description "@code{guile-goblins} is the Guile version of -@url{https://spritely.institute/goblins, Spritely Goblins}, -a transactional, distributed programming environment following object -capability security designs. Goblins is a general toolkit, and also -the core layer of Spritely's work to support healthy distributed -networked communities.") +@url{https://spritely.institute/goblins, Spritely Goblins}, a transactional, +distributed programming environment following object capability security +designs. Goblins is a general toolkit, and also the core layer of Spritely's +work to support healthy distributed networked communities. Goblins allows for +cooperation between networked programs in a mutually suspicious network +through OCapN, the Object Capability Network. This includes collaboration +across runtimes; for instance, programs written in the Guile and Racket +versions of Goblins are able to speak to each other.") (license license:asl2.0))) ;;; -- cgit 1.4.1 From 17448c8afa507bf26509cbd0a35836f910d0bf3b Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 30 Jan 2023 15:50:14 -0500 Subject: gnu: guile-goblins: Update source hash. * gnu/packages/guile-xyz.scm (guile-goblins): Update source hash. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 31ee576d32..3eb8d7aeb6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5502,7 +5502,7 @@ This module implements this interface by use of Guile's dynamic FFI.") version ".tar.gz")) (sha256 (base32 - "02riz8rqva3anhwp19xcp27w05g1ryhzs69n9h4sna95a1yfr7h1")))) + "13nzmwi4m0j27rmn2ks0p3k620npnhx736q25n8llj2ivkn2vxd2")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 29ee56d1fa6d43da31d44f66200a2760b46a46d1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Jan 2023 11:10:25 +0100 Subject: gnu: texinfo: Make 'perl-archive-zip' available to 'texi2any'. This makes "texi2any --epub3" work out of the box. Reported by BitPuffin on #guile. * gnu/packages/texinfo.scm (texinfo-7)[inputs, arguments]: New fields. --- gnu/packages/texinfo.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ec953f57b5..77fc3baaf7 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019, 2022 Ludovic Courtès +;;; Copyright © 2012-2013, 2015-2017, 2019, 2022-2023 Ludovic Courtès ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017, 2019, 2022 Efraim Flashner @@ -43,6 +43,7 @@ #:use-module ((gnu packages hurd) #:select (hurd-target?)) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-compression) #:use-module (gnu packages readline)) (define-public texinfo @@ -110,7 +111,27 @@ is on expressing the content semantically, avoiding physical markup commands.") version ".tar.xz")) (sha256 (base32 - "1balvbkdlwa8zwnzp4irkixq1zhps2wr6njmwj4ilgiqc4rfq4gj")))))) + "1balvbkdlwa8zwnzp4irkixq1zhps2wr6njmwj4ilgiqc4rfq4gj")))) + (inputs (modify-inputs (package-inputs texinfo) + (append perl-archive-zip))) ;needed for 'tex2any --epub3' + (arguments + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (program (string-append bin "/texi2any")) + (zip (car (find-files + (assoc-ref inputs "perl-archive-zip") + (lambda (file stat) + (and (eq? 'directory (stat:type stat)) + (string=? (basename file) + "Archive"))) + #:directories? #t)))) + (wrap-program program + `("PERL5LIB" prefix (,(dirname zip))))))))))))) (define-public texinfo-5 (package (inherit texinfo) -- cgit 1.4.1 From d1e0a0528a8dbe8fb01c6c9ac02663388d17cbc0 Mon Sep 17 00:00:00 2001 From: Trev Date: Sun, 1 Jan 2023 23:38:56 -0800 Subject: gnu: Add font-carlito. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-carlito): New procedure. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0a9959d3d5..634c48db00 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -286,6 +286,30 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over 50 Cyrillic-based languages as well as Greek and IPA phonetics.") (license license:silofl1.1))) +(define-public font-carlito + (let ((commit "64cab86c9b602088697294736b86f2831f3f44be") + (revision "0")) + (package + (name "font-carlito") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/carlito") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02wy8vs5m4whm5apl3p6cpz0qa9jwjj9qi219zjspiszha2ivssz")))) + (build-system font-build-system) + (home-page "https://github.com/googlefonts/carlito") + (synopsis "Free alternative to Calibri") + (description + "Carlito is a font designed by Łukasz Dziedzic derived from +Lato (also designed by Łukasz Dziedzic) that is metric-compatible with +Calibri.") + (license license:silofl1.1)))) + (define-public font-gfs-ambrosia ;; Based on ;; https://src.fedoraproject.org/rpms/gfs-ambrosia-fonts -- cgit 1.4.1 From d7552c36ce79dcef8ebc3f7ac97d23e9be9e9859 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 2 Jan 2023 19:39:05 -0600 Subject: gnu: Add python-haversine. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (python-haversine): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/geo.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 432903acc9..6402e56a0f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2826,6 +2826,36 @@ coordinates of addresses, cities, countries, and landmarks across the globe using third-party geocoders and other data sources.") (license license:expat))) +(define-public python-haversine + (package + (name "python-haversine") + (version "2.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + ;; There are no tests in the PyPi archive. + (url "https://github.com/mapado/haversine") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0inxyj5n4jzgg5xiadqx9sk83gdx5ff989l9s04smdzbd3b8c0c8")))) + (build-system python-build-system) + (native-inputs (list python-pytest python-numpy)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (home-page "https://github.com/mapado/haversine") + (synopsis "Calculate the distance between 2 points on Earth") + (description "This package provides functions to calculate the +distance in various units between two points on Earth using their +latitude and longitude.") + (license license:expat))) + (define-public gplates (package (name "gplates") -- cgit 1.4.1 From 124ca1e500d65b57c802ee06423c1581a197ee1f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 3 Jan 2023 15:21:40 +0800 Subject: gnu: Add go-github-com-google-gopacket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-google-gopacket): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 70ddef52f1..ed482502a8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7043,6 +7043,28 @@ are semantically equal in Go (for writing tests).") 4122 and DCE 1.1: Authentication and Security Services.") (license license:bsd-3))) +(define-public go-github-com-google-gopacket + (package + (name "go-github-com-google-gopacket") + (version "1.1.19") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gopacket") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "048qwm2n0wrpql4qqgd7jyynn3gk069yvqbxnshlayzmbhf87ls4")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/gopacket")) + (home-page "https://github.com/google/gopacket") + (synopsis "Packet processing capabilities library") + (description + "This package provides packet processing capabilities for Go.") + (license license:bsd-3))) + (define-public go-github-com-google-goterm (let ((commit "fc88cf888a3fa99ecc23d1efc1a44284268457d3") (revision "1")) -- cgit 1.4.1 From 7f501b9835ef7169bf43670db1d2d7f26dcbcc58 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 3 Jan 2023 15:22:03 +0800 Subject: gnu: Add go-github-com-macronut-go-tproxy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-github-com-macronut-go-tproxy): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ed482502a8..4c79f3dec2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7357,6 +7357,29 @@ This package is a successor to @code{go-github-com-golang-protobuf} with an improved and cleaner API.") (license license:bsd-3))) +(define-public go-github-com-macronut-go-tproxy + (package + (name "go-github-com-macronut-go-tproxy") + (version "0.0.0-20190726054950-ef7efd7f24ed") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FutureProtocolLab/go-tproxy") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jibsg0xhsn0h1jq4g9qd4nr58w43y8majlwfri9ffk2cbfrwqdr")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/macronut/go-tproxy")) + (home-page "https://github.com/FutureProtocolLab/go-tproxy") + (synopsis "Linux Transparent Proxy library") + (description + "Golang TProxy provides an easy to use wrapper for the Linux Transparent +Proxy functionality.") + (license license:expat))) + (define-public go-github-com-mattn-go-zglob (package (name "go-github-com-mattn-go-zglob") -- cgit 1.4.1 From be2f5da810b7cc015ac690dd437aa2cfb03f1770 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 3 Jan 2023 15:22:22 +0800 Subject: gnu: Add phantomsocks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (phantomsocks): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a7b51ed1ff..45dfee34b3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4478,6 +4478,45 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send (home-page "https://github.com/netdiscover-scanner/netdiscover") (license license:gpl3+))) +(define-public phantomsocks + (package + (name "phantomsocks") + (version "0.0.0-20221222155609-14291e2c889e") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/macronut/phantomsocks") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13lllmh46xwns5ksqqdkl2p7vvnbzkzb6va005nk37bx6c4x2ixp")))) + (build-system go-build-system) + (arguments + (list #:install-source? #f + #:import-path "github.com/macronut/phantomsocks" + #:build-flags #~'("-tags" #$(if (target-linux?) + "rawsocket" + "pcap")))) + (propagated-inputs + (list go-github-com-google-gopacket + go-github-com-macronut-go-tproxy)) + (inputs + (if (target-linux?) + '() + (list libpcap))) + (home-page "https://github.com/macronut/phantomsocks") + (synopsis "Internet censorship circumvention tool") + (description + "Phantomsocks is an Internet censorship circumvention tool based on the +desync technique, which was introduced in the 2017 paper +@url{https://doi.org/10.1145/3131365.3131374, @cite{Your State is Not Mine: A +Closer Look at Evading Stateful Internet Censorship}}. + +Further information on the usage could be found on the Wikibooks page +@url{https://zh.wikibooks.org/wiki/Phantomsocks, @cite{Phantomsocks}}.") + (license license:lgpl3+))) + (define-public putty (package (name "putty") -- cgit 1.4.1 From e6f557dd23fbb298afa92dba3133ed985e560699 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Jan 2023 23:49:06 +0100 Subject: gnu: guile-ssh: Update to 0.16.3. Fixes . Reported by Aleksandr Vityazev , and Andrew Tropin . * gnu/packages/ssh.scm (guile-ssh): Update to 0.16.3. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2f6874f811..35b3b378a9 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -318,7 +318,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.16.2") + (version "0.16.3") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -328,7 +328,7 @@ Additionally, various channel-specific options can be negotiated.") (file-name (git-file-name name version)) (sha256 (base32 - "1rp5y1xjmsxplrzl0yf23g6rdjsw7ryh5pxs4pydpsryjjdwnf84")))) + "0b03aizjdj3g15xfkspgvy8k5jl8bgv4q7gwjwr3l2ibqkrm8vrz")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments -- cgit 1.4.1 From a3b57e57e68a1f4848bf8bacd797c5d989f56de2 Mon Sep 17 00:00:00 2001 From: André Batista Date: Fri, 27 Jan 2023 09:37:02 -0300 Subject: gnu: w3m: Update to 0.5.3+git20230121. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/w3m.scm (w3m): Update to 0.5.3+git20230121. Signed-off-by: 宋文武 --- gnu/packages/w3m.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 5239cd43a0..3efacf7346 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -42,7 +42,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20210102") + (version "0.5.3+git20230121") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -52,7 +52,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0amq1wfjp5mhqjmvrc0yhxjlx1335p78d7ap8iykfjn5h8yhmrg5")))) + "0nvhxsqxgxjrr62mvxzhhfzvbvg56g19vlqcgb8mh2x1daazk5ms")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 2e09ab0d35606e78f91e6e94f45c118f891463f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 11:26:18 +0200 Subject: gnu: xf86-video-voodoo: Update to 1.2.6. * gnu/packages/xorg.scm (xf86-video-voodoo): Update to 1.2.6. [source]: Remove patch. * gnu/packages/patches/xf86-video-voodoo-pcitag.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xf86-video-voodoo-pcitag.patch | 34 ---------------------- gnu/packages/xorg.scm | 10 +++---- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-voodoo-pcitag.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2d54c258ce..1d6bf12924 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2011,7 +2011,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ diff --git a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch b/gnu/packages/patches/xf86-video-voodoo-pcitag.patch deleted file mode 100644 index 5cadef3928..0000000000 --- a/gnu/packages/patches/xf86-video-voodoo-pcitag.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Mon, 20 May 2019 04:52:33 +0200 -Subject: [PATCH] gnu: xf86-video-voodoo: Don't use PCITAG. - -Copied verbatim from upstream repository[0]. - -[0]: https://cgit.freedesktop.org/xorg/driver/-xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593 - -From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Mon, 22 Sep 2014 10:56:02 +1000 -Subject: don't use PCITAG in struct anymore - ---- - src/voodoo.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/voodoo.h b/src/voodoo.h -index bfed497..c3eb64e 100644 ---- a/src/voodoo.h -+++ b/src/voodoo.h -@@ -23,7 +23,9 @@ typedef struct { - - Bool Voodoo2; /* Set if Voodoo2 */ - pciVideoPtr PciInfo; /* PCI data */ -+#ifndef XSERVER_LIBPCIACCESS - PCITAG PciTag; -+#endif - CARD32 PhysBase; - - CARD32 Width; /* Current width */ --- -cgit v1.0 - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 64fca5800d..17b5a75f9e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel -;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven @@ -3504,19 +3504,17 @@ server driver works.") (define-public xf86-video-voodoo (package (name "xf86-video-voodoo") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-voodoo-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly")) - (patches - (search-patches "xf86-video-voodoo-pcitag.patch")))) + "00pn5826aazsdipf7ny03s1lypzid31fmswl8y2hrgf07bq76ab2")))) (build-system gnu-build-system) (inputs (list xorgproto xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 831bb7f33bb62b05bc11a156124726551fd7c6b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 11:27:41 +0200 Subject: gnu: xf86-video-qxl: Update to 0.1.6. * gnu/packages/xorg.scm (xf86-video-qxl): Update to 0.1.6. [source]: Remove patch. * gnu/packages/patches/xf86-video-qxl-fix-build.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xf86-video-qxl-fix-build.patch | 101 --------------------- gnu/packages/xorg.scm | 8 +- 3 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-qxl-fix-build.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 1d6bf12924..520e9838ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2007,7 +2007,6 @@ dist_patch_DATA = \ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \ - %D%/packages/patches/xf86-video-qxl-fix-build.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ diff --git a/gnu/packages/patches/xf86-video-qxl-fix-build.patch b/gnu/packages/patches/xf86-video-qxl-fix-build.patch deleted file mode 100644 index 9ea50e4c91..0000000000 --- a/gnu/packages/patches/xf86-video-qxl-fix-build.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 4b083ede3c4a827a84295ff223e34ee3c2e581b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= - -Date: Sat, 28 Aug 2021 15:38:40 +0200 -Subject: [PATCH] Fix a build error with Xorg master -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use xf86ReturnOptValBool() in get_bool_option() instead of -options[option_index].value.bool to fix a compiler error with -current Xorg xserver master branch. - -Also use xf86GetOptValInteger() in get_int_option() and -xf86GetOptValString() in get_str_option() for consistency. - -The change causes a slight performance drop during option parsing -because the passed-in index_value is no longer used as an index -into the options array. - -Instead, it's used as a token now for the standard option getter -functions which works since the index_value to the get_*_option() -functions are identical to the value of options[n].token in the -passed-in OptionInfoRec array. - -Also rename "int option_index" to "int token" for clarity in all -three functions. - -Signed-off-by: Zoltán Böszörményi ---- - src/qxl_option_helpers.c | 13 +++++++------ - src/qxl_option_helpers.h | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c -index 2aba677..7707b7c 100644 ---- a/src/qxl_option_helpers.c -+++ b/src/qxl_option_helpers.c -@@ -10,31 +10,32 @@ - - #include "qxl_option_helpers.h" - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name) - { -+ int value; - if (env_name && getenv(env_name)) { - return atoi(getenv(env_name)); - } -- return options[option_index].value.num; -+ return xf86GetOptValInteger(options, token, &value) ? value : 0; - } - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name) - { - if (getenv(env_name)) { - return getenv(env_name); - } -- return options[option_index].value.str; -+ return xf86GetOptValString(options, token); - } - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name) - { - const char* value = getenv(env_name); - - if (!value) { -- return options[option_index].value.bool; -+ return xf86ReturnOptValBool(options, token, FALSE); - } - if (strcmp(value, "0") == 0 || - strcasecmp(value, "off") == 0 || -diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h -index 7c54c72..66d0a17 100644 ---- a/src/qxl_option_helpers.h -+++ b/src/qxl_option_helpers.h -@@ -4,13 +4,13 @@ - #include - #include - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name); - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name); - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name); - - #endif // OPTION_HELPERS_H --- -GitLab - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 17b5a75f9e..2bdb0fd7f8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3111,17 +3111,15 @@ UniChrome Pro and Chrome9 integrated graphics processors.") (define-public xf86-video-qxl (package (name "xf86-video-qxl") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" - "xf86-video-qxl-" version ".tar.bz2")) + "xf86-video-qxl-" version ".tar.xz")) (sha256 (base32 - "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi")) - (patches (search-patches - "xf86-video-qxl-fix-build.patch")))) + "0pwncx60r1xxk8kpp9a46ga5h7k7hjqf14726v0gra27vdc9blra")))) (build-system gnu-build-system) (inputs (list libxfont2 spice-protocol xorg-server xorgproto)) -- cgit 1.4.1 From b3d0a1a1dc84cdd85be00b82990ffd79a527eccd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 11:56:14 +0200 Subject: gnu: xf86-video-vmware: Limit to x86_64-linux and i686-linux. * gnu/packages/xorg.scm (xf86-video-vmware)[supported-systems]: New field. --- gnu/packages/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2bdb0fd7f8..970b2611fe 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3497,6 +3497,8 @@ server driver works.") (synopsis "VMware SVGA video driver for X server") (description "xf86-video-vmware is a VMware SVGA video driver for the Xorg X server.") + ;; This package only makes sense on some architectures. + (supported-systems (list "x86_64-linux" "i686-linux")) (license license:x11))) (define-public xf86-video-voodoo -- cgit 1.4.1 From f95bf8436ae4bd5eb45077d8d8f04126184aefc2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:18 +0200 Subject: gnu: imake: Update to 1.0.9. * gnu/packages/xorg.scm (imake): Update to 1.0.9. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 970b2611fe..e2bef99741 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -144,14 +144,14 @@ (define-public imake (package (name "imake") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/util/imake-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 - (base32 "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq")))) + (base32 "10wgw3l0rsnvc2191awyg5j24n3g552xgc671qr5vnbliwkrvpkj")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 9ab7d9567d97f64e71cb68fdd6eab6d77f405df4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:22 +0200 Subject: gnu: lndir: Update to 1.0.4. * gnu/packages/xorg.scm (lndir): Update to 1.0.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e2bef99741..8df128cbbc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -192,15 +192,15 @@ autotools system.") (define-public lndir (package (name "lndir") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/util/" - "lndir-" version ".tar.bz2")) + "lndir-" version ".tar.xz")) (sha256 (base32 - "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29")))) + "11syg5hx3f7m1d2p7zw717lryk819h6wk8h4vmapfdxvsflkfd1y")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 6ec602ecbd3bb0f8e0aa6bb38ebd6297407272a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:23 +0200 Subject: gnu: libxscrnsaver: Update to 1.2.4. * gnu/packages/xorg.scm (libxscrnsaver): Update to 1.2.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8df128cbbc..e1be9236ce 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1431,17 +1431,17 @@ treat it as part of their software base when porting.") (define-public libxscrnsaver (package (name "libxscrnsaver") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXScrnSaver-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr")))) + "1zi0r6mqa1g0hhsp02cdsjcxmsbipiv0v65c1h4pl84fydcjikbm")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From 88e8b3422b3d34df2f79066597cea7ec120da400 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:23 +0200 Subject: gnu: libxxf86dga: Update to 1.1.6. * gnu/packages/xorg.scm (libxxf86dga): Update to 1.1.6. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e1be9236ce..12ee9511b3 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1457,14 +1457,14 @@ treat it as part of their software base when porting.") (define-public libxxf86dga (package (name "libxxf86dga") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/" - "libXxf86dga-" version ".tar.bz2")) + "libXxf86dga-" version ".tar.xz")) (sha256 - (base32 "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b")))) + (base32 "03wqsxbgyrdbrhw8fk3fxc9nk8jnwz5537ym2yif73w0g5sl4i5y")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From 1856ce619f692b2c76f4e2fd8fe80038d9fc5233 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:24 +0200 Subject: gnu: makedepend: Update to 1.0.8. * gnu/packages/xorg.scm (makedepend): Update to 1.0.8. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 12ee9511b3..d3b790c206 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1519,17 +1519,17 @@ input from UTF-8 into the locale's encoding.") (define-public makedepend (package (name "makedepend") - (version "1.0.6") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/util/makedepend-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m")))) + "0nxs5ibrghym3msbnh0b8i3yd3xgqandmrkc500jm6qq4n06zcmz")))) (build-system gnu-build-system) (inputs (list xorgproto)) -- cgit 1.4.1 From 2f62a689e20c633d58054b021deaab912ed21ad9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:24 +0200 Subject: gnu: sessreg: Update to 1.1.3. * gnu/packages/xorg.scm (sessreg): Update to 1.1.3. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d3b790c206..8f91a67044 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1738,14 +1738,14 @@ features and to query screensaver info on specific windows.") (define-public sessreg (package (name "sessreg") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/sessreg-" version ".tar.bz2")) + "mirror://xorg/individual/app/sessreg-" version ".tar.xz")) (sha256 - (base32 "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz")))) + (base32 "1hmc9wsfgl2wmy0kccwa4brxbv02w5wiz5hrz72dsz87x1fwsah2")))) (build-system gnu-build-system) (inputs (list xorgproto)) -- cgit 1.4.1 From 2e3420db6d7fc8e5924efde23c2bd458fa4e4a98 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:25 +0200 Subject: gnu: xcursorgen: Update to 1.0.8. * gnu/packages/xorg.scm (xcursorgen): Update to 1.0.8. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8f91a67044..caefbab9e2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2209,17 +2209,17 @@ left-handed version of the cursors is also included.") (define-public xcursorgen (package (name "xcursorgen") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xcursorgen-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim")))) + "16yc82k4vp7icmf9247z4v38r65pdf032mrpzxj5wa2fggi3rcrj")))) (build-system gnu-build-system) (inputs (list libxcursor libpng)) -- cgit 1.4.1 From 0483eb1b23e0baaf34bafca8eaba144f4856974c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:25 +0200 Subject: gnu: xdriinfo: Update to 1.0.7. * gnu/packages/xorg.scm (xdriinfo): Update to 1.0.7. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index caefbab9e2..00bd69e3a9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2272,17 +2272,17 @@ available.") (define-public xdriinfo (package (name "xdriinfo") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xdriinfo-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r")))) + "0d7p9fj3znq0av9pjgi2kphqaz5w7b9hxlz63zbxs69bknp8p0yx")))) (build-system gnu-build-system) (inputs (list mesa libx11)) -- cgit 1.4.1 From 40bb1ad5a5c3515ee58dd4158d4c7b50749ccc6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:26 +0200 Subject: gnu: xf86-input-joystick: Update to 1.6.4. * gnu/packages/xorg.scm (xf86-input-joystick): Update to 1.6.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 00bd69e3a9..e36b052c1a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2445,17 +2445,17 @@ provide all features that libinput supports it does little beyond.") (define-public xf86-input-joystick (package (name "xf86-input-joystick") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-input-joystick-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly")))) + "1lnc6cvrg81chb2hj3jphgx7crr4ab8wn60mn8f9nsdwza2w8plh")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From ddc12778325f8f78fb737028f893a200188251df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:26 +0200 Subject: gnu: xf86-input-mouse: Update to 1.9.4. * gnu/packages/xorg.scm (xf86-input-mouse): Update to 1.9.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e36b052c1a..63070118c9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2497,17 +2497,17 @@ It is used to control the pointer with a joystick device.") (define-public xf86-input-mouse (package (name "xf86-input-mouse") - (version "1.9.3") + (version "1.9.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-input-mouse-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k")))) + "0k4dpppplj0hq77lgn8argdcgy61cijr0f4zrzfvv2i3zi8qavvz")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 694ceda3871e0132ffc863d39b91769bd501b9e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:27 +0200 Subject: gnu: xf86-video-ast: Update to 1.1.6. * gnu/packages/xorg.scm (xf86-video-ast): Update to 1.1.6. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 63070118c9..8edb0784cf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2627,16 +2627,16 @@ X server.") (define-public xf86-video-ast (package (name "xf86-video-ast") - (version "1.1.5") + (version "1.1.6") (home-page "https://cgit.freedesktop.org/xorg/driver/xf86-video-ast/") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-ast-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy")))) + "1bqdjcxi8fj48821322djdqnrla2i48wqckdf364zagrqyllyxbm")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From c8e7947c75fdbc6882cc530ca40383d4bc74f9cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:27 +0200 Subject: gnu: xf86-video-nv: Update to 2.1.22. * gnu/packages/xorg.scm (xf86-video-nv): Update to 2.1.22. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8edb0784cf..5bbd402bb6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3031,17 +3031,17 @@ the same level of support for generic VGA or 8514/A adapters.") (define-public xf86-video-nv (package (name "xf86-video-nv") - (version "2.1.21") + (version "2.1.22") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-nv-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z")))) + "126j60dgnmiahjk5mxbnaav23hv7nvxvh49vhn6qg2f3nlnr6632")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 071b77e554ceb3e4a62771f0615b4e7edec081be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:28 +0200 Subject: gnu: xf86-video-r128: Update to 6.12.1. * gnu/packages/xorg.scm (xf86-video-r128): Update to 6.12.1. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5bbd402bb6..7d3bced284 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3134,14 +3134,14 @@ This driver is intended for the spice qxl virtio device.") (define-public xf86-video-r128 (package (name "xf86-video-r128") - (version "6.12.0") + (version "6.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" - name "-" version ".tar.bz2")) + name "-" version ".tar.xz")) (sha256 (base32 - "0mz0v5mqmmbncr2drd5zvia1fb7frz2xqwflhhqbnaxx5j48c740")))) + "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx")))) (build-system gnu-build-system) (inputs (list mesa xorgproto xorg-server)) (native-inputs -- cgit 1.4.1 From 0077ce3a0e1c679354f9da452d418ccda0563d7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:28 +0200 Subject: gnu: xf86-video-suncg6: Update to 1.1.3. * gnu/packages/xorg.scm (xf86-video-suncg6): Update to 1.1.3. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7d3bced284..cf941c1bd2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3230,17 +3230,17 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (define-public xf86-video-suncg6 (package (name "xf86-video-suncg6") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-suncg6-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr")))) + "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From d00c02ea9d1641851d20b690d168fd35575c7992 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:29 +0200 Subject: gnu: xf86-video-sunffb: Update to 1.2.3. * gnu/packages/xorg.scm (xf86-video-sunffb): Update to 1.2.3. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cf941c1bd2..b6bcb8dd86 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3253,17 +3253,17 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (define-public xf86-video-sunffb (package (name "xf86-video-sunffb") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-sunffb-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s")))) + "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 0b70ea52dbebdabd1836d3c53ba9b7f10026fbdd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:29 +0200 Subject: gnu: xf86-video-vesa: Update to 2.6.0. * gnu/packages/xorg.scm (xf86-video-vesa): Update to 2.6.0. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b6bcb8dd86..505b6fc402 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3350,17 +3350,17 @@ X server.") (define-public xf86-video-vesa (package (name "xf86-video-vesa") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-vesa-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz")))) + "1ccvaigb1f1kz8nxxjmkfn598nabd92p16rx1g35kxm8n5qjf20h")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From fa75b73501c9cc5daeabecccae2fe6d3a81adf3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:30 +0200 Subject: gnu: xf86-video-vmware: Update to 13.4.0. * gnu/packages/xorg.scm (xf86-video-vmware): Update to 13.4.0. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 505b6fc402..b04bdab462 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3473,17 +3473,17 @@ server driver works.") (define-public xf86-video-vmware (package (name "xf86-video-vmware") - (version "13.3.0") + (version "13.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-vmware-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7")))) + "06mq7spifsrpbwq9b8kn2cn61xq6mpkq6lvh4qi6xk2yxpjixlxf")))) (build-system gnu-build-system) (inputs (list libx11 -- cgit 1.4.1 From 0b830b05f32e052bcf763dc0a786ffe1eb04c45e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:30 +0200 Subject: gnu: xgamma: Update to 1.0.7. * gnu/packages/xorg.scm (xgamma): Update to 1.0.7. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b04bdab462..96e0a1236a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3623,17 +3623,17 @@ configuring modelines and gamma.") (define-public xgamma (package (name "xgamma") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xgamma-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f")))) + "13xw2fqp9cs7xj3nqi8khqxv81rk0dd8khp59xgs2lw9bbldly8w")))) (build-system gnu-build-system) (inputs (list libxxf86vm libx11)) -- cgit 1.4.1 From ecc124e2e02afae621d9b29d3079eee0acf5fb41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:31 +0200 Subject: gnu: xhost: Update to 1.0.9. * gnu/packages/xorg.scm (xhost): Update to 1.0.9. [native-inputs]: Add gettext-minimal. --- gnu/packages/xorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 96e0a1236a..c0ce4beb02 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3650,22 +3650,22 @@ monitor via the X video mode extension.") (define-public xhost (package (name "xhost") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xhost-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52")))) + "0ib66h78ykc4zki4arh8hkcsgk1mk8yyy0ay5sdb2d908qqvb1pa")))) (build-system gnu-build-system) (inputs (list libxmu libxau libx11)) (native-inputs - (list pkg-config)) + (list gettext-minimal pkg-config)) (home-page "https://gitlab.freedesktop.org/xorg/app/xhost") (synopsis "Xorg server access control utility") (description -- cgit 1.4.1 From 0c85df83571050fe290dab20b01a86cf94058a4b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:31 +0200 Subject: gnu: xkbevd: Update to 1.1.5. * gnu/packages/xorg.scm (xkbevd): Update to 1.1.5. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c0ce4beb02..fb6a4c8fbf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3787,17 +3787,17 @@ make keyboards more accessible to people with physical impairments.") (define-public xkbevd (package (name "xkbevd") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xkbevd-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14")))) + "0swjhk33fp15060hhzycmk288ys51wwm6l7p9xy4blz95mq7nd9q")))) (build-system gnu-build-system) (inputs (list libxkbfile libx11)) -- cgit 1.4.1 From 7e05d4078f2b73e3afd0185194e9ffe2831e2c2e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:32 +0200 Subject: gnu: xkbprint: Update to 1.0.6. * gnu/packages/xorg.scm (xkbprint): Update to 1.0.6. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fb6a4c8fbf..527c405147 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3813,14 +3813,14 @@ requested commands if they occur.") (define-public xkbprint (package (name "xkbprint") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/" - "xkbprint-" version ".tar.bz2")) + "xkbprint-" version ".tar.xz")) (sha256 - (base32 "1yi3232g25hhp241irncd8znv3090k2gm0yjcdnz08h89y1zwn2v")))) + (base32 "1c57kb8d8cbf720n9bcjhhaqpk08lac0sk4l0jp8j0mryw299k4r")))) (build-system gnu-build-system) (inputs (list libx11 libxkbfile xorgproto)) -- cgit 1.4.1 From a9dc2018dab32553374e347b308e351a958e5230 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:32 +0200 Subject: gnu: xkill: Update to 1.0.6. * gnu/packages/xorg.scm (xkill): Update to 1.0.6. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 527c405147..17994b4209 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3898,17 +3898,17 @@ can be combined together using the @code{rules} component of this database.") (define-public xkill (package (name "xkill") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xkill-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65")))) + "01xrmqw498hqlhn6l1sq89s31k6sjf6xlij6a08pnrvmqiwama75")))) (build-system gnu-build-system) (inputs (list libxmu libx11)) -- cgit 1.4.1 From 598a51d35eef45fa74851327f0cc848536a9f55d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:33 +0200 Subject: gnu: xlsatoms: Update to 1.1.4. * gnu/packages/xorg.scm (xlsatoms): Update to 1.1.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 17994b4209..3affd28259 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3925,17 +3925,17 @@ programs that have displayed undesired windows on a user's screen.") (define-public xlsatoms (package (name "xlsatoms") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xlsatoms-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp")))) + "1dviriynilkw0jwl0s2h8y95pwh8cxj95cnmllkd6rn0args3gzl")))) (build-system gnu-build-system) (inputs (list libxcb)) -- cgit 1.4.1 From 96d9cda1315228cb4debe457da4eae0f2901045a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:33 +0200 Subject: gnu: xlsclients: Update to 1.1.5. * gnu/packages/xorg.scm (xlsclients): Update to 1.1.5. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3affd28259..525907b6ec 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3950,17 +3950,17 @@ programs that have displayed undesired windows on a user's screen.") (define-public xlsclients (package (name "xlsclients") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xlsclients-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp")))) + "1qxsav5gicsfwv1dqlcfpj47vy9i30i7iysrfx5aql02wxbyxfk8")))) (build-system gnu-build-system) (inputs (list libxcb)) -- cgit 1.4.1 From 36b0642e190a09900ce9ef1cea9d488293664ddb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:34 +0200 Subject: gnu: xfd: Update to 1.1.4. * gnu/packages/xorg.scm (xfd): Update to 1.1.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 525907b6ec..14e2998068 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4031,15 +4031,15 @@ Font Description (XLFD) full name for a font.") (define-public xfd (package (name "xfd") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xfd-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr")))) + "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From f206900b92a230ebc7f97c22cf5e79cf0e6b6e46 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:34 +0200 Subject: gnu: xrandr: Update to 1.5.2. * gnu/packages/xorg.scm (xrandr): Update to 1.5.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14e2998068..a39fd822a4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4177,7 +4177,7 @@ an X server.") (define-public xrandr (package (name "xrandr") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) @@ -4186,7 +4186,7 @@ an X server.") version ".tar.xz")) (sha256 (base32 - "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv")))) + "0h7jy4c5zgrr06fimnnxhy5ba782b1n4aik29g6bln4h1mwy9gn8")))) (build-system gnu-build-system) (inputs (list libxrender libxrandr xorgproto libx11)) -- cgit 1.4.1 From 1d24279cc485aa0b92a864e2b17c338f36a6ef3a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:35 +0200 Subject: gnu: xsetroot: Update to 1.1.3. * gnu/packages/xorg.scm (xsetroot): Update to 1.1.3. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a39fd822a4..2dbc095eee 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4277,17 +4277,17 @@ up your screen.") (define-public xsetroot (package (name "xsetroot") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xsetroot-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h")))) + "1l9qcv4mldj70slnmfg56nv7yh9j9ca1x795bl26whmlkrdb90b0")))) (build-system gnu-build-system) (inputs (list libxmu libxcursor xbitmaps)) -- cgit 1.4.1 From b898c28a27760b241b5ad9debef49e57a9de9ce6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:35 +0200 Subject: gnu: xvinfo: Update to 1.1.5. * gnu/packages/xorg.scm (xvinfo): Update to 1.1.5. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2dbc095eee..19206740eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4328,17 +4328,17 @@ libICE, the X font server, and related components.") (define-public xvinfo (package (name "xvinfo") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xvinfo-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3")))) + "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy")))) (build-system gnu-build-system) (inputs (list libxext libxv libx11)) -- cgit 1.4.1 From 371a19c742eca807ec59790de65c85332b0b9b87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:35 +0200 Subject: gnu: xinit: Update to 1.4.2. * gnu/packages/xorg.scm (xinit): Update to 1.4.2. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 19206740eb..c8def76d52 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5817,14 +5817,14 @@ The XCB util-wm module provides the following libraries: (define-public xinit (package (name "xinit") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xinit-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy")))) + "08qz6f6yhis6jdcp6hzspql6ib9a9zp0ddhhbac1b7zg4a6xrn5p")))) (build-system gnu-build-system) (inputs (list xorgproto libx11)) -- cgit 1.4.1 From de4675d5588ad04657823780a55a6392147c0178 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jan 2023 12:08:36 +0200 Subject: gnu: libxaw3d: Update to 1.6.4. * gnu/packages/xorg.scm (libxaw3d): Update to 1.6.4. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c8def76d52..a43809e3cb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5846,17 +5846,17 @@ user-friendly mechanism to start the X server.") (define-public libxaw3d (package (name "libxaw3d") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXaw3d-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid")))) + "0484fn93jqjadc68gnrnjgx0pbgravq2i6ssbbrb13n69d9dy016")))) (build-system gnu-build-system) (propagated-inputs (list libxext libxmu libxt)) -- cgit 1.4.1 From 9b7ba7d960f72a22725280df5c95d89bbb7314f1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 31 Jan 2023 13:57:18 +0000 Subject: gnu: guix-build-coordinator: Update to 0-69.8ca5f04. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-69.8ca5f04. [arguments]: Remove redundant wrap-program workaround. --- gnu/packages/package-management.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 820c9bb468..db1462fb94 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1357,8 +1357,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "3768aec91daebb8db58e28cffe481e8878b59700") - (revision "68")) + (let ((commit "8ca5f045d232124e97069a30253853abc66be03e") + (revision "69")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1369,7 +1369,7 @@ environments.") (commit commit))) (sha256 (base32 - "0vh4hndqgpz8rwrlfc6vhypy1hxayb8lvxw1jc41ags3lhw75dcz")) + "0aq0hca9bfy0djn6vwqbxwpirbd0zmpwbj5m7lq4lpfmn2121lkd")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -1434,14 +1434,7 @@ environments.") (assoc-ref inputs input) version)) guile-inputs) - ":")))) - (when target - ;; XXX work around wrap-program picking bash for the - ;; host rather than target - (let ((bash (assoc-ref inputs "bash"))) - (substitute* file - (("^#!.*/bash") - (string-append "#! " bash "/bin/bash"))))))) + ":")))))) (find-files bin))) #t)) (delete 'strip)))) ; As the .go files aren't compatible -- cgit 1.4.1 From d386fa6cba361c7e9cd5fcc136c7db259de6b583 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 28 Dec 2022 18:38:13 -0500 Subject: gnu: x42-plugins: Update to 20221119. * gnu/packages/music.scm (x42-plugins): Update to 20221119. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 271b13891e..8438613971 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6047,7 +6047,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.") (define-public x42-plugins (package (name "x42-plugins") - (version "20211016") + (version "20221119") (source (origin (method url-fetch) @@ -6055,7 +6055,7 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.") (string-append "https://gareus.org/misc/x42-plugins/x42-plugins-" version ".tar.xz")) (sha256 - (base32 "11bf6q42ihyk4qxwf83y0847zzyl65kwpbk3hmyz0f0ykil5fsb7")))) + (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit 1.4.1 From 8781ab4057692c854c91ac71c660a229ac2d8ae5 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 28 Dec 2022 18:38:15 -0500 Subject: gnu: x42-plugins: Use new package style. * gnu/packages/music.scm (x42-plugins)[arguments]: Use g-expressions. Remove references to %outputs and %build-inputs. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8438613971..24c4cc28ee 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6058,17 +6058,18 @@ short-time Fourier transform, available as LV2 audio plugin and JACK client.") (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "LIBZITACONVOLVER=-lzita-convolver" - (string-append "FONTFILE=" - (assoc-ref %build-inputs "font-dejavu") - "/share/fonts/truetype/DejaVuSans-Bold.ttf") - (string-append "CC=" ,(cc-for-target))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list + #:tests? #f ; no "check" target + #:make-flags + #~(list (string-append "PREFIX=" #$output) + "LIBZITACONVOLVER=-lzita-convolver" + (string-append "FONTFILE=" + #$(this-package-native-input "font-dejavu") + "/share/fonts/truetype/DejaVuSans-Bold.ttf") + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (inputs (list cairo fftwf -- cgit 1.4.1 From 511b57deac01573a7eb548115b2393dc5dc302fa Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 28 Dec 2022 18:55:53 -0500 Subject: gnu: zam-plugins: Update to 4.1. * gnu/packages/music.scm (zam-plugins): Update to 4.1. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 24c4cc28ee..1a742c1c84 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6094,7 +6094,7 @@ audio and MIDI plugins that can also run as standalone JACK applications.") (define-public zam-plugins (package (name "zam-plugins") - (version "3.13") + (version "4.1") (source (origin (method git-fetch) @@ -6108,7 +6108,7 @@ audio and MIDI plugins that can also run as standalone JACK applications.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "02blg0iqich4vx5z1ahj6avkh83yqszdiq83p9jd5qwm0i4llqjq")))) + (base32 "0p3y3r2nrhzr0xlcy5rz4c2jsvc10l1n8cwc642r0zppwfabm9il")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit 1.4.1 From 75749bbf7b8b70894a7844bf67bc6ec66e21142f Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 28 Dec 2022 18:55:54 -0500 Subject: gnu: zam-plugins: Use new package style. * gnu/packages/music.scm (zam-plugins)[arguments]: Use G-expressions. Use #$output instead of assoc-ref. [home-page]: Use https. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1a742c1c84..e5aacb54eb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6111,16 +6111,17 @@ audio and MIDI plugins that can also run as standalone JACK applications.") (base32 "0p3y3r2nrhzr0xlcy5rz4c2jsvc10l1n8cwc642r0zppwfabm9il")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no "check" target - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "HAVE_ZITA_CONVOLVER=true") - #:phases - (modify-phases %standard-phases - (add-before 'build 'set-CC-variable - (lambda _ - (setenv "CC" "gcc") #t)) - (delete 'configure)))) + (list + #:tests? #f ;no "check" target + #:make-flags + #~(list (string-append "PREFIX=" #$output) + "HAVE_ZITA_CONVOLVER=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-CC-variable + (lambda _ + (setenv "CC" "gcc"))) + (delete 'configure)))) (inputs (list fftwf jack-1 ;for the standalone JACK application @@ -6137,7 +6138,7 @@ LV2 and VST2 formats, as well as standalone JACK versions. The collection includes ZaMaximX2, ZamAutoSat, ZamComp, ZamCompX2, ZamEQ2, ZamGEQ31, ZamHeadX2, ZamPhono, ZamGate, ZamGateX2, ZamTube, ZamDelay, ZamDynamicEQ, ZaMultiComp, ZaMultiCompX2 and ZamSynth.") - (home-page "http://www.zamaudio.com/?p=976") + (home-page "https://www.zamaudio.com/?p=976") (license license:gpl2+))) (define-public geonkick -- cgit 1.4.1 From 8d43706a02d8ea6036793ca136e23379fc397622 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Fri, 30 Dec 2022 00:39:15 +0100 Subject: gnu: go-github-com-andybalholm-cascadia: Update to 1.3.1. * gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Update to 1.3.1. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4c79f3dec2..93df6cb061 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8047,7 +8047,7 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (define-public go-github-com-andybalholm-cascadia (package (name "go-github-com-andybalholm-cascadia") - (version "1.0.0") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -8056,7 +8056,7 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (file-name (git-file-name name version)) (sha256 (base32 - "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc")))) + "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s")))) (build-system go-build-system) (arguments `(#:import-path "github.com/andybalholm/cascadia")) -- cgit 1.4.1 From a62099cde9b7102dd059de11aaf24c3f5a8e92f3 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sat, 31 Dec 2022 08:53:15 +0000 Subject: gnu: materia-theme: Update to 20210322. * gnu/packages/gnome-xyz.scm (materia-theme): Update to 20210322. Signed-off-by: Christopher Baines --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 1e6fa6a9c4..37804958de 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1301,7 +1301,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (define-public materia-theme (package (name "materia-theme") - (version "20200916") + (version "20210322") (source (origin (method git-fetch) @@ -1312,7 +1312,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (file-name (git-file-name name version)) (sha256 (base32 - "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74")))) + "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl")))) (build-system meson-build-system) (native-inputs (list gtk+ sassc)) -- cgit 1.4.1 From 81ee1d33255764a43eb4854e75890bdb578bdfd1 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sat, 31 Dec 2022 13:37:20 +0000 Subject: gnu: arc-theme: Update to 20221218. * gnu/packages/gnome-xyz.scm (arc-theme): Update to 20221218. [arguments]: Add gtk4 to the list of themes. [inputs]: Add gtk-engines. Signed-off-by: Christopher Baines --- gnu/packages/gnome-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 37804958de..84b46fe89f 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1189,7 +1189,7 @@ of windows.") (define-public arc-theme (package (name "arc-theme") - (version "20220405") + (version "20221218") (source (origin (method git-fetch) (uri (git-reference @@ -1198,11 +1198,11 @@ of windows.") (file-name (git-file-name name version)) (sha256 (base32 - "1gjwf75sg4xyfypb08qiy2cmqyr2mamjc4i46ifrq7snj15gy608")))) + "0yznqjz1a1mcwks8z7pybgzrjiwg978bfpdmkaq926wy82qslngd")))) (build-system meson-build-system) (arguments '(#:configure-flags - '("-Dthemes=gnome-shell,gtk2,gtk3,metacity,plank,unity,xfwm") + '("-Dthemes=gnome-shell,gtk2,gtk3,gtk4,metacity,plank,unity,xfwm") #:phases (modify-phases %standard-phases (add-before 'build 'set-home ;placate Inkscape @@ -1217,6 +1217,7 @@ of windows.") pkg-config python sassc/libsass-3.5)) + (inputs (list gtk-engines)) ;for gtk+-2 to work properly (synopsis "Flat GTK+ theme with transparent elements") (description "Arc is a flat theme with transparent elements for GTK 3, GTK 2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments -- cgit 1.4.1 From 38ef37d4bb684849e1789d57e46a039e6d005579 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 9 Jan 2023 15:34:35 +0800 Subject: gnu: c-intro-and-ref: Update to 0.0.0-1.47e5a23. * gnu/packages/c.scm (c-intro-and-ref): Update to commit 47e5a234a7c0. Signed-off-by: Christopher Baines --- gnu/packages/c.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 8777c47919..9a2b6cdaef 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -70,8 +70,8 @@ #:use-module (gnu packages xml)) (define-public c-intro-and-ref - (let ((revision "0") - (commit "f88559678feeb1391a0e9c7cf060c4429ef22ffc")) + (let ((revision "1") + (commit "47e5a234a7c036392e0f9e1e8e48ff3e6855840d")) (package (name "c-intro-and-ref") (version (git-version "0.0.0" revision commit)) @@ -83,7 +83,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0c08h8k7wkn5lw0jqnnaayx55d3vf1q11pgsixfw31i58rnwa5y2")))) + "0aza4vvlg2w0ss6n5xp741ycvg16d041c1x87yh5hpnzcb6y0ii3")))) (build-system copy-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- cgit 1.4.1 From 3cb54612b7fd58ae8f95c1198041293a69528dee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:01 +0100 Subject: gnu: kicad: Update to 6.0.11. * gnu/packages/engineering.scm (kicad): Update to 6.0.11. --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 14beec9d28..ef184c5c23 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -944,7 +944,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "6.0.10") + (version "6.0.11") (source (origin (method git-fetch) (uri (git-reference @@ -952,7 +952,7 @@ Emacs).") (commit version))) (sha256 (base32 - "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q")) + "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1051,7 +1051,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "06aw8f1pnh63dscv2bkii0cpr2m5yc4baka3avszsxnv8mqn0hwx")))) + "0f191ifzgl2k196ph7ljip97s17gq8bsfkn1s3aza1qaafhg7acd")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") -- cgit 1.4.1 From 478cc50066e32e343fb65aa401547447fd0f8d04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:00 +0100 Subject: gnu: appstream: Update to 0.15.6. * gnu/packages/freedesktop.scm (appstream): Update to 0.15.6. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 02898bfe36..a986c8c350 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -133,7 +133,7 @@ (define-public appstream (package (name "appstream") - (version "0.15.5") + (version "0.15.6") (source (origin (method url-fetch) @@ -142,7 +142,7 @@ "appstream/releases/" "AppStream-" version ".tar.xz")) (sha256 - (base32 "1hh41r82a2p7anyadfsp9lmylrrj1a6gknx2g4w6ha97riifs5fb")))) + (base32 "03pirmc5r4izl6mzff879g7pk1nxq03kgpr2yvnnqnlb6r0ckmi3")))) (build-system meson-build-system) (arguments (list -- cgit 1.4.1 From 86a46995e2a9f15c5377d041853b3e67fcf57b3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:01 +0100 Subject: gnu: edgar: Update to 1.36. * gnu/packages/games.scm (edgar): Update to 1.36. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f85e9333f7..9a045b6770 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8739,7 +8739,7 @@ where the player draws runes in real time to effect the desired spell.") (define-public edgar (package (name "edgar") - (version "1.35") + (version "1.36") (source (origin (method url-fetch) @@ -8747,7 +8747,7 @@ where the player draws runes in real time to effect the desired spell.") (string-append "https://github.com/riksweeney/edgar/releases/download/" version "/edgar-" version "-1.tar.gz")) (sha256 - (base32 "0hwp73ili10kzx0aibhvgxfddqm94pimdaqhpnba6jzn119834q7")))) + (base32 "0fcsmwwfdwap5v6qdijw91kqnnc2i91yzgwfi7vpwvasw70qvna1")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; there are no tests #:make-flags -- cgit 1.4.1 From 488e6f04f375c1689a84c52d7118f3e4bbe84fec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:01 +0100 Subject: gnu: memtest86+: Update to 6.01. * gnu/packages/hardware.scm (memtest86+): Update to 6.01. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 81f38d069b..28a150969d 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -824,7 +824,7 @@ specific SMBIOS tables.") (define-public memtest86+ (package (name "memtest86+") - (version "6.00") + (version "6.01") (source (origin (method git-fetch) @@ -833,7 +833,7 @@ specific SMBIOS tables.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fv605blaf4z0jyl1wp37x5x014dkp0z0a0fh114ws62fhnhdnlv")) + (base32 "1axf8y3nppyskcysypqpkjl0sxz39f1x0v4syplx35qj3y2kq1h4")) (patches (search-patches "memtest86+-build-reproducibly.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From 1e29e093be2a05ee2c74262ced7d79e7af3f4b09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:23 +0100 Subject: gnu: memtester: Update to 4.6.0. * gnu/packages/hardware.scm (memtester): Update to 4.6.0. [source]: Add a mirror URI. --- gnu/packages/hardware.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 28a150969d..3e776e885b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -897,15 +897,22 @@ can scan as much of your RAM as possible for hardware defects.") (define-public memtester (package (name "memtester") - (version "4.5.1") + (version "4.6.0") (source (origin (method url-fetch) ;; Even the latest release is available under 'old-versions/'. - (uri (string-append "http://pyropus.ca/software/memtester/old-versions/" - "memtester-" version ".tar.gz")) + (uri (list + (string-append "https://pyropus.ca/software/memtester/old-versions/" + "memtester-" version ".tar.gz") + ;; XXX ‘pyropus.ca’ redirects to ‘pyropus.ca.’. Valid, but wreaks + ;; havoc with Guile's Web stack & TLS verification. + ;; Remove this random mirror when that changes. + (string-append "https://ftp.dimensiondata.com/mirrors/" + "ftp.gentoo.org/distfiles/3e/" + "memtester-" version ".tar.gz"))) (sha256 - (base32 "0issrasdihav8jgsqb49cfyj0v564z8k9lyg2jrq9h3n4lwc4pqw")))) + (base32 "0bmv7n7gj02pda8mwif08xk63xc20r65q1pr099fz30cx2vlxzn9")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 21a4e66f02aacf5ae87105d2157de1b1be29f9b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:01 +0100 Subject: gnu: hwinfo: Update to 22.2. * gnu/packages/hardware.scm (hwinfo): Update to 22.2. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 3e776e885b..0b78436017 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -325,7 +325,7 @@ operability and find drivers.") (define-public hwinfo (package (name "hwinfo") - (version "21.82") + (version "22.2") (home-page "https://github.com/openSUSE/hwinfo") (source (origin @@ -336,7 +336,7 @@ operability and find drivers.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ih6vrgh64408cijywy9by2snynkw91p3h0ry5pzk3lyqsl0wnlh")) + (base32 "1lfzcyiipxwi8rh0aw5sy7n8x986b9f9pa9g048rxn6k7anfpxk7")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From 5618153e7346e838f20a4e5c042d97eb9ad57314 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:08 +0100 Subject: gnu: phockup: Properly patch exiftool. * gnu/packages/image.scm (phockup)[arguments]: Fix 'configure phase to catch all occurrences. --- gnu/packages/image.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 195d127b31..0b57d88468 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2428,9 +2428,10 @@ Wacom-style graphics tablets.") (modify-phases %standard-phases (add-after 'unpack 'configure (lambda* (#:key inputs #:allow-other-keys) - (substitute* (list "src/dependency.py" "src/exif.py") - (("'exiftool'") - (string-append "'" (search-input-file inputs "/bin/exiftool") "'"))))) + (substitute* (list "src/dependency.py" + "src/exif.py") + (("'exiftool") + (string-append "'" (search-input-file inputs "bin/exiftool")))))) (add-before 'install 'check (lambda _ (invoke "pytest"))) -- cgit 1.4.1 From 0d036019318ccef0ce56270b60ef5074ed9d0400 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:19 +0100 Subject: gnu: phockup: Test exiftool patching. * gnu/packages/image.scm (phockup)[arguments]: Unset PATH during tests. --- gnu/packages/image.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0b57d88468..87a9b791bc 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2434,7 +2434,12 @@ Wacom-style graphics tablets.") (string-append "'" (search-input-file inputs "bin/exiftool")))))) (add-before 'install 'check (lambda _ - (invoke "pytest"))) + ;; Test without PATH to make sure ‘exiftool’ is properly found. + (let ((path (getenv "PATH")) + (pytest (which "pytest"))) + (setenv "PATH" "") + (invoke pytest) + (setenv "PATH" path)))) (add-after 'install 'install-bin (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit 1.4.1 From e68b0596861fb4695f9bc6d14e84fd82934a9906 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:04 +0100 Subject: gnu: phockup: Update to 1.9.2. * gnu/packages/image.scm (phockup): Update to 1.9.2. --- gnu/packages/image.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 87a9b791bc..704b15cc97 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2409,7 +2409,7 @@ Wacom-style graphics tablets.") (define-public phockup (package (name "phockup") - (version "1.9.0") + (version "1.9.2") (source (origin (method git-fetch) @@ -2418,8 +2418,7 @@ Wacom-style graphics tablets.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1xs2h3nj19wsfffl87akinx14drk5nn2svjwyj0csv10apk0q4pp")))) + (base32 "0j4mnsy12bhsmd80vgqknv004xbqd165y8gpalw87gp8i8xv172r")))) (build-system copy-build-system) (arguments `(#:install-plan '(("src" "share/phockup/") -- cgit 1.4.1 From 2cea54ba62eaafc92f963299eef54b4f981b2f53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:03 +0100 Subject: gnu: libpng-apng: Update to 1.6.39. I've tweaked the comment, as it made me read an entire e-mail thread only to realise I needn't have done so. * gnu/packages/image.scm (libpng-apng): Update to 1.6.39. --- gnu/packages/image.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 704b15cc97..91d68fa0f8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -178,12 +178,11 @@ library. It supports almost all PNG features and is extensible.") (license license:zlib) (home-page "http://www.libpng.org/pub/png/libpng.html"))) -;; libpng-apng should be updated when the APNG patch is released: -;; (define-public libpng-apng + ;; The APNG patch is maintained separately and may lag behind upstream libpng. (package (name "libpng-apng") - (version "1.6.37") + (version "1.6.39") (source (origin (method url-fetch) @@ -196,8 +195,7 @@ library. It supports almost all PNG features and is extensible.") "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" "/libpng16/libpng-" version ".tar.xz"))) (sha256 - (base32 - "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))) + (base32 "0dv90dxvmqpk7mbywyjbz8lh08cv4b0ksqp1y62mzvmlf379cihz")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -231,7 +229,7 @@ library. It supports almost all PNG features and is extensible.") version "/libpng-" version "-apng.patch.gz")) (sha256 (base32 - "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2")))))) + "1z8cx011a2c7vagwgi92rbmky1wi8awmrdldqh9f5k80pbmbdi2a")))))) (native-inputs (list libtool)) ;; libpng.la says "-lz", so propagate it. -- cgit 1.4.1 From ea6a2df77f553346f2060e6ba9fa1f833c1895ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Jan 2023 01:00:00 +0100 Subject: gnu: libpng-apng: Remove obsolete trailing #t. * gnu/packages/image.scm (libpng-apng)[arguments]: Don't explicitly return #t from phases. --- gnu/packages/image.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 91d68fa0f8..6b25da28ef 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -213,14 +213,12 @@ library. It supports almost all PNG features and is extensible.") apng.gz) (invoke "sh" "-c" (string-append "gunzip < " apng.gz " > the-patch")) - (apply-patch "the-patch") - #t))) + (apply-patch "the-patch")))) (add-before 'configure 'no-checks (lambda _ (substitute* "Makefile.in" (("^scripts/symbols.chk") "") - (("check: scripts/symbols.chk") "")) - #t))))) + (("check: scripts/symbols.chk") ""))))))) (inputs `(("apng" ,(origin (method url-fetch) -- cgit 1.4.1 From aed385e18ec7b68a0bc1bb4b173aeadc9cd97245 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Jan 2023 01:00:00 +0100 Subject: gnu: papirus-icon-theme: Reduce inode consumption. * gnu/packages/gnome-xyz.scm (papirus-icon-theme)[arguments]: Add a new 'halve-inode-consumption phase. --- gnu/packages/gnome-xyz.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 84b46fe89f..0cb4adac76 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2020 Ekaitz Zarraga -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2023 Tobias Geerinckx-Rice ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Ellis Kenyo ;;; Copyright © 2020 Stefan Reichör @@ -216,7 +216,23 @@ simple and consistent.") (modify-phases %standard-phases (delete 'bootstrap) (delete 'configure) - (delete 'build)))) + (delete 'build) + (add-after 'install 'halve-inode-consumption + ;; This package uses over 100K inodes, which is a lot. We can easily + ;; halve that number by using (hard) links, to no ill effect. + ;; See . + ;; However, the source checkout will still use the full amount! + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (symlink? (lambda (_ stat) + (eq? 'symlink (stat:type stat))))) + (for-each (lambda (file) + (with-directory-excursion (dirname file) + (let ((target (readlink file))) + (when (eq? 'regular (stat:type (stat target))) + (delete-file file) + (link target file))))) + (find-files out symlink?)))))))) (native-inputs (list `(,gtk+ "bin"))) (home-page "https://git.io/papirus-icon-theme") -- cgit 1.4.1 From a85d6dd4dbe48d131821b315ca392352dfea174d Mon Sep 17 00:00:00 2001 From: Frank Pursel Date: Wed, 4 Jan 2023 07:21:00 -0800 Subject: gnu: ledger: Install example referenced in docs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (ledger)[arguments]: In 'install-examples' phase, install 'contrib/report'. Signed-off-by: Ludovic Courtès --- gnu/packages/finance.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index aa074a92eb..c9c8e9b823 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2022 Collin J. Doering ;;; Copyright © 2022 Justin Veilleux +;;; Copyright © 2023 Frank Pursel ;;; ;;; This file is part of GNU Guix. ;;; @@ -350,7 +351,8 @@ and dynamically with report tools based on filtering and graphical charts.") (let ((examples (string-append (assoc-ref outputs "out") "/share/doc/ledger/examples"))) (install-file "test/input/sample.dat" examples) - (install-file "test/input/demo.ledger" examples)) + (install-file "test/input/demo.ledger" examples) + (install-file "contrib/report" examples)) #t)) (add-after 'build 'build-doc (lambda _ (invoke "make" "doc"))) -- cgit 1.4.1 From 99efb55cd4cee39ba5aca259585fcea8c9f52fca Mon Sep 17 00:00:00 2001 From: Lilah Tascheter Date: Fri, 6 Jan 2023 13:09:26 -0600 Subject: gnu: castor: Fix compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Castor no longer compiles with latest packaged LibreSSL; latest OpenSSL, however, does compile. * gnu/packages/web.scm (castor)[inputs]: Replace libressl with openssl. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7817373421..a29f53108c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6604,7 +6604,7 @@ file links.") cairo gdk-pixbuf gtk+ - libressl + openssl-3.0 pango)) (home-page "https://git.sr.ht/~julienxx/castor") (synopsis "Graphical client for plain-text protocols") -- cgit 1.4.1 From 8d97c66dfe1ac1fa00e16d30ab55042e2c7ea8f0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 6 Jan 2023 23:11:32 +0000 Subject: gnu: Add python-nox. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-check.scm (python-nox): New variable. Sort modules alphabetically and add pyproject build system. Signed-off-by: Ludovic Courtès --- gnu/packages/python-check.scm | 63 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 7cb467c166..41ed6e9a73 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2020 Edouard Klein ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour -;;; Copyright © 2021-2022 Sharlatan Hellseher +;;; Copyright © 2021-2023 Sharlatan Hellseher ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Bonface Munyoki Kilyungi @@ -39,8 +39,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) - #:use-module (gnu packages docker) #:use-module (gnu packages django) + #:use-module (gnu packages docker) #:use-module (gnu packages openstack) #:use-module (gnu packages perl) #:use-module (gnu packages python-build) @@ -50,13 +50,14 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) + #:use-module (guix build-system pyproject) + #:use-module (guix build-system python) + #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix download) - #:use-module (guix build-system python)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public python-tappy (package @@ -2339,6 +2340,56 @@ Python objects. It tries to use the objects available in the standard which make writing and running functional and integration tests easier.") (license license:asl2.0))) +(define-public python-nox + (package + (name "python-nox") + (version "2022.11.21") + (source + (origin + ;; No tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/wntrblm/nox") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xfd63h75wiiyri4f7qyvy50f2ny0v4r4wx2h4px9ddbkh2k5g9p")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; NOTE: This manipulation looks not clear as upstream package + ;; contains "nox/tox_to_nox.jinja2" file which is not copied + ;; during install phase and causes check and sanity-check + ;; phases fail due to missing file. Try to find more simple + ;; solution. + (add-after 'unpack 'rename-tox-to-nox-jinja2 + (lambda _ + (rename-file "nox/tox_to_nox.jinja2" "nox/tox_to_nox.jinja2.py"))) + (add-after 'install 'rename-tox-to-nox-jinja2-back + (lambda _ + (let* ((src-file (car (find-files (string-append #$output "/lib") + "tox_to_nox\\.jinja2\\.py$"))) + (dst-file (string-drop-right src-file 3))) + (rename-file src-file dst-file))))))) + (propagated-inputs + (list python-argcomplete + python-colorlog + python-packaging + python-py + python-virtualenv)) + (native-inputs + (list python-jinja2 + python-pytest + python-tox)) + (home-page "https://nox.thea.codes/") + (synopsis "Flexible test automation") + (description + "@code{nox} is a command-line tool that automates testing in multiple +Python environments, similar to @code{tox}. Unlike tox, Nox uses a standard +Python file for configuration.") + (license license:asl2.0))) + (define-public python-tox (package (name "python-tox") -- cgit 1.4.1 From 0e14096c586ac176d0bc2a305e48e4b8b21e796a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 23 Dec 2022 14:08:36 +0000 Subject: gnu: cmake: Update to 3.25.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cmake.scm (cmake): Update to 3.25.1. Signed-off-by: Ludovic Courtès --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 87fde01f63..d9b996986b 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -333,7 +333,7 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (name "cmake") - (version "3.24.2") + (version "3.25.1") (source (origin (inherit (package-source cmake-minimal)) (method url-fetch) @@ -348,7 +348,7 @@ and workspaces that can be used in the compiler environment of your choice.") ,@rest)))) (sha256 (base32 - "1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d")) + "1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w")) (patches (search-patches "cmake-curl-certificates-3.24.patch")))) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From ae52644c7f1b67df2c39aba492e4c312c8c65487 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 23 Dec 2022 20:06:19 +0800 Subject: gnu: podman: Enable Btrfs support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/containers.scm (podman): Enable Btrfs support. Signed-off-by: Ludovic Courtès --- gnu/packages/containers.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 985dea7bdb..5761d40420 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -281,6 +281,10 @@ configure network interfaces in Linux containers.") (uri (git-reference (url "https://github.com/containers/podman") (commit (string-append "v" version)))) + (modules '((guix build utils))) + ;; FIXME: Btrfs libraries not detected by these scripts. + (snippet '(substitute* "Makefile" + ((".*hack/btrfs.*") ""))) (sha256 (base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h")) (file-name (git-file-name name version)))) -- cgit 1.4.1 From 8532564077dfe2fa56d8e0d0b39af8360a283dce Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 3 Jan 2023 16:48:20 +0100 Subject: gnu: spirv-cross: Activate tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?. <#:phases>: Add ‘update-reference-shaders’. Signed-off-by: Ludovic Courtès --- gnu/packages/vulkan.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f5c619a2b2..a2db5511d5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -120,11 +120,6 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (arguments `(#:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") - ;; FIXME: The following tests fail: - ;; 15 - spirv-cross-test-opt - ;; 16 - spirv-cross-test-metal-opt - ;; 17 - spirv-cross-test-hlsl-opt - #:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests-to-find-deps @@ -134,8 +129,11 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (string-append (assoc-ref inputs "glslang") "/bin"))) (substitute* "CMakeLists.txt" (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") - (string-append (assoc-ref inputs "spirv-tools") "/bin"))) - #t))))) + (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) + (add-before 'check 'update-reference-shaders + (lambda _ + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh"))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) -- cgit 1.4.1 From 22da3490233da4eeec3d810e676adb484235602f Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 20 Jan 2023 16:51:19 +0000 Subject: gnu: vnstat: Update to 2.10. * gnu/packages/networking.scm (vnstat): Update to 2.10. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 45dfee34b3..74f009e14e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4562,7 +4562,7 @@ implementations.") (define-public vnstat (package (name "vnstat") - (version "2.9") + (version "2.10") (source (origin (method url-fetch) @@ -4570,7 +4570,7 @@ implementations.") version ".tar.gz")) (sha256 (base32 - "1iwxmnpabfljvyng7c8k3z83yw1687i66z5s1980c5x9vrsi98hi")))) + "09bx8mz9jdq94i0mpmjbc7dis0klvjx85lml5mp3d36dwm21gim9")))) (build-system gnu-build-system) (inputs (list sqlite)) (native-inputs (list pkg-config check)) -- cgit 1.4.1 From 0b57ebb595e1f7965c6e25b071b50a078009b88b Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 20 Jan 2023 16:51:20 +0000 Subject: gnu: vnstat: Use G-Expressions. * gnu/packages/networking.scm (vnstat)[arguments]: Use G-Expressions. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 74f009e14e..2e9d018294 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4575,15 +4575,16 @@ implementations.") (inputs (list sqlite)) (native-inputs (list pkg-config check)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'disable-id-tests - (lambda _ - (substitute* - '("Makefile" "tests/vnstat_tests.c") - (("tests/id_tests.c \\$") "\\") - (("tests/id_tests.h h") "h") - (("^.*id_tests.*$") ""))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'disable-id-tests + (lambda _ + (substitute* + '("Makefile" "tests/vnstat_tests.c") + (("tests/id_tests.c \\$") "\\") + (("tests/id_tests.h h") "h") + (("^.*id_tests.*$") ""))))))) (home-page "https://humdi.net/vnstat/") (synopsis "Network traffic monitoring tool") (description "vnStat is a console-based network traffic monitor that keeps -- cgit 1.4.1 From b6b0291918ed690f82df4f412a9558fc9f3299b7 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 20 Jan 2023 16:51:21 +0000 Subject: gnu: vnstat: Build vnstati. * gnu/packages/networking.scm (vnstat)[inputs]: Add gd. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2e9d018294..7301b8c844 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -111,6 +111,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gd) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -4572,7 +4573,7 @@ implementations.") (base32 "09bx8mz9jdq94i0mpmjbc7dis0klvjx85lml5mp3d36dwm21gim9")))) (build-system gnu-build-system) - (inputs (list sqlite)) + (inputs (list sqlite gd)) (native-inputs (list pkg-config check)) (arguments (list -- cgit 1.4.1 From 8c62becaaa3c3a22f5c6e1dc3c39ada1935680fe Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 23 Jan 2023 13:46:25 -0500 Subject: gnu: libwacom: Update to 2.6.0. * gnu/packages/xdisorg.scm (libwacom): Update to 2.6.0. [phases]: Remove 'fix-tests phase. [synopsis, description]: libwacom supports graphics tablets from vendors other then wacom. Signed-off-by: Christopher Baines --- gnu/packages/xdisorg.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f6f015732d..2ebeb4e013 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1357,7 +1357,7 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "2.4.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append @@ -1365,18 +1365,11 @@ Escape key when Left Control is pressed and released on its own.") "libwacom-" version "/libwacom-" version ".tar.xz")) (sha256 (base32 - "056l5dndd8654bmwlxxhvx8082s7pp9bg0wm68zb56iz3rv25l6h")))) + "13x978gzyw28cqd985m5smiqgza0xp3znb1s0msmn8vmjjlwqxi3")))) (build-system meson-build-system) (arguments (list - #:configure-flags #~(list "--default-library=shared") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - ;; Do not attempt to run systemd-specific commands. - (substitute* "test/test_udev_rules.py" - (("(systemd-hwdb|systemctl)") - "true"))))))) + #:configure-flags #~(list "--default-library=shared"))) (native-inputs (list pkg-config ;; For tests. @@ -1391,9 +1384,9 @@ Escape key when Left Control is pressed and released on its own.") ;; libwacom.pc 'Requires' these: (list glib libgudev)) (home-page "https://linuxwacom.github.io/") - (synopsis "Helper library for Wacom tablet settings") + (synopsis "Helper library for graphics tablet settings") (description - "Libwacom is a library to help implement Wacom tablet settings. It is + "Libwacom is a library to help implement graphics tablet settings. It is intended to be used by client-programs that need model identification. It is already being used by the gnome-settings-daemon and the GNOME Control Center Wacom tablet applet.") -- cgit 1.4.1 From 01f1e8bbb24bb41cf506f681470ba3b530ccae1e Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 24 Jan 2023 16:13:15 +0800 Subject: gnu: kconfig-hardened-check: Update to 0.6.1. * gnu/packages/linux.scm (kconfig-hardened-check): Update to 0.6.1. Signed-off-by: Christopher Baines --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c90fbf396f..5a776168cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9838,7 +9838,7 @@ directly by @code{make localmodconfig} as described above.") (define-public kconfig-hardened-check (package (name "kconfig-hardened-check") - (version "0.5.17") + (version "0.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -9847,7 +9847,7 @@ directly by @code{make localmodconfig} as described above.") (file-name (git-file-name name version)) (sha256 (base32 - "0p9pywfxwyk4yfgaf7bhqrf72ywc6w6k77dbi7lldynha886ih4a")))) + "0bpdy2a7l75y5cqzzc92nh4gapzgza8ml5i8ximr6brf6pr3681z")))) (build-system python-build-system) (home-page "https://github.com/a13xp0p0v/kconfig-hardened-check") (synopsis -- cgit 1.4.1 From bdd107088d2450cebc05daab2fa7218469303a3a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 26 Jan 2023 15:36:38 +0000 Subject: gnu: simdjson: Update to 3.1.0. * gnu/packages/cpp.scm (simdjson): Update to 3.1.0. Signed-off-by: Christopher Baines --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0eecab50fb..6fa4c0f7a0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1818,7 +1818,7 @@ syntax with variables, conditions, functions and more.") (define-public simdjson (package (name "simdjson") - (version "1.0.2") + (version "3.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -1827,7 +1827,7 @@ syntax with variables, conditions, functions and more.") (file-name (git-file-name name version)) (sha256 (base32 - "05i5jnqd7ngps79cws16ls48gnx08ykkkib3n2hbrdhr1wwrnv7a")))) + "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; tests require downloading dependencies -- cgit 1.4.1 From f9f1312de061c5d38b0ca260f306e9ba5a4c7a43 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 26 Jan 2023 20:45:43 +0000 Subject: gnu: shellcheck: Update to 0.9.0. * gnu/packages/haskell-apps.scm (shellcheck): Update to 0.9.0. [inputs]: Add ghc-fgl. Signed-off-by: Christopher Baines --- gnu/packages/haskell-apps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 9cb383eeb2..64dde4d313 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -842,7 +842,7 @@ too slow and you'll get wound up in the scroll and crushed.") (define-public shellcheck (package (name "shellcheck") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) @@ -850,7 +850,7 @@ too slow and you'll get wound up in the scroll and crushed.") "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" version ".tar.gz")) (sha256 - (base32 "05jlapp4m997w36h2wszdxz9gvczdczaylypsbn14jqpb650w232")) + (base32 "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (arguments @@ -868,7 +868,7 @@ too slow and you'll get wound up in the scroll and crushed.") (native-inputs (list pandoc)) (inputs - (list ghc-aeson ghc-diff ghc-quickcheck ghc-regex-tdfa)) + (list ghc-aeson ghc-diff ghc-fgl ghc-quickcheck ghc-regex-tdfa)) (home-page "https://www.shellcheck.net/") (synopsis "Static analysis for shell scripts") (description "@code{shellcheck} provides static analysis for -- cgit 1.4.1 From 9b9e13a81f08c65b4eeca1c9b3d7e33880c192af Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 1 Feb 2023 08:45:08 +0000 Subject: gnu: guix-build-coordinator: Update to 0-70.6b1aa06. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-70.6b1aa06. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index db1462fb94..a2b37207ec 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1357,8 +1357,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "8ca5f045d232124e97069a30253853abc66be03e") - (revision "69")) + (let ((commit "6b1aa0654bf576f0adbb6adc68c5f7e4e0bae874") + (revision "70")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1369,7 +1369,7 @@ environments.") (commit commit))) (sha256 (base32 - "0aq0hca9bfy0djn6vwqbxwpirbd0zmpwbj5m7lq4lpfmn2121lkd")) + "1dnwjfax5mdmzd9xcwgsz0i3x4pvwswnz7a264qg684vdb2h4iz0")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 2088da20ce09576d8d9600c0f07a1c16ce0797fa Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 1 Feb 2023 08:47:00 +0000 Subject: gnu: nar-herder: Update to 0-11.549eb22. * gnu/packages/package-management.scm (nar-herder): Update to 0-11.549eb22. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a2b37207ec..32828d30f5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1666,8 +1666,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "8d219e49c8f1623bdd3622f8c024c40acb0004c2") - (revision "10")) + (let ((commit "549eb2252372f69230ca952ad69c9fd1096e6fed") + (revision "11")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1678,7 +1678,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "0bxhwmfywy03iqmy7a039xr4cb9vfjsqpj7w5ybhmiqhf0yv9hpa")) + "1pa020yfzihsil6mcr8f52wyjcmj84dzcxdch6zfvp7xpsppcw4l")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From aa2c59359e11e47342083e530d399c5dbe54a7c7 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 27 Jan 2023 17:51:48 +0400 Subject: gnu: obs: Update to 29.0.0. * gnu/packages/video.scm (obs): Update to 29.0.0. [arguments]: Disable new NEW_MPEGTS_OUTPUT and AJA due to missing dependencies. [inputs]: Add libglvnd, libva, vlc. --- gnu/packages/video.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index adec7d9269..b86d305a5f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -48,7 +48,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Alexey Abramov -;;; Copyright © 2021 Andrew Tropin +;;; Copyright © 2021, 2022, 2023 Andrew Tropin ;;; Copyright © 2021 David Wilson ;;; Copyright © 2021,2022 Maxim Cournoyer ;;; Copyright © 2020 Hartmut Goebel @@ -3398,7 +3398,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "27.2.4") + (version "29.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -3408,7 +3408,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "13bfzjqmvabli99yr1h0306w5lx72mbl5sxrnr46hjig1a6rw91s")) + "15nvvlpryvlbf76918jvygg1985glz38cndfgnc2c0009vdb9qbk")) (patches (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) @@ -3417,6 +3417,8 @@ be used for realtime video capture via Linux-specific APIs.") #:configure-flags #~(list (string-append "-DOBS_VERSION_OVERRIDE=" #$version) "-DENABLE_UNIT_TESTS=ON" + "-DENABLE_NEW_MPEGTS_OUTPUT=OFF" + "-DENABLE_AJA=OFF" ;; Browser plugin requires cef, but it is not packaged yet. ;; "-DBUILD_BROWSER=OFF") @@ -3450,6 +3452,8 @@ be used for realtime video capture via Linux-specific APIs.") glib jack-1 jansson + libglvnd + libva libx264 libxcomposite libxkbcommon @@ -3466,6 +3470,7 @@ be used for realtime video capture via Linux-specific APIs.") qtwayland-5 speexdsp v4l-utils + vlc wayland wayland-protocols zlib)) -- cgit 1.4.1 From 14323edcc37d9efaae2491cf5f57ea0621412d7e Mon Sep 17 00:00:00 2001 From: Ott Joon Date: Sun, 22 Jan 2023 00:33:13 +0200 Subject: gnu: Add obs-vkcapture. * gnu/packages/video.scm (obs-vkcapture): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/video.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b86d305a5f..54cf7be9a7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -63,6 +63,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Chadwain Holness ;;; Copyright © 2022 Andy Tai +;;; Copyright © 2023 Ott Joon ;;; ;;; This file is part of GNU Guix. ;;; @@ -3576,6 +3577,38 @@ programs on your current machine or on other machines.") Wayland compositors.") (license license:gpl3+))) +(define-public obs-vkcapture + (package + (name "obs-vkcapture") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nowrep/obs-vkcapture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18v15bfzm31qkpwipvbqgzak4z6f2hhq6mnz2bvhwnv57whirln6")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ;no tests + (native-inputs (list pkg-config)) + (inputs (list mesa + obs + libx11 + libxcb + vulkan-headers + vulkan-loader + wayland)) + (home-page "https://github.com/nowrep/obs-vkcapture") + (synopsis "OBS plugin for Vulkan/OpenGL game capture on Linux") + (description + "This OBS plugin lets you record an OpenGL or Vulkan +game by adding the Game Capture source to your scene and starting an +application with @code{obs-gamecapture}.") + (license license:gpl2))) + (define-public libvdpau (package (name "libvdpau") -- cgit 1.4.1 From 9d7a1e58f91889d5a5330d4bf9911102f2e66db9 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 29 Jan 2023 12:17:46 -0600 Subject: gnu: sbcl-djula: Update home-page. * gnu/packages/lisp-xyz.scm (sbcl-djula)[home-page]: Update it. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3551da7bb6..4c60f3d62a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19287,7 +19287,7 @@ CL-I18N and CL-L10N.") sbcl-parser-combinators sbcl-split-sequence sbcl-trivial-backtrace)) - (home-page "https://mmontone.github.io/djula/") + (home-page "https://mmontone.github.io/djula/djula/") (synopsis "Common Lisp port of the Django templating language") (description "This package provides a Common Lisp templating system based on Python -- cgit 1.4.1 From 4b15cb672d589a0ebde6c135d5f7b7b9412435c1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 30 Jan 2023 08:01:20 +0100 Subject: gnu: mupdf: Update to 1.21.1. * gnu/packages/pdf.scm (mupdf): Update to 1.21.1. [arguments]: Remove superfluous make flag. Signed-off-by: Nicolas Goaziou --- gnu/packages/pdf.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8f3bec35d6..cf5a7af6e0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -758,15 +758,14 @@ and based on PDF specification 1.7.") (define-public mupdf (package (name "mupdf") - (version "1.20.3") + (version "1.21.1") (source (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" "mupdf-" version "-source.tar.lz")) (sha256 - (base32 - "0s0qclxxdjis04mczgz0fhfpv0j8llk48g82zlfrk0daz0zgcwvg")) + (base32 "0876sn5nd8vyw9d3d3bmripm119jy6734rs0ywppqzvccy839936")) (modules '((guix build utils))) (snippet #~(begin @@ -814,14 +813,13 @@ and based on PDF specification 1.7.") "USE_SYSTEM_JPEGXR=no # not available" "USE_SYSTEM_LCMS2=no # lcms2mt is strongly preferred" "USE_SYSTEM_LIBJPEG=yes" - "USE_SYSTEM_MUJS=no # not available" + "USE_SYSTEM_MUJS=yes" "USE_SYSTEM_OPENJPEG=yes" "USE_SYSTEM_ZLIB=yes" "USE_SYSTEM_GLUT=no" "USE_SYSTEM_CURL=yes" "USE_SYSTEM_LEPTONICA=yes" "USE_SYSTEM_TESSERACT=yes" - "USE_SYSTEM_MUJS=yes" "shared=yes" (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") (string-append "prefix=" #$output)) -- cgit 1.4.1 From 37caa83c70c221ba6f80238286d70a910e79c8d4 Mon Sep 17 00:00:00 2001 From: Martin Marshall Date: Tue, 31 Jan 2023 11:38:47 -0500 Subject: gnu: Add emacs-pretty-speedbar. * gnu/packages/emacs-xyz.scm (emacs-pretty-speedbar): Add variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ba2916a463..3c8c201145 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6975,6 +6975,32 @@ direct access to the SQLite C interface. It only exposes a subset of the full SQLite C interface, but should satisfy most user's needs.") (license license:gpl3+))) +(define-public emacs-pretty-speedbar + (let ((commit "56dc9f114fcc55843e182cde1fc9d7a14c261c6a") + (revision "0")) + (package + (name "emacs-pretty-speedbar") + (version (git-version "0.2" revision commit)) + (source (origin + (uri (git-reference + (url "https://github.com/kcyarn/pretty-speedbar") + (commit commit))) + (method git-fetch) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hz67jhvg9n9d07lil6zqciqhh512k0fv54dl605p7vi704ma2ir")))) + (build-system emacs-build-system) + (propagated-inputs (list font-awesome)) + (home-page "https://github.com/kcyarn/pretty-speedbar") + (synopsis "SVG icons for the Emacs Speedbar") + (description + "This package generates and implements appealing SVG icons for the +Emacs Speedbar. By default, it generates icons from the Font Awesome fontset. +However, alternative fontsets may also be used, and the color of the icons may +be customized.") + (license license:gpl3+)))) + (define-public emacs-sr-speedbar (let ((commit "77a83fb50f763a465c021eca7343243f465b4a47") (revision "0")) -- cgit 1.4.1 From df6a6f8cf13a70ebf76b3b667eeb5949bae93cce Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 31 Jan 2023 10:47:42 +0100 Subject: gnu: emacs-ibrowse: Update to 0.1.8. * gnu/packages/emacs-xyz.scm (emacs-ibrowse): Update to 0.1.8. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c8c201145..c93c2b2575 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22302,28 +22302,25 @@ within Emacs.") (license license:gpl3+)))) (define-public emacs-ibrowse - (let* ((commit "7e4a2987fc63861514b441f65db2008da5949ef2") - (revision "0")) - (package - (name "emacs-ibrowse") - (version (git-version "0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~ngraves/ibrowse.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "15661xgjxdxk1p0g87dsas9jd9v7g64y6n9irlbyzww09gjsjwwd")))) - (build-system emacs-build-system) - (inputs (list sqlite)) - (propagated-inputs (list emacs-embark emacs-marginalia)) - (home-page "https://git.sr.ht/~ngraves/ibrowse.el") - (synopsis "Interact with your browser from emacs") - (description "This package provides some commands to act on the browser + (package + (name "emacs-ibrowse") + (version "0.1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~ngraves/ibrowse.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya")))) + (build-system emacs-build-system) + (inputs (list sqlite)) + (home-page "https://git.sr.ht/~ngraves/ibrowse.el") + (synopsis "Interact with your browser from emacs") + (description "This package provides some commands to act on the browser tabs, history, or bookmarks from Emacs.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-ibuffer-projectile (package -- cgit 1.4.1 From 0de13907faf623a2065a790d91948da3d1fad534 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Sun, 29 Jan 2023 15:44:48 -0600 Subject: gnu: Add uwufetch. * gnu/packages/admin.scm (uwufetch): Add uwufetch. --- gnu/packages/admin.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5cea17d562..46b38ef053 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2022 Matthew James Kraai ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -3944,6 +3945,48 @@ be used in screenshots to show other users what operating system or distribution you are running, what theme or icon set you are using, etc.") (license license:expat))) +(define-public uwufetch + (package + (name "uwufetch") + (version "2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TheDarkBug/uwufetch") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s4pzaqmlq6rn54kgmlpcrc0sy3q5zn6lxh4448k9iimshljsjfs")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no tests + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + (string-append "ETC_DIR=" #$output "/etc") + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'path-source-paths + (lambda _ + (substitute* "uwufetch.c" + (("(/usr(/local)?)(.*;)" all _ _ rest) + (string-append #$output rest)))))))) + (inputs (list lshw + ;; viu XXX not yet packaged in Guix + xwininfo)) + (home-page "https://github.com/TheDarkBug/uwufetch") + (synopsis "Meme system info tool based on Nyan/UwU trend") + (description + "UwUFetch is a system information tool in the lineage of NeoFetch, +PFetch, HyFetch, and the like. It prints ASCII art of your system's logo as +well as a summary of system information. UwUFetch's unique contribution is the +uwu-ification of various words used in the description. For example, Guix +becomes gUwUix.") + (license license:gpl3+))) + (define-public screenfetch (package (name "screenfetch") -- cgit 1.4.1 From 05dd97b546b11f51224e1e4daa6c9e687a150fa5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:09:08 +0100 Subject: gnu: emacs-auctex: Update to 13.1.9. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.1.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c93c2b2575..87e0c00c6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3508,14 +3508,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.1.8") + (version "13.1.9") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0xw5gd8y5hy9h4c6isbk044n16gkcfafi2xyrs9ibvhrncrxph46")))) + (base32 "0dvf7ajfpi68823qv9vav3r1k04gc9bfq2ys3g1rhga2glxn7q9r")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit 1.4.1 From 8d72bbacf614206ab87cd4962781157a598752e6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:09:14 +0100 Subject: gnu: emacs-compat: Update to 29.1.3.2. * gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 87e0c00c6d..71e7b59254 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7908,14 +7908,14 @@ variables, and so on. The mode also allows you to execute Tup commands.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.3.1") + (version "29.1.3.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "025idv426a2igaz7ijf5njjdi53zm5lmf345a1smv03iqx3fyj81")))) + "0lzfqiimfpd22bv0pw3j6lgbd7ni1mah24jddwx96sf65s39f9hz")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") -- cgit 1.4.1 From 04d0a47afe16882fadab4796fab60631595fa6ca Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:09:22 +0100 Subject: gnu: emacs-url-scgi: Update to 0.9. * gnu/packages/emacs-xyz.scm (emacs-url-scgi): Update to 0.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 71e7b59254..d2fd2c5c6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15651,14 +15651,14 @@ automatically discovered and presented in recency order.") (define-public emacs-url-scgi (package (name "emacs-url-scgi") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "url-scgi-" version ".tar")) (sha256 (base32 - "1837vyamwk5mp2nf3k477hyr5pq1xy6p7br7kl6h2k8jmxqy3mlj")))) + "0mfbqr03302gk38aamlg1lgdznd6y3blcc3zizfb72ppb87j78mc")))) (build-system emacs-build-system) (home-page "https://github.com/skangas/url-scgi/") (synopsis "SCGI support for url.el") -- cgit 1.4.1 From 0dd0207476d0dba978eb23da1e8edc601ba8770d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:09:28 +0100 Subject: gnu: emacs-pyim: Update to 5.3.0. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 5.3.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d2fd2c5c6a..37352b897d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16836,13 +16836,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "5.2.9") + (version "5.3.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "0blsz344jq1zx4qs73zinb8fhh2a35k5nx12i2wn76902qx2qc6j")))) + (base32 "0q0h705k1yymp1pqyycmq1zqvzawzkl4q2ckvflbncgrqh306xmh")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async emacs-popup emacs-posframe emacs-xr)) -- cgit 1.4.1 From 3046063645c9f564b1ce6c7f72b226ec4cd10407 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:09:35 +0100 Subject: gnu: emacs-tramp: Update to 2.6.0.1. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.6.0.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 37352b897d..58a5035550 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29560,14 +29560,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.0") + (version "2.6.0.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1y58k0qdc9i3av61p9ks7hg5vynsi2zslv5mswcbd1wf23iggr7c")))) + (base32 "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 43eed907d22b094c5a9b2931ca5e72caf2b95991 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Feb 2023 22:14:30 +0100 Subject: gnu: emacs-embark: Update to 0.21.1. * gnu/packages/emacs-xyz.scm (emacs-embark): Update to 0.21.1. --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 58a5035550..c2c0fb93ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10302,25 +10302,26 @@ them easier to distinguish from other, less important buffers.") (license license:expat))) (define-public emacs-embark - (package - (name "emacs-embark") - (version "0.19") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oantolin/embark") - (commit version))) - (sha256 - (base32 "05c8p7rqv9p8p3nhgcjfr66hpsqazhnhwsnfdapxd9z7wrybqbg5")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-avy emacs-consult)) - (home-page "https://github.com/oantolin/embark") - (synopsis "Emacs mini-buffer actions rooted in keymaps") - (description - "This package provides a sort of right-click contextual menu for Emacs + (let ((commit "63013c2d3ef4dccc95167218ccbf4f401e489c3e")) ;version bump + (package + (name "emacs-embark") + (version "0.21.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oantolin/embark") + (commit commit))) + (sha256 + (base32 "14qp46wa1xgmb09jyk9cadj0b3m7bwspqnprk3zbfc6gw1r53235")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-avy emacs-consult)) + (home-page "https://github.com/oantolin/embark") + (synopsis "Emacs mini-buffer actions rooted in keymaps") + (description + "This package provides a sort of right-click contextual menu for Emacs offering you relevant @emph{actions} to use on a @emph{target} determined by the context. @@ -10334,7 +10335,7 @@ get offered actions like deleting, copying, renaming, visiting in another window, running a shell command on the file, etc. For buffers the actions include switching to or killing the buffer. For package names the actions include installing, removing or visiting the homepage.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-prescient (package -- cgit 1.4.1 From 45e39334212a89b90e1ce604b1f3b22839ce31ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Feb 2023 09:39:41 +0100 Subject: gnu: sfizz: Do not delete bundled simde headers. * gnu/packages/music.scm (sfizz)[source]: Keep simde headers because we can't provide the required version. --- gnu/packages/music.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e5aacb54eb..fc581a170e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2019 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus +;;; Copyright © 2015-2023 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner @@ -4853,7 +4853,9 @@ standalone JACK client and an LV2 plugin is also available.") (snippet '(for-each delete-file-recursively '("external/abseil-cpp" - "external/simde" + ;; This package needs an unreleased version of + ;; simde. + ;; "external/simde" "plugins/editor/external/vstgui4" "plugins/vst" "src/external/pugixml"))))) -- cgit 1.4.1 From f5446f721121c50a6e8fdf1e7285d861dfd180b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Feb 2023 13:00:14 +0100 Subject: gnu: liquidsfz: Update to 0.3.1. * gnu/packages/music.scm (liquidsfz): Update to 0.3.1. [source]: Fetch with git. [arguments]: Replace 'bootstrap phase. [native-inputs]: Add autoconf, automake, and libtool. [inputs]: Drop labels. --- gnu/packages/music.scm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fc581a170e..967d9e4b23 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4812,24 +4812,32 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public liquidsfz (package (name "liquidsfz") - (version "0.2.3") + (version "0.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://space.twc.de/~stefan/liquidsfz/" - "liquidsfz-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/swesterfeld/liquidsfz") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1hb4hc3gkvjfbx0ls6wxzavhv2hf9ix11cz8yvndyb6q9lwkimwl")))) + "0kijisxv8f8ihv8rk5cg1cmdh29zkr7i2ghds6wz0iq9mdkga12s")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-shared"))) + (list + #:configure-flags '(list "--enable-shared") + #:phases + '(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The default 'bootstrap' phase would run 'autogen.sh', which + ;; would try to run ./configure and fail due to unpatched + ;; shebangs. + (invoke "autoreconf" "-v" "--install")))))) (native-inputs - (list pkg-config)) + (list autoconf automake libtool pkg-config)) (inputs - `(("jack" ,jack-2) - ("lv2" ,lv2) - ("readline" ,readline) - ("libsndfile" ,libsndfile))) + (list jack-2 libsndfile lv2 readline)) (home-page "https://github.com/swesterfeld/liquidsfz") (synopsis "Sampler library") (description "The main goal of liquidsfz is to provide an SFZ sampler -- cgit 1.4.1 From 301f12832601eef6b130f3946d9d597ae43a514a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Feb 2023 16:53:32 +0200 Subject: gnu: busybox: Update to 1.36.0. * gnu/packages/busybox.scm (busybox): Update to 1.36.0. --- gnu/packages/busybox.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index dd1f1f34b6..32239106b7 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016-2020, 2023 Efraim Flashner ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2022 LuHui ;;; @@ -35,7 +35,7 @@ (define-public busybox (package (name "busybox") - (version "1.35.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (string-append @@ -43,7 +43,7 @@ version ".tar.bz2")) (sha256 (base32 - "1556hfgw32xf226dd138gfq0z1zf4r3f8naa9wrqld2sqd2b5vps")))) + "19b1mzkc2hc2qsg4fnshdyqfxk1xkzwv900p40767ckwmz4509sl")))) (build-system gnu-build-system) (arguments (list #:phases -- cgit 1.4.1 From d081dd1ca1f43fb8a1cccadb31e684ecdcb5aa29 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 2 Feb 2023 21:49:29 +0100 Subject: gnu: seer-gdb: Update to 1.14. * gnu/packages/debug.scm (seer-gdb): Update to 1.14. --- gnu/packages/debug.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 1c4f570fe4..22b3cd862d 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -834,7 +834,7 @@ engineering.") (define-public seer-gdb (package (name "seer-gdb") - (version "1.11") + (version "1.14") (source (origin (method git-fetch) (uri (git-reference @@ -843,7 +843,7 @@ engineering.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0778573rixhdanmzp4slghpwgv7pm08n7cpa24rm3wrvs77ic3kb")))) + "16mz1c58jf1zrgjpxmp58bx8viyidhs1qg0y8ql2f07wgyy6zx33")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; Those are strangely manual -- cgit 1.4.1 From 74f15a002cf2979f3268afeed61aa1aef09ea4fa Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 2 Feb 2023 21:53:23 +0100 Subject: gnu: nvc: Update to 1.8.1. * gnu/packages/fpga.scm (nvc): Update to 1.8.1. [inputs]: Add libffi. --- gnu/packages/fpga.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index acce5f8f82..a516e4dc7e 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -433,7 +433,7 @@ a hardware description and verification language.") (define-public nvc (package (name "nvc") - (version "1.7.2") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -442,7 +442,7 @@ a hardware description and verification language.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "01b0yhr0fw59nxwi4pz04mp9b71mg6s7zaysp0r8h0m2nd5pbpgc")))) + "03dnn77n50b5n06gd81hh36gh0h2nc266yzwl70qjlb00qs8cf7p")))) (build-system gnu-build-system) (arguments `(#:out-of-source? #t @@ -464,7 +464,8 @@ a hardware description and verification language.") check)) ; for the tests (inputs (list elfutils - llvm-9)) + llvm-9 + libffi)) (synopsis "VHDL compiler and simulator") (description "This package provides a VHDL compiler and simulator.") (home-page "https://www.nickg.me.uk/nvc/") -- cgit 1.4.1 From d6684362d862bbc2fe6571a3b6ca93558c16505a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 1 Feb 2023 21:31:23 +0100 Subject: gnu: linux-libre: Update to 6.1.9. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.9. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5a776168cc..af46f791a6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,17 +481,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.8") +(define-public linux-libre-6.1-version "6.1.9") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "0p1cg5khpp8xkfaqy0cnp1m273z3xiz0m97rkrkggz9gr2klrjym") - (base32 "0va28vs359r0rfmzh8pw58055kgd8sb62gi78vrg9p8wmj4s87v6"))) + (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn"))) + (hash (base32 "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From e584acf3e9c9a1b27c0236f572f20b323cd3a7c4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 1 Feb 2023 21:31:49 +0100 Subject: gnu: linux-libre 5.15: Update to 5.15.91. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.91. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index af46f791a6..281acbf0e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,17 +499,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.90") +(define-public linux-libre-5.15-version "5.15.91") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") - (base32 "1m73pgx8v047xb2gck2g7j7khniis8c9akn9vhzgsdfglrf8p6fj"))) + (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6"))) + (hash (base32 "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 84cb535d49041000211c19ed185075db3d48dc17 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 1 Feb 2023 21:32:04 +0100 Subject: gnu: linux-libre 5.10: Update to 5.10.166. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.166. (linux-libre-5.10-pristine-source, deblob-scripts-5.10): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 281acbf0e6..e105bad406 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,17 +514,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.165") +(define-public linux-libre-5.10-version "5.10.166") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf") - (base32 "0a96g4pjdgwvxn2wpz6rfc8nwdlkw138r9pp66kvfrrn08i313ii"))) + (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"))) + (hash (base32 "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From eddb1c42d469b11cc0cb0cd24c73141b1dad2397 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Feb 2023 11:14:08 +0100 Subject: gnu: sbcl-cmd: Update to 20230203. * gnu/packages/lisp-xyz.scm (sbcl-cmd): Update to 20230203. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4c60f3d62a..21642034b5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -16429,10 +16429,10 @@ standard library.") (sbcl-package->cl-source-package sbcl-shlex)) (define-public sbcl-cmd - (let ((commit "fda9e6bd9137ea806313151716fd87578cdbc882")) + (let ((commit "dda16c251992d2711dd98a073c436e73355cdb15")) (package (name "sbcl-cmd") - (version (git-version "0.0.1" "6" commit)) + (version (git-version "0.0.1" "7" commit)) (source (origin (method git-fetch) @@ -16441,7 +16441,7 @@ standard library.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0j2yns565mp2rsiz8lc75psk7wws9qz8rh74n4vf9zdyrw16ckpf")))) + (base32 "1m72vir64h21y3z1dmdywr0r3dl9lwawgd5p9g0cl3bgmz2wjgqr")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit 1.4.1 From ef879d7f40cdefc32718008d493c58c881273147 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 2 Feb 2023 11:15:04 +0100 Subject: gnu: Add r-streamgraph. * gnu/packages/bioinformatics.scm (r-streamgraph): New variable. --- gnu/packages/bioinformatics.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8c75607a65..8be8976a15 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -690,6 +690,41 @@ high-throughput sequence analysis. The package is primarily useful to developers of other R packages who wish to make use of HTSlib.") (license license:lgpl2.0+)))) +(define-public r-streamgraph + (let ((commit "76f7173ec89d456ace5943a512e20b1f6810bbcb") + (revision "1")) + (package + (name "r-streamgraph") + (version (git-version "0.9.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hrbrmstr/streamgraph") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "010rhnby5a9dg08jvlkr65b3p9iipdxi2f5m1k6j53s80p25yvig")))) + (properties `((upstream-name . "streamgraph"))) + (build-system r-build-system) + (propagated-inputs + (list r-dplyr + r-htmltools + r-htmlwidgets + r-magrittr + r-tidyr + r-xts)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/hrbrmstr/streamgraph") + (synopsis "Htmlwidget for building streamgraph visualizations") + (description + "A streamgraph is a type of stacked area chart. It represents the +evolution of a numeric variable for several groups. Areas are usually +displayed around a central axis, and edges are rounded to give a flowing +shape. This package provides an @code{htmlwidget} for building streamgraph +visualizations.") + (license license:expat)))) + (define-public pbbam (package (name "pbbam") -- cgit 1.4.1 From 89d76adf98e37ecef65cc71804df5b5fada8e774 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 2 Feb 2023 17:00:22 +0100 Subject: gnu: Add python-pegasusio. * gnu/packages/bioinformatics.scm (python-pegasusio): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8be8976a15..b8676b0ece 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1138,6 +1138,37 @@ protocol. It provides a simple and reliable way to retrieve genomic data from servers supporting the protocol.") (license license:asl2.0))) +(define-public python-pegasusio + (package + (name "python-pegasusio") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pegasusio" version)) + (sha256 + (base32 + "0gqygspdy398vjymdy6756jmk99s7fhwav9rivdx59kpqjcdxaz9")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-anndata + python-docopt + python-h5py + python-importlib-metadata + python-loompy + python-natsort + python-numpy + python-pandas + python-pillow + python-scipy + python-zarr)) + (native-inputs (list python-cython python-setuptools-scm)) + (home-page "https://github.com/lilab-bcb/pegasusio") + (synopsis "Read or write single-cell genomics data") + (description + "Pegasusio is a Python package for reading or writing single-cell +genomics data.") + (license license:bsd-3))) + (define-public python-phylophlan (package (name "python-phylophlan") -- cgit 1.4.1 From 59b102cab9d66ba0c561ed9ed8df04f9fc340bd2 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 2 Feb 2023 17:00:23 +0100 Subject: gnu: Add python-demuxem. * gnu/packages/bioinformatics.scm (python-demuxem): New variable. --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b8676b0ece..1da464f3c5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1092,6 +1092,35 @@ from high-throughput single-cell RNA sequencing (scRNA-seq) data.") and sequence consensus.") (license license:expat))) +(define-public python-demuxem + (package + (name "python-demuxem") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "demuxEM" version)) + (sha256 + (base32 + "1bhyxqjk44bmyd26m1smapf68wyf7252kk65i27k50dd3kswgnd6")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-docopt + python-importlib-metadata + python-numpy + python-pandas + python-pegasusio + python-scikit-learn + python-scipy + python-seaborn)) + (native-inputs (list python-cython python-setuptools-scm)) + (home-page "https://github.com/lilab-bcb/demuxEM") + (synopsis "Analyze cell-hashing/nucleus-hashing data") + (description + "This is a Python module for analyzing cell-hashing/nucleus-hashing data. +It is the demultiplexing module of Pegasus, which is used by Cumulus in the +demultiplexing step.") + (license license:bsd-3))) + (define-public python-hclust2 (package (name "python-hclust2") -- cgit 1.4.1 From 157b94ead7ea64c945b8dc11f8a8800350ef53a5 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 2 Feb 2023 14:04:48 -0500 Subject: gnu: Add wasm3. * gnu/packages/web.scm (wasm3): New variable. --- gnu/packages/web.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a29f53108c..c527ff80df 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Paul A. Patience ;;; Copyright © 2022 Bruno Victal +;;; Copyright © 2023 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1557,6 +1558,53 @@ These tools are intended for use in (or for development of) toolchains or other systems that want to manipulate WebAssembly files.") (license license:asl2.0))) +(define-public wasm3 + (package + (name "wasm3") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wasm3/wasm3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2")))) + (build-system cmake-build-system) + (arguments + ;; The default WASI option "uvwasi" causes CMake to initiate a 'git + ;; clone' which cannot happen within the build container. + '(#:configure-flags '("-DBUILD_WASI=simple") + ;; No check target. There are tests but they require a network + ;; connection to download the WebAssembly core test suite. + #:tests? #f + ;; There is no install target. Instead, we have to manually copy the + ;; wasm3 build artifacts to the output directory. + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bindir (string-append out "/bin")) + (includedir (string-append out "/include")) + (libdir (string-append out "/lib"))) + (mkdir-p bindir) + (mkdir-p includedir) + (mkdir-p libdir) + (copy-file "wasm3" (string-append bindir "/wasm3")) + (for-each (lambda (header) + (copy-file header + (string-append includedir "/" + (basename header)))) + (find-files "../source/source" "\\.h$")) + (copy-file "source/libm3.a" + (string-append libdir "/libm3.a")))))))) + (home-page "https://github.com/wasm3/wasm3") + (synopsis "WebAssembly interpreter") + (description "WASM3 is a fast WebAssembly interpreter.") + (license license:expat))) + (define-public websocketpp (package (name "websocketpp") -- cgit 1.4.1 From b8dc4afcbcd2b5e40f570c4d92f79e8b1008e4bf Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 2 Feb 2023 14:27:13 -0500 Subject: gnu: Add minifb. * gnu/packages/graphics.scm (minifb): New variable. --- gnu/packages/graphics.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ebf571d93e..a9162e53a6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 dan ;;; Copyright © 2023 Sharlatan Hellseher +;;; Copyright © 2023 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -234,6 +235,52 @@ minimum of resource usage and overhead.") (home-page "https://github.com/deniskropp/DirectFB") (license license:lgpl2.1+))) +(define-public minifb + (let ((commit "43f8c1309341f4709a471b592d04434326042483") + (revision "1")) + (package + (name "minifb") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/emoon/minifb") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z0720azsgi83yg4ysmfvpvsg0566s2cq59xx52w8w5rpkla4cjh")))) + (build-system cmake-build-system) + (arguments + ;; Don't build examples. + '(#:configure-flags '("-DMINIFB_BUILD_EXAMPLES=0") + #:phases + ;; There is no install target, so we have to copy the static library + ;; and headers to the output directory ourselves. + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (includedir (string-append out "/include")) + (libdir (string-append out "/lib"))) + (mkdir-p includedir) + (mkdir-p libdir) + (for-each (lambda (header) + (copy-file header + (string-append includedir "/" + (basename header)))) + (find-files "../source/include" "\\.h$")) + (copy-file "libminifb.a" (string-append libdir "/libminifb.a")))))) + ;; No check target. + #:tests? #f)) + ;; libminifb.a won't work without these libraries, so propagate them. + (propagated-inputs (list libx11 libxkbcommon mesa)) + (synopsis "Small library for rendering pixels to a framebuffer") + (description "MiniFB (Mini FrameBuffer) is a small, cross-platform +library that makes it easy to render (32-bit) pixels in a window.") + (home-page "https://github.com/emoon/minifb") + (license license:expat)))) + (define-public flux (package (name "flux") -- cgit 1.4.1 From 0079dd7c8e9314249b1769b8360190038692d2f6 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 2 Feb 2023 15:06:59 -0500 Subject: gnu: Add cubeb. * gnu/packages/audio.scm (cubeb): New variable. --- gnu/packages/audio.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4fbfefafa3..3e46cedd53 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Simon Streit ;;; Copyright © 2022 Andy Tai ;;; Copyright © 2023 Sergiu Ivanov +;;; Copyright © 2023 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -6159,3 +6160,39 @@ streams. For shoutcast style streams it finds the “meta data” or track separation data, and uses that as a marker for where the track should be separated.") (license license:gpl2+))) + +(define-public cubeb + (let ((commit "9e29d728b0025c674904f83f5a13a88d1a6a5edc") + (revision "1")) + (package + (name "cubeb") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla/cubeb") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sxkr3h8a4hd3c3a3cjydrszz6npxk3vh6ra3y67lds3zgc69c7n")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + ;; Sanitizers-cmake requires a git submodule. + '("-DUSE_SANITIZERS=0" + ;; Tests require a git submodule for googletest. + "-DBUILD_TESTS=0" + ;; Use our speex, not a bundled one. + "-DBUNDLE_SPEEX=0" + ;; A static library would be built by default. + "-DBUILD_SHARED_LIBS=1" + ;; Explicitly link against audio libraries so they are on the + ;; runpath. Otherwise cubeb tries to dlopen them at runtime. + "-DCMAKE_SHARED_LINKER_FLAGS=-lasound -lpulse -lspeex") + #:tests? #f)) + (inputs (list alsa-lib pulseaudio speex)) + (synopsis "Cross-platform audio library") + (description "Cubeb is Mozilla's cross-platform audio library.") + (home-page "https://github.com/mozilla/cubeb") + (license license:isc)))) -- cgit 1.4.1 From c19cd9f9470a8d60f8c1f8e0ff26b9cdb0e083ad Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 2 Feb 2023 17:50:03 -0500 Subject: gnu: Add wasm4. * gnu/packages/emulators.scm (wasm4): New variable. --- gnu/packages/emulators.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7c04465526..47cb175d81 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2021 Sou Bunnbu ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2018 David Thompson +;;; Copyright © 2015, 2018, 2023 David Thompson ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2017-2023 Nicolas Goaziou @@ -74,6 +74,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libedit) @@ -1506,6 +1507,57 @@ reference frontend for the libretro API, currently used by most as a modular multi-system game/emulator system.") (license license:gpl3+))) +(define-public wasm4 + (package + (name "wasm4") + (version "2.5.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aduros/wasm4") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ycnznwy4i4fw6l507y5xm986rxqvnpl971725q8xinsnq2swpnl")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ; no check target + #:configure-flags + #~(list (string-append "-DCMAKE_C_FLAGS=" + "-I" #$minifb "/include " + "-I" #$wasm3 "/include")) + #:phases + '(modify-phases %standard-phases + ;; WASM4's source is a combination of multiple runtimes. We want to + ;; build the native one. + (add-after 'unpack 'chdir-to-native-runtime + (lambda _ + (chdir "runtimes/native"))) + ;; WASM4 uses git submodules to bundle several dependencies, which we + ;; have instead made dedicated packages for. This phase hacks the + ;; build system to use our own stuff. + (add-after 'chdir-to-native-runtime 'unbundle + (lambda _ + (substitute* "CMakeLists.txt" + ;; These directories do not exist because we aren't pulling in + ;; submodules. + (("add_subdirectory\\(vendor/minifb\\)") "") + (("add_subdirectory\\(vendor/cubeb\\)") "") + ;; Add additional libraries needed to successfully link the + ;; wasm4 executable using the unbundled dependencies. + (("target_link_libraries\\(wasm4 minifb cubeb\\)") + "target_link_libraries(wasm4 m GL X11 xkbcommon minifb cubeb m3)"))))))) + (inputs (list cubeb minifb wasm3)) + (synopsis "WebAssembly fantasy console") + (description "WASM-4 is a low-level fantasy game console for building +small games with WebAssembly. Game cartridges (ROMs) are small, +self-contained .wasm files that can be built with any programming language +that compiles to WebAssembly.") + (home-page "https://wasm4.org") + (license license:isc))) + (define-public scummvm (package (name "scummvm") -- cgit 1.4.1 From 46c1df1eaba8246ef0fe537783fa55889eca8943 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 3 Feb 2023 15:17:53 +0100 Subject: gnu: nar-herder: Update to 0-12.550e6aa. * gnu/packages/package-management.scm (nar-herder): Update to 0-12.550e6aa. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 32828d30f5..2c4e71ae55 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1666,8 +1666,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "549eb2252372f69230ca952ad69c9fd1096e6fed") - (revision "11")) + (let ((commit "550e6aa414ec143435a8ace061c17e34dcfb4eec") + (revision "12")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1678,7 +1678,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "1pa020yfzihsil6mcr8f52wyjcmj84dzcxdch6zfvp7xpsppcw4l")) + "1n7wq242rcpjb19sag4mhgyj6kkki43g4pvlczpfhj6w5cna7c05")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 76e03a7e9868101116934f4706099eab99ab19af Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 29 Jan 2023 13:34:10 +0800 Subject: gnu: go-1.18: Update to 1.18.10. * gnu/packages/golang.scm (go-1.18): Update to 1.18.10. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 93df6cb061..60b1f71a36 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -850,7 +850,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.17) (name "go") - (version "1.18.6") + (version "1.18.10") (source (origin (method git-fetch) @@ -860,7 +860,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "1s2xwgd3mfbjdf7ls9gyj7n1lbqc4276qkr3znyq9694isj1ak20")))))) + "0ph3ajfq5q8j3nd91pfb25pm21aiphc58zf7fwis0h3a6nqbdyq9")))))) (define-public go-1.19 (package -- cgit 1.4.1 From a94c6d78ba8d144317e9c1ad5af447bc7266d04d Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 29 Jan 2023 13:34:23 +0800 Subject: gnu: go-1.19: Update to 1.19.5. * gnu/packages/golang.scm (go-1.19): Update to 1.19.5. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 60b1f71a36..79d5bc6f9c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -866,7 +866,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.18) (name "go") - (version "1.19.1") + (version "1.19.5") (source (origin (method git-fetch) @@ -876,7 +876,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "1gah4zhbkgbwrrryfmzdv2qwi1rgxk10q2r3hnlcb1dybf9c1i1w")))) + "0ah4l01h8qj0vj9668bdgr5m69fq16dz1fjlj332vhysxc6bkc27")))) (arguments (substitute-keyword-arguments (package-arguments go-1.18) ((#:phases phases) -- cgit 1.4.1 From c76393f851017ded4c077eac14ddba0328fc709e Mon Sep 17 00:00:00 2001 From: Skylar Chan Date: Sat, 28 Jan 2023 19:05:15 -0500 Subject: gnu: whoogle-search: Update to 0.8.1. * gnu/packages/python-web.scm (whoogle-search): Update to 0.8.1. Signed-off-by: Christopher Baines --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e7134677a9..765a07a20c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4832,14 +4832,14 @@ Google search engine. Its module is called @code{googlesearch}.") (define-public whoogle-search (package (name "whoogle-search") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "whoogle-search" version)) (sha256 (base32 - "0h8cl9bkd3vx17kbvcnmc8cy6pc29lxr0drxm84kj37ka788cj2g")))) - (build-system python-build-system) + "1kqkb23wb9a4a8zdky2066887vgv7ywhivhxi5nipkx07mf8v01k")))) + (build-system pyproject-build-system) (arguments (list ;; The tests need network access -- cgit 1.4.1 From a3fcc0a86f07f0295bc81899701972fc8f098bf6 Mon Sep 17 00:00:00 2001 From: André Batista Date: Tue, 31 Jan 2023 12:20:29 -0300 Subject: gnu: prosody: Update to 0.12.2. * gnu/packages/messaging.scm (prosody): Update to 0.12.2. Signed-off-by: Christopher Baines --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 56a8a5716a..404596c553 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1513,14 +1513,14 @@ Qt-based XMPP library QXmpp.") (define-public prosody (package (name "prosody") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (string-append "https://prosody.im/downloads/source/" "prosody-" version ".tar.gz")) (sha256 (base32 - "1rch9gzp9ksnniv6r1vskifvfv5wbp8wcfjr0lc2b9013zjbpv57")))) + "05ma72wr6iypr62vq748jhzx8i3lmgnsjshrx6w0z7sg24jfhqmn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;tests require "busted" -- cgit 1.4.1 From 7c798cd9e4052027b524e71a75a5820484e4847c Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Fri, 3 Feb 2023 13:18:53 +0100 Subject: gnu: Add r-bcellviper. * gnu/packages/bioconductor.scm (r-bcellviper): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 711b988e7f..1a7c53257b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1248,6 +1248,29 @@ demonstration purposes in the @code{AneuFinder} package.") from Illumina 450k methylation arrays.") (license license:artistic2.0))) +(define-public r-bcellviper + (package + (name "r-bcellviper") + (version "1.34.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "bcellViper" version + 'experiment)) + (sha256 + (base32 + "1fpgh70x2r68v0ximgcdphnyzq2hgiwbamyhbac3yka8flhrd1fm")))) + (properties `((upstream-name . "bcellViper"))) + (build-system r-build-system) + (propagated-inputs (list r-biobase)) + (home-page "https://bioconductor.org/packages/bcellViper") + (synopsis + "Transcriptional interactome and normal human B-cell expression data") + (description + "This is a tool for human B-cell context-specific transcriptional +regulatory network. In addition, this package provides a human normal B-cells +dataset for the examples in package viper.") + (license license:gpl2+))) + (define-public r-bladderbatch (package (name "r-bladderbatch") -- cgit 1.4.1 From a60c750eec73a2030b08b32af3b9f435c7ecca54 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Fri, 3 Feb 2023 14:44:02 +0100 Subject: gnu: Add r-psupertime. * gnu/packages/bioinformatics.scm (r-psupertime): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1da464f3c5..656eb7f13a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8258,6 +8258,52 @@ doublet-detection methods. In addition, this tool is used for execution and benchmark of those eight mentioned methods.") (license license:gpl3+)))) +(define-public r-psupertime + (let ((commit "73825a28d3bd9bc881c15ee0c4c218eec1c9c207") + (revision "1")) + (package + (name "r-psupertime") + (version (git-version "0.2.6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wmacnair/psupertime") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00h1r3ffz6m9dwcgkvyki8405b059qn6mnjsd8d76a1rabaf2vfh")))) + (properties `((upstream-name . "psupertime"))) + (build-system r-build-system) + (propagated-inputs + (list r-cowplot + r-data-table + r-fastcluster + r-forcats + r-ggplot2 + r-glmnet + r-knitr + r-matrix + r-rcolorbrewer + r-scales + r-scran + r-singlecellexperiment + r-stringr + r-summarizedexperiment + r-topgo)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/wmacnair/psupertime") + (synopsis + "Psupertime is supervised pseudotime for single cell RNAseq data") + (description + "Psupertime is supervised pseudotime for single cell RNAseq data. It +uses single cell RNAseq data, where the cells have a known ordering. This +ordering helps to identify a small number of genes which place cells in that +known order. It can be used for discovery of relevant genes, for +identification of subpopulations, and characterization of further unknown or +differently labelled data.") + (license license:gpl3)))) + (define-public r-pando (package (name "r-pando") -- cgit 1.4.1 From b5a3e745f9f30899655aa15144c248e0292e8b1c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 3 Feb 2023 18:51:48 +0100 Subject: gnu: Remove key-mon.scm. The file is empty. * gnu/packages/key-mon.scm: Remove file. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove it. * po/packages/POTFILES.in: Remove it. --- gnu/local.mk | 1 - gnu/packages/key-mon.scm | 28 ---------------------------- po/packages/POTFILES.in | 1 - 3 files changed, 30 deletions(-) delete mode 100644 gnu/packages/key-mon.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 520e9838ad..fdbb8ce461 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -362,7 +362,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kde-systemtools.scm \ %D%/packages/kde-utils.scm \ %D%/packages/kerberos.scm \ - %D%/packages/key-mon.scm \ %D%/packages/kodi.scm \ %D%/packages/language.scm \ %D%/packages/lean.scm \ diff --git a/gnu/packages/key-mon.scm b/gnu/packages/key-mon.scm deleted file mode 100644 index d70dd0cd48..0000000000 --- a/gnu/packages/key-mon.scm +++ /dev/null @@ -1,28 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages key-mon) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (gnu packages) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages gtk) - #:use-module (gnu packages gnome) - #:use-module (guix build-system python)) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 32d34d6456..4775986c57 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -25,7 +25,6 @@ gnu/packages/image.scm gnu/packages/image-viewers.scm gnu/packages/inkscape.scm gnu/packages/jemalloc.scm -gnu/packages/key-mon.scm gnu/packages/less.scm gnu/packages/lesstif.scm gnu/packages/libreoffice.scm -- cgit 1.4.1 From e33126e574cc8d0bf71db086ef211a82061fc75d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 3 Feb 2023 19:12:05 +0100 Subject: gnu: nar-herder: Update to 0-13.66a2862. * gnu/packages/package-management.scm (nar-herder): Update to 0-13.66a2862. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2c4e71ae55..0d695ab0a8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1666,8 +1666,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "550e6aa414ec143435a8ace061c17e34dcfb4eec") - (revision "12")) + (let ((commit "66a2862b68087c9bd100b903fe32066d790cbe2c") + (revision "13")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1678,7 +1678,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "1n7wq242rcpjb19sag4mhgyj6kkki43g4pvlczpfhj6w5cna7c05")) + "0ry5m4h80mm1za4aqg73753083pjwajzzbs2hzpwng516ylh5c3r")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 42dde57fcf66fe23ca9417bd629148d2f286f05b Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 2 Feb 2023 14:46:23 +0000 Subject: gnu: mympd: Update to 10.2.1. * gnu/packages/mpd.scm (mympd): Update to 10.2.1. Signed-off-by: Christopher Baines --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e432edf0ae..7c5d7b9486 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -586,7 +586,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "10.2.0") + (version "10.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -595,7 +595,7 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "16f4yyjjgl6d6pqnnal5d00s5cgrg1m6b6i2bmg5n86gns8n9chv")))) + "1zici4sfpd2hra14dy7vp2x0w3i46a2d422inkixkp4cpm14rj9s")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no test target -- cgit 1.4.1 From fbd12ea1f94793b1164494fef332795761fe6829 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Thu, 2 Feb 2023 20:18:25 +0100 Subject: gnu: emacs-biblio: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-biblio): Update to 0.3. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c2c0fb93ba..0b61e754cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21163,33 +21163,30 @@ with (La)TeX mode, Org mode and other Emacs editing modes.") license:gpl3+)))) (define-public emacs-biblio - (let ((commit "517ec18f00f91b61481214b178f7ae0b8fbc499b") - (revision "1")) - (package - (name "emacs-biblio") - (version (git-version "0.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cpitclaudel/biblio.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-dash emacs-let-alist emacs-seq)) - (home-page "https://github.com/cpitclaudel/biblio.el") - (synopsis "Browse and import bibliographic references") - (description "This package provides an extensible Emacs package for + (package + (name "emacs-biblio") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cpitclaudel/biblio.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-dash emacs-let-alist emacs-seq)) + (home-page "https://github.com/cpitclaudel/biblio.el") + (synopsis "Browse and import bibliographic references") + (description "This package provides an extensible Emacs package for browsing and fetching references. @file{biblio.el} makes it easy to browse and gather bibliographic references and publications from various sources, by keywords or by DOI. References are automatically fetched from well-curated sources, and formatted as BibTeX.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-citar (package -- cgit 1.4.1 From cd3df45c3789cb2c3a7c7565151196803193d183 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 3 Feb 2023 14:13:27 +0800 Subject: gnu: binwalk: Update to 2.3.4. * gnu/packages/python-xyz.scm (binwalk): Update to 2.3.4. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b14c4ff0f3..3fe2267a0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18695,7 +18695,7 @@ without requiring an event loop, useful for creative responsive GUIs.") (define-public binwalk (package (name "binwalk") - (version "2.3.3") + (version "2.3.4") (source (origin (method git-fetch) @@ -18704,7 +18704,7 @@ without requiring an event loop, useful for creative responsive GUIs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0phqyqv34vhh80dgipiggs4n3iq2vfjk9ywx2c5d8g61vzgbd2g8")) + (base32 "0cfm1khckq986l0q68kmfyfagc6zmb94hgjjm847fjcil77dnlw6")) (modules '((guix build utils))) (snippet #~(begin -- cgit 1.4.1 From dd3ec180f89e6229e972a6df7c625fdb66175d9d Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Wed, 1 Feb 2023 20:35:59 +0000 Subject: gnu: Add emacs-hexrgb. * gnu/packages/emacs-xyz.scm (emacs-hexrgb): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0b61e754cf..dec8828ca1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13556,6 +13556,32 @@ as well as features for editing search results.") "This Emacs library provides a Helm interface for Projectile.") (license license:gpl3+))) +(define-public emacs-hexrgb + (let ((commit "90e5f07f14bdb9966648977965094c75072691d4")) + (package + (name "emacs-hexrgb") + (version "0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsmirror/hexrgb") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y5l6hrzm5j2jfrm5jp5zrxhxgvf930m2k4nyvk0rllpx0i1271z")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/hexrgb.el") + (synopsis "Emacs functions to convert color formats") + (description + "HexRGB provides functions for converting between RGB (red, green, blue) +color components and HSV (hue, saturation, value) color components. More +accurately, it converts Emacs color components (whole numbers from 0 through +65535), RGB and HSV floating-point components (0.0 through 1.0), Emacs +color-name strings (such as \"blue\") and hex RGB color strings (such as +\"#FC43A7912\").") + (license license:gpl2+)))) + (define-public emacs-taskrunner (let ((commit "3afd4a546d42339543d3d4e51b175fc3e82b3358") (revision "1")) -- cgit 1.4.1 From da0f959e6f0ff308ac919238f6f7f7239145f1ac Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Fri, 3 Feb 2023 23:26:34 +0100 Subject: gnu: Add emacs-srv. * gnu/packages/emacs-xyz.scm (emacs-srv): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dec8828ca1..fe9d243587 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25001,6 +25001,29 @@ later.") them in your web browser.") (license license:expat)))) +(define-public emacs-srv + (package + (name "emacs-srv") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/legoscia/srv.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a8pqhdi7m3lis5ad2f74s1sy8zpxlwvfsvd80lw746235x2v06z")))) + (build-system emacs-build-system) + (home-page "https://github.com/legoscia/srv.el") + (synopsis "Emacs Lisp library to perform SRV DNS requests") + (description + "SRV implements RFC 2782 (SRV records). It is used to look up hostname +and port for a service at a specific domain. There might be multiple results, +and the caller is supposed to attempt to connect to each hostname+port in +turn.") + (license license:gpl2+))) + (define-public emacs-github-review (let ((commit "a13a3b4f1b6114a32af843971a145ab880f51232") (revision "2")) -- cgit 1.4.1 From 2e6501b03c28298b06af969634b5cb40747c0911 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Fri, 3 Feb 2023 23:30:40 +0100 Subject: gnu: Add emacs-jabber. * gnu/packages/emacs-xyz.scm (emacs-jabber): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fe9d243587..0edc0751f7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17550,6 +17550,43 @@ for the current file, using the major mode as a hint. It prompts you to enter one if it fails.") (license license:gpl3+))) +(define-public emacs-jabber + ;; No releases available. + (let ((commit "af0315e174fa6446d5c4dd3e6465d48912950e58") + (revision "0")) + (package + (name "emacs-jabber") + (version (git-version "0.8.92" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-jabber/emacs-jabber") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq")))) + (build-system emacs-build-system) + (arguments + (list + #:emacs emacs ;requires gnutls + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'make-info + (lambda _ + (invoke "makeinfo" "jabber.texi") + (install-file "jabber.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) + (propagated-inputs (list emacs-fsm emacs-hexrgb emacs-srv gnutls)) + (home-page "https://codeberg.org/emacs-jabber/emacs-jabber") + (synopsis "XMPP (Jabber) client for Emacs") + (description + "@code{jabber.el} is an XMPP client for Emacs. XMPP (also known as +\"Jabber\") is an instant messaging system; see @url{https://xmpp.org} for +more information.") + (license license:gpl2+)))) + (define-public emacs-jarchive (package (name "emacs-jarchive") -- cgit 1.4.1 From 3acd211a3c51f0ac55c32c172f1b4f9a5e0d1e60 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Feb 2023 23:36:13 +0100 Subject: gnu: emacs-wgrep: Update to 3.0.0. * gnu/packages/emacs-xyz.scm (emacs-wgrep): Update to 3.0.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0edc0751f7..b3ecf15257 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13419,7 +13419,7 @@ by Python's Jinja.") (define-public emacs-wgrep (package (name "emacs-wgrep") - (version "2.3.2") + (version "3.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -13428,7 +13428,7 @@ by Python's Jinja.") (file-name (git-file-name name version)) (sha256 (base32 - "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d")))) + "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a")))) (build-system emacs-build-system) (home-page "https://github.com/mhayashi1120/Emacs-wgrep") (synopsis "Edit a grep buffer and apply those changes to the files") -- cgit 1.4.1 From ceb12ccfcdb641140508780419a25d08c6cd7075 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Feb 2023 23:39:32 +0100 Subject: gnu: emacs-wgrep: Run tests. * gnu/packages/emacs-xyz.scm (emacs-wgrep)[arguments]: Run tests. [native-inputs]: Add EMACS-DASH and EMACS-S. --- gnu/packages/emacs-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b3ecf15257..eca467f11d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13430,6 +13430,13 @@ by Python's Jinja.") (base32 "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a")))) (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "--batch" "-Q" + "-l" "wgrep-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (native-inputs (list emacs-dash emacs-s)) (home-page "https://github.com/mhayashi1120/Emacs-wgrep") (synopsis "Edit a grep buffer and apply those changes to the files") (description -- cgit 1.4.1 From bbecb8374dfb547a95da46fb7167e92170ee6bb8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 3 Feb 2023 23:41:23 +0100 Subject: gnu: emacs-websocket: Update to 1.14. * gnu/packages/emacs-xyz.scm (emacs-websocket): Update to 1.14. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eca467f11d..98539dd45f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19036,14 +19036,14 @@ database of references on life sciences.") (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.13.1") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "websocket-" version ".tar")) (sha256 - (base32 "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc")))) + (base32 "0g75kaw9bdk30apiyk09583amnw9458kkmgbbcl2myqfqspywnva")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") -- cgit 1.4.1 From 74521b1794708903b0c2127487d568e5d370d6f7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 10:17:32 +0100 Subject: gnu: mame: Update to 0.251. * gnu/packages/emulators.scm (mame): Update to 0.251. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 47cb175d81..25439ceadf 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1768,7 +1768,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.249") + (version "0.251") (source (origin (method git-fetch) @@ -1777,7 +1777,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "1akws4l3b7z5mkf09mdaz640rj41sbg3sh1xlv1sp0yhdjqjpi90")) + (base32 "102p6kz4ph9m0sxsyavqhjzg00gmnq8m5mnd5sf14c61d2jc0vzk")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit 1.4.1 From 6e0ccf50ac547ce0d2838c3a63304b73cabbc0bc Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 2 Feb 2023 23:18:49 -0800 Subject: gnu: Add gpaint. * gnu/packages/graphics.scm (gpaint): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/graphics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a9162e53a6..7c4456d034 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2505,3 +2505,39 @@ on the command line. It supports a range of file formats (including animated glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and texturing options.") (license license:bsd-3))) + +(define-public gpaint + (package + (name "gpaint") + (version "0.3.3") + (source (origin + (method url-fetch) + (uri (string-append "http://alpha.gnu.org/gnu/" + name "/" + name "-2-" version ".tar.gz")) + (sha256 + (base32 + "1syh5l5fnzk7cw77iykafn73fvmnc83kg815fa8vvj0h0r30c5sl")))) + (build-system gnu-build-system) + (inputs (list gtk+-2 libglade)) + (native-inputs + (list gettext-minimal `(,glib "bin") pkg-config)) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'remove-undefined-references + (lambda _ + (substitute* "src/drawing.c" + (("GTK_STOCK_DISCARD,GTK_RESPONSE_DISCARD") + "GTK_STOCK_DISCARD,GTK_RESPONSE_NO")) + (substitute* "src/menu.c" + (("\\#include \"menu.h\"") + ""))))))) + + (synopsis "Simple paint program for GNOME") + (description + "GNU Paint is a simple, easy-to-use paint program for the GNOME +environment. It supports drawing freehand as well as basic shapes and text. +It features cut-and-paste for irregular regions or polygons.") + (home-page "https://www.gnu.org/software/gpaint/") + (license license:gpl3+))) + -- cgit 1.4.1 From 67b524360dd2fa12417b21936c8ca20b409ed730 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Fri, 16 Dec 2022 20:50:58 -0600 Subject: gnu: megacmd: Update to 1.5.1 and add libuv dependency. * gnu/packages/sync.scm (megacmd): Update to 1.5.1. [inputs]: Remove labels and add LIBUV. Signed-off-by: Nicolas Goaziou --- gnu/packages/sync.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 3ce5f2cee0..b0d8b4274e 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ocaml) @@ -217,7 +218,7 @@ Nextcloud Server with your computer.") (define-public megacmd (package (name "megacmd") - (version "1.1.0") + (version "1.5.1") (source (origin (method git-fetch) @@ -227,28 +228,29 @@ Nextcloud Server with your computer.") (recursive? #t))) (sha256 (base32 - "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53")) + "12v46jyxdgp2qqdpmd084d60hd5srjbgwpk082b3rp5dl7yg1rd8")) (file-name (git-file-name name version)))) (build-system gnu-build-system) ;; XXX: Disabling tests because they depend on libgtest.la from googletest, ;; which is not installed for unclear reasons. (arguments - `(#:tests? #f - #:configure-flags '("--with-pcre"))) + (list #:tests? #f + #:configure-flags #~'("--with-pcre"))) (native-inputs (list autoconf automake libtool)) (inputs - `(("c-ares" ,c-ares) - ("crypto++" ,crypto++) - ("curl" ,curl) - ("freeimage" ,freeimage) - ("gtest" ,googletest) - ("openssl" ,openssl) - ("pcre" ,pcre) - ("readline" ,readline) - ("sodium" ,libsodium) - ("sqlite3" ,sqlite) - ("zlib" ,zlib))) + (list c-ares + crypto++ + curl + freeimage + googletest + libuv + openssl + pcre + readline + libsodium + sqlite + zlib)) (home-page "https://mega.nz/cmd") (synopsis "Command Line Interactive and Scriptable Application to access mega.nz") -- cgit 1.4.1 From c3e50c731d8c175133cae1869e445cbb7a3b4d6f Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Sat, 4 Feb 2023 00:14:05 +0100 Subject: gnu: Add distrobox. * gnu/packages/containers.scm (distrobox): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/containers.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 5761d40420..3982f4f059 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -26,6 +26,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) @@ -46,7 +47,8 @@ #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages wget)) (define-public crun (let ((commit "c381048530aa750495cf502ddb7181f2ded5b400")) @@ -153,6 +155,41 @@ manager (like Podman or CRI-O) and an Open Container Initiative (OCI) runtime (like runc or crun) for a single container.") (license license:asl2.0))) +(define-public distrobox + (package + (name "distrobox") + (version "1.4.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/89luca89/distrobox") + (commit version))) + (sha256 + (base32 "0gs81m1bvlyq6ad22zsdsw1q6s3agy79vx94kdf6zjzngbanlydk")) + (file-name (git-file-name name version)))) + (build-system copy-build-system) + (inputs + (list podman wget)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'install 'refer-to-inputs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "^distrobox.*") + (("podman") (search-input-file inputs "/bin/podman")) + (("wget") (search-input-file inputs "/bin/wget")) + (("command -v") "test -x")))) + (replace 'install + (lambda _ + (invoke "./install" "--prefix" #$output)))))) + (home-page "https://distrobox.privatedns.org/") + (synopsis "Create and start containers highly integrated with the hosts") + (description + "Distrobox is a fancy wrapper around Podman or Docker to create and start +containers highly integrated with the hosts.") + (license license:gpl3))) + (define-public libslirp (package (name "libslirp") -- cgit 1.4.1 From 7cea27a8d578436586ef1ebf5eda4fce51b06220 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 4 Feb 2023 08:36:03 +0400 Subject: gnu: emacs-emacsql: Update to 3.1.1-0.e1baaf2. There is an issue in release version, which affects sqlite based packages like org-roam, forge, etc. https://github.com/magit/emacsql/issues/68 * gnu/packages/emacs-xyz.scm (emacs-emacsql): Update to 3.1.1-0.e1baaf2. [arguments]<#:phases>{remove-sqlite-builtin}: New phase. --- gnu/packages/emacs-xyz.scm | 128 ++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 60 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 98539dd45f..03d85cbecf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20406,69 +20406,77 @@ object has been freed.") (license license:unlicense))) (define-public emacs-emacsql - (package - (name "emacs-emacsql") - (version "3.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/emacsql") - (commit (string-append version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g")))) - (build-system emacs-build-system) - (arguments - (list - #:tests? #true - #:test-command #~(list "emacs" "-Q" "--batch" - "-L" "tests" - "-L" "." - "-l" "tests/emacsql-tests.el" - "-f" "ert-run-tests-batch-and-exit") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-26)) - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'patch-elisp-shell-shebangs - (lambda _ - (substitute* (find-files "." "\\.el") - (("/bin/sh") (which "sh"))))) - (add-after 'patch-elisp-shell-shebangs 'setenv-shell - (lambda _ - (setenv "SHELL" "sh"))) - (add-after 'setenv-shell 'build-emacsql-sqlite - (lambda _ - (invoke "make" "binary" (string-append "CC=" #$(cc-for-target))))) - (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite - ;; This build phase installs emacs-emacsql binary. - (lambda _ - (install-file "sqlite/emacsql-sqlite" - (string-append #$output "/bin")))) - (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el - ;; This build phase removes interactive prompts - ;; and makes sure Emacs look for binaries in the right places. - (lambda _ - (emacs-substitute-variables "emacsql-sqlite.el" - ("emacsql-sqlite-executable" - (string-append #$output "/bin/emacsql-sqlite")) - ;; Make sure Emacs looks for ‘GCC’ binary in the right place. - ("emacsql-sqlite-c-compilers" - `(list ,(which "gcc"))))))))) - (inputs - (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) - (propagated-inputs - (list emacs-finalize emacs-pg)) - (home-page "https://github.com/magit/emacsql") - (synopsis "Emacs high-level SQL database front-end") - (description "Any readable Lisp value can be stored as a value in EmacSQL, + (let ((commit "e1baaf2f874df7f9259a8ecca978e03d3ddae5b5") + (revision "0")) + (package + (name "emacs-emacsql") + (version (git-version "3.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/emacsql") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dvqs1jg5zqn0i3r67sn1a40h5rm961q9vxvmqxbgvdhkjvip8fn")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-L" "tests" + "-L" "." + "-l" "tests/emacsql-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'remove-sqlite-builtin + ;; Current emacs 28.2 doesn't have sqlite feature and compilation + ;; of this file fails. This phase should be removed, when emacs + ;; package is updated to 29. + (lambda _ + (delete-file "emacsql-sqlite-builtin.el"))) + (add-before 'install 'patch-elisp-shell-shebangs + (lambda _ + (substitute* (find-files "." "\\.el") + (("/bin/sh") (which "sh"))))) + (add-after 'patch-elisp-shell-shebangs 'setenv-shell + (lambda _ + (setenv "SHELL" "sh"))) + (add-after 'setenv-shell 'build-emacsql-sqlite + (lambda _ + (invoke "make" "binary" (string-append "CC=" #$(cc-for-target))))) + (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite + ;; This build phase installs emacs-emacsql binary. + (lambda _ + (install-file "sqlite/emacsql-sqlite" + (string-append #$output "/bin")))) + (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el + ;; This build phase removes interactive prompts + ;; and makes sure Emacs look for binaries in the right places. + (lambda _ + (emacs-substitute-variables "emacsql-sqlite.el" + ("emacsql-sqlite-executable" + (string-append #$output "/bin/emacsql-sqlite")) + ;; Make sure Emacs looks for ‘GCC’ binary in the right place. + ("emacsql-sqlite-c-compilers" + `(list ,(which "gcc"))))))))) + (inputs + (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) + (propagated-inputs + (list emacs-finalize emacs-pg emacs-sqlite3-api)) + (home-page "https://github.com/magit/emacsql") + (synopsis "Emacs high-level SQL database front-end") + (description "Any readable Lisp value can be stored as a value in EmacSQL, including numbers, strings, symbols, lists, vectors, and closures. EmacSQL has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp object @code{nil} corresponds 1:1 with @code{NULL} in the database.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-emacsql-sqlite3 (package -- cgit 1.4.1 From 34175ddacfc8e464e0c3522493c3dec665d73e3f Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 3 Feb 2023 12:50:55 +0400 Subject: gnu: emacs-org-roam: Update to 2.2.2-0.74422df. Due to the bug in release version, backlinks doesn't work: https://github.com/org-roam/org-roam/issues/2235 Two weeks ago it was a request for a new tag, but still not added. https://github.com/org-roam/org-roam/issues/2306 * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 2.2.2-0.74422df. --- gnu/packages/emacs-xyz.scm | 114 +++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 56 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 03d85cbecf..8bc5b05210 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33244,66 +33244,68 @@ go directly to where they belong.") (license license:gpl3+)))) (define-public emacs-org-roam - (package - (name "emacs-org-roam") - (version "2.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/org-roam/org-roam") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "09wcqdqy2gcsyd1mbcm90b70y3qj921m4ky8l3avhzpdwgyw8wy5")))) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - ;; Move the extensions source files to the top level, which - ;; is included in the EMACSLOADPATH. - (add-after 'unpack 'move-source-files - (lambda _ - (let ((el-files (find-files "./extensions" ".*\\.el$"))) - (for-each (lambda (f) - (rename-file f (basename f))) - el-files)))) - (add-after 'move-source-files 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (make-file-writable "org-roam-graph.el") - (emacs-substitute-variables "org-roam-graph.el" - ("org-roam-graph-executable" - (search-input-file inputs "/bin/dot"))))) - (add-after 'install 'install-image - (lambda* (#:key outputs #:allow-other-keys) - (install-file "doc/images/org-ref-citelink.png" - (string-append #$output "/share/info/images")))) - (add-after 'install-image 'make-info - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "doc" - (invoke "makeinfo" "-o" "org-roam.info" "org-roam.texi") - (install-file "org-roam.info" - (string-append #$output "/share/info")))))))) - (inputs - (list graphviz)) - (native-inputs - (list texinfo)) - (propagated-inputs - (list emacs-dash - emacs-emacsql-sqlite3 - emacs-f - emacs-magit - emacs-org - emacs-s)) - (home-page "https://github.com/org-roam/org-roam/") - (synopsis "Non-hierarchical note-taking with Org mode") - (description "Emacs Org Roam is a solution for taking non-hierarchical + (let ((commit "74422df546a515bc984c2f3d3a681c09d6f43916") + (revision "0")) + (package + (name "emacs-org-roam") + (version (git-version "2.2.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/org-roam/org-roam") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Move the extensions source files to the top level, which + ;; is included in the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./extensions" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)))) + (add-after 'move-source-files 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "org-roam-graph.el") + (emacs-substitute-variables "org-roam-graph.el" + ("org-roam-graph-executable" + (search-input-file inputs "/bin/dot"))))) + (add-after 'install 'install-image + (lambda* (#:key outputs #:allow-other-keys) + (install-file "doc/images/org-ref-citelink.png" + (string-append #$output "/share/info/images")))) + (add-after 'install-image 'make-info + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "doc" + (invoke "makeinfo" "-o" "org-roam.info" "org-roam.texi") + (install-file "org-roam.info" + (string-append #$output "/share/info")))))))) + (inputs + (list graphviz)) + (native-inputs + (list texinfo)) + (propagated-inputs + (list emacs-dash + emacs-emacsql-sqlite3 + emacs-f + emacs-magit + emacs-org + emacs-s)) + (home-page "https://github.com/org-roam/org-roam/") + (synopsis "Non-hierarchical note-taking with Org mode") + (description "Emacs Org Roam is a solution for taking non-hierarchical notes with Org mode. Notes are captured without hierarchy and are connected by tags. Notes can be found and created quickly. Org Roam should also work as a plug-and-play solution for anyone already using Org mode for their personal wiki.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-roam-bibtex (package -- cgit 1.4.1 From 6f0c9053244d6b4cfc4130c963a15dbf83cbcdac Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 29 Jan 2023 13:34:03 +0800 Subject: gnu: emacs-next: Enable tree-sitter support. * gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-0.ac7ec87. * gnu/packages/emacs.scm (emacs-next)[inputs]: Add tree-sitter. Signed-off-by: Andrew Tropin --- gnu/packages/emacs.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 299ab5e992..00f8a0f086 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2023 Declan Tsien ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) + #:use-module (gnu packages text-editors) ; for tree-sitter #:use-module (gnu packages web) ; for jansson #:use-module (gnu packages webkit) #:use-module (gnu packages xml) @@ -381,12 +383,12 @@ languages.") (license license:gpl3+))) (define-public emacs-next - (let ((commit "6adc193ad66445acd84caba6973424ecbd21da26") - (revision "4")) + (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778") + (revision "0")) (package (inherit emacs) (name "emacs-next") - (version (git-version "29.0.50" revision commit)) + (version (git-version "29.0.60" revision commit)) (source (origin (inherit (package-source emacs)) @@ -401,10 +403,10 @@ languages.") "emacs-native-comp-driver-options.patch")) (sha256 (base32 - "0b48qg9w7fzvhva78gzi3cs2m6asj11fk0kgys49fqhwskigzg1f")))) + "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z")))) (inputs (modify-inputs (package-inputs emacs) - (prepend sqlite))) + (prepend sqlite tree-sitter))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf)))))) -- cgit 1.4.1 From 36b8624dab8f881b65becee4a1603f9fbfd8094f Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Thu, 2 Feb 2023 18:08:32 -0500 Subject: gnu: openssh: Update to 9.2p1 [security fixes]. Here is more information about the security issues fixed in this release: https://www.openssh.com/txt/release-9.2 * gnu/packages/ssh.scm (openssh): Update to 9.2p1. Signed-off-by: Leo Famulari --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 35b3b378a9..685b5b039a 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -186,7 +186,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "9.1p1") + (version "9.2p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" @@ -195,7 +195,7 @@ a server that supports the SSH-2 protocol.") "openssh-trust-guix-store-directory.patch")) (sha256 (base32 - "126jzn5pxkf1dgzcb3lzpzab8airg0avnvr3y23kgqp3qw4m1y0r")))) + "0ingf6fxzg2fcf6k68bvh0lc460jn0macvf5w585zd2zcpqxnriz")))) (build-system gnu-build-system) (native-inputs (list groff pkg-config)) (inputs `(("libedit" ,libedit) -- cgit 1.4.1 From 053c3f80a3722e2e69b78b20c44c685ae05618b3 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 4 Feb 2023 12:35:00 +0400 Subject: gnu: okular: Add wayland support. * gnu/packages/kde.scm (okular)[inputs]: Add qtwayland-5. --- gnu/packages/kde.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 7009919a06..728051b9e4 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1323,6 +1323,7 @@ creating routes by drag and drop and more.") qca qtdeclarative-5 qtsvg-5 + qtwayland-5 threadweaver kcrash kjs)) -- cgit 1.4.1 From 41da099a47aea707b6bcc05b2b8e959efbbfa967 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 4 Feb 2023 17:07:46 +0400 Subject: gnu: obs-wlrobs: Update to 1.1. * gnu/packages/video.scm (obs-wlrobs): Update to 1.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 54cf7be9a7..c26cfd6716 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3553,7 +3553,7 @@ programs on your current machine or on other machines.") (define-public obs-wlrobs (package (name "obs-wlrobs") - (version "1.0") + (version "1.1") (source (origin (method hg-fetch) @@ -3563,7 +3563,7 @@ programs on your current machine or on other machines.") (file-name (git-file-name name version)) (sha256 (base32 - "1faiq2gdb7qis3m1hilm4pz8lkmkab75vzm608dbiazahhybf96p")))) + "1whdb2ykisz50qw19nv1djw5qp17rpnpkc8s8470ja8iz894mmwd")))) (build-system meson-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From b5956cb13dd689c766fc47c51945f3f182bdd93a Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 4 Feb 2023 18:50:06 +0400 Subject: gnu: emacs-modus-themes: Update to 4.0.2. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 4.0.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8bc5b05210..a7a94e613e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31066,7 +31066,7 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "4.0.1") + (version "4.0.2") (source (origin (method git-fetch) @@ -31075,7 +31075,7 @@ Emacs that integrate with major modes like Org-mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "16m8y56jyf44rj541fqb243pmbz9bk5py5zl1xhzal4fsk5bsfrg")))) + (base32 "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From ecd0f1e7244e1d20332f51c44e59cd808c6759cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 09:58:03 +0100 Subject: gnu: fet: Update to 6.8.2. * gnu/packages/education.scm (fet): Update to 6.8.2. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 68a25d5e9a..dbb704c136 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -582,7 +582,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.8.0") + (version "6.8.2") (source (origin (method url-fetch) @@ -591,7 +591,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "12hbw87d6aza77615apvbkdgrn3gqdw0q9xp2pw64w2513z0a2jm")))) + (base32 "1wv7qwfmpmmfyr2kklp2q047rl38ps55cizjrm6v8np2cjl0ah3g")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From b23f27e272cf05256ee9e4ae30b4ba012ca50820 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 10:03:18 +0100 Subject: gnu: wireshark: Update to 4.0.3. * gnu/packages/networking.scm (wireshark): Update to 4.0.3. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7301b8c844..5a7d60c674 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Raimon Grau ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington -;;; Copyright © 2016-2022 Nicolas Goaziou +;;; Copyright © 2016-2023 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018 Arun Isaac @@ -1755,14 +1755,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "07a18jx88jaa2j1i949w9n1yb149xi02s80inbfji6rgkxliangk")))) + (base32 "04cmgvmkyvxdpfy08adxf3smklgzakrvyvb89rrr7yqaridy2lbc")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1 From bedaf3115e110620ac050df9e96a793f0bd384fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 10:10:18 +0100 Subject: gnu: lagrange: Update to 1.15.1. * gnu/packages/web-browsers.scm (lagrange): Update to 1.15.1. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index fe51e37b52..d69b237071 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -706,7 +706,7 @@ is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.14.2") + (version "1.15.1") (source (origin (method url-fetch) @@ -714,7 +714,7 @@ is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "0r4cwpgnz761dvkfijq0p7pcyzq6f8bnmivijpnpf3bkzpvmxc2i")) + (base32 "04596gbi6fpz555dclhd2z1q60myk3ypc37v3g9brfm1kmbpssac")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From c3bcf56f9c0cd211b014d1e70c223ab10f9d0288 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 10:00:39 +0100 Subject: gnu: pyzo: Update to 4.12.5. * gnu/packages/python-xyz.scm (pyzo): Update to 4.12.5. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3fe2267a0d..b7975c2db4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -49,7 +49,7 @@ ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2016, 2018 Tomáš Čech -;;; Copyright © 2018-2022 Nicolas Goaziou +;;; Copyright © 2018-2023 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019, 2021 Clément Lassieur ;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer @@ -27024,7 +27024,7 @@ accessor layer.") (define-public pyzo (package (name "pyzo") - (version "4.12.4") + (version "4.12.5") (source (origin (method git-fetch) @@ -27034,7 +27034,7 @@ accessor layer.") (file-name (git-file-name name version)) (sha256 (base32 - "10qqilbh7n4z2656qbr9gllvgi7xq11xcm2bv64h02jmkb7m4m6n")))) + "0938dk9z1l248756h4z08si4n1i2rj02lbwgd04x49p97iclgwrn")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From f0d1cddf5bf68bbe0cfa973465ac326a33db433f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Jan 2023 10:06:36 +0100 Subject: gnu: naev: Update to 0.10.3. * gnu/packages/games.scm (naev): Update to 0.10.3. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9a045b6770..87ef1c8233 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7931,7 +7931,7 @@ ncurses for text display.") (define-public naev (package (name "naev") - (version "0.10.2") + (version "0.10.3") (source (origin (method git-fetch) @@ -7941,7 +7941,7 @@ ncurses for text display.") (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "1ll5a6ldc2khagwrkb3z84rp7cf1hb83lw0yc1di481xgr6f960q")))) + (base32 "0hqc2j7lf5ay461l164c63jncmjdvnkm2nf90246njimhz2in056")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. -- cgit 1.4.1 From b670114590551f5f4a8272041cd98e01c93fb762 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Feb 2023 18:11:24 +0100 Subject: gnu: emacs-inspector: Update to 0.16. * gnu/packages/emacs-xyz.scm (emacs-inspector): Update to 0.16. [arguments]<#:phases>: Add another compatibility tweak for Emacs 28. --- gnu/packages/emacs-xyz.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a7a94e613e..9fefce6dff 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -562,10 +562,10 @@ configuration language which makes it trivial to write your own themes.") (license license:gpl3+)))) (define-public emacs-inspector - (let ((commit "cab7ea001baa54eff6393f171e9ef1f69258d5ac")) ;version bump + (let ((commit "32f752c5cd996991c4dba67733cfb4e4159c2e75")) ;version bump (package (name "emacs-inspector") - (version "0.15") + (version "0.16") (source (origin (uri (git-reference @@ -573,7 +573,7 @@ configuration language which makes it trivial to write your own themes.") (commit commit))) (method git-fetch) (sha256 - (base32 "00gh9s3868w0zbhcsqsvq5wqgcfpa4j7sxqwzxcxb51cmrnhp30l")) + (base32 "1zsj24f0qjdy8vxwbn8kc9xy0ffwfc54dyy3dya8j59rlqx5nmdh")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -589,9 +589,14 @@ configuration language which makes it trivial to write your own themes.") (add-after 'unpack 'preserve-emacs-28-compatibility ;; XXX: `cl-constantly' function is defined in "cl-lib" starting ;; from Emacs 29+. For now, replace it with its definition. + ;; Also, the variables `pp-max-width' and `pp-use-max-width' are + ;; from Emacs 29+. Replace them with their default value. (lambda _ (substitute* "tree-inspector.el" - (("cl-constantly") "lambda (_)")))) + (("cl-constantly") "lambda (_)")) + (substitute* "inspector.el" + (("(defcustom inspector-.*? )pp(-use)?-max-width" _ lead flag) + (string-append lead (if flag "nil" "t")))))) (add-before 'check 'skip-failing-test (lambda _ (substitute* "tree-inspector-tests.el" -- cgit 1.4.1 From f57e20d7289911a3691f089603c47cfdb828ea44 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Feb 2023 18:15:34 +0100 Subject: gnu: emacs-evil-owl: Fix build. * gnu/packages/emacs-xyz.scm (emacs-evil-owl)[arguments]: Use G-expressions. <#:phases>: Skip failing test. --- gnu/packages/emacs-xyz.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9fefce6dff..d30696c7be 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14326,11 +14326,19 @@ used for reverse direction.") (base32 "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi")))) (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "make" "test") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'skip-failing-test + (lambda _ + (substitute* "test/evil-owl-test.el" + (("\\(ert-deftest evil-owl-test-mark-string.*" all) + (string-append all " (skip-unless nil)")))))))) (propagated-inputs (list emacs-evil)) - (arguments - `(#:tests? #t - #:test-command '("make" "test"))) (home-page "https://github.com/mamapanda/evil-owl") (synopsis "Preview candidates when using Evil registers and marks") (description -- cgit 1.4.1 From c0f40e8c86358af4bdcec646bdb4b2237bf6279a Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Wed, 25 Jan 2023 21:07:54 -0600 Subject: gnu: Add guile-simple-iterators. * gnu/packages/guile-xyz.scm (guile-simple-iterators): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/guile-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 3eb8d7aeb6..b998179ee0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2600,6 +2600,41 @@ for Guile\". It provides the following modules: ;; details. (license license:gpl3+))) +(define-public guile-simple-iterators + (let ((commit "50f16a2b2aa57e657e52e19fb3c35bdc182cfa36") + (revision "0")) + (package + (name "guile-simple-iterators") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/dustyweb/guile-simple-iterators") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m1wirlnfwmp5a4rpszd5qsbwabz4ji033w6p2714p1r524ylah8")))) + (build-system guile-build-system) + (native-inputs (list guile-3.0)) + (home-page "https://gitlab.com/dustyweb/guile-simple-iterators") + (synopsis "Simple iterators for Guile") + (description + "This is a collection of iteration macros for Guile. They are inspired by +@code{racket}'s family of iterators. Specifically, the following iterators are +available: +@itemize +@item @code{for} +@item @code{for/map} +@item @code{for/c} +@item @code{for/fold} +@item @code{for/fold-right} +@item @code{for/folder} +@item @code{folder} +@end itemize") + (license license:asl2.0)))) + (define-public guile2.0-lib (package (inherit guile-lib) -- cgit 1.4.1 From b64040206341c240e1e4eb7f1431b8aa51f3dcf9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 29 Jan 2023 14:56:55 +0100 Subject: gnu: komikku: Update to 1.10.1. * gnu/packages/gnome.scm (komikku): Update to 1.10.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f8b02670f7..4f2d716fb2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13221,7 +13221,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.9.0") + (version "1.10.1") (source (origin (method git-fetch) @@ -13231,7 +13231,7 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "0vz7mw9kvp3yhn7iqg11dvmk77l65wjp6p1rpn4xnr335zfacmjh")))) + "17nyfpg15i87204017as2dq491bq3dy261flwx71b2z4f4k6q83b")))) (build-system meson-build-system) (arguments (list -- cgit 1.4.1 From 44f43603d369d2df06942ecf90f983e850b87f43 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:00 +0100 Subject: gnu: Rename 'git-minimal/fixed' to 'git-minimal/pinned'. * gnu/packages/version-control.scm: Rename variable 'git-minimal/fixed' to 'git-minimal/pinned', add depreciation. * gnu/packages/erlang.scm (erlang-erlware-commons)[native-inputs]: Replace 'git-minimal/fixed' with 'git-minimal/pinned'. (rebar3-git-vsn)[inputs]: Likewise. * gnu/packages/gnome.scm (gnome-photos)[native-inputs]: Likewise. * gnu/packages/gtk.scm (graphene)[native-inputs]: Likewise. * gnu/packages/haskell.scm (ghc-8.8, ghc-8.10)[native-inputs]: Likewise. * gnu/packages/julia-xyz.scm (julia-documenter)[native-inputs]: Likewise. * gnu/packages/ocaml.scm (opam, ocamlformat)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Likewise. (python-scikit-build)[native-inputs]: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/packages/erlang.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/haskell.scm | 4 ++-- gnu/packages/julia-xyz.scm | 2 +- gnu/packages/ocaml.scm | 4 ++-- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/version-control.scm | 7 ++++++- 8 files changed, 17 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index cfada5a619..dc9a932aec 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -376,7 +376,7 @@ Markdown.") (propagated-inputs (list erlang-cf)) (native-inputs - (list git-minimal/fixed)) ;; Required for tests + (list git-minimal/pinned)) ;; Required for tests (arguments `(#:phases (modify-phases %standard-phases @@ -701,7 +701,7 @@ applications as a dependent libraries.") (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) (build-system rebar-build-system) (inputs - (list git-minimal/fixed)) + (list git-minimal/pinned)) (arguments `(;; Running the tests require binary artifact (tar-file containing ;; samples git repos) TODO: remove these from the source diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4f2d716fb2..6a4d3182b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -909,7 +909,7 @@ tomorrow, the rest of the week and for special occasions.") (list dbus desktop-file-utils gettext-minimal - git-minimal/fixed + git-minimal/pinned `(,glib "bin") gobject-introspection gsettings-desktop-schemas diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5024455368..f575194c73 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2519,7 +2519,7 @@ Parcellite and adds bugfixes and features.") '("-Dintrospection=false") '())))) (native-inputs - `(("git" ,git-minimal/fixed) + `(("git" ,git-minimal/pinned) ("gobject-introspection" ,gobject-introspection) ("mutest" ,mutest) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 91610a1f2e..4eb13f76d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1143,7 +1143,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -1195,7 +1195,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 414aba03f0..b831b41db2 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1614,7 +1614,7 @@ valuable enough at this time.") (inputs (list python-wrapper)) (native-inputs - (list git-minimal/fixed ;needed for the "Utilities" test + (list git-minimal/pinned ;needed for the "Utilities" test julia-documentermarkdown julia-documentertools)) (home-page "https://juliadocs.github.io/Documenter.jl") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3458c87818..0cc92c3e85 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -938,7 +938,7 @@ name = Guix Builder") ("ocaml-cppo" ,ocaml-cppo) ;; For tests. - ("git" ,git-minimal/fixed) + ("git" ,git-minimal/pinned) ("openssl" ,openssl) ("python" ,python-wrapper) ("rsync" ,rsync) @@ -8656,7 +8656,7 @@ defined in OCaml 4.12.0.") ocaml-uuseg ocaml-uutf)) (native-inputs - (list git-minimal/fixed ;for tests + (list git-minimal/pinned ;for tests ocaml-alcotest ocaml-ocp-indent ocaml-bisect-ppx)) (home-page "https://github.com/ocaml-ppx/ocamlformat") (synopsis "Auto-formatter for OCaml code") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b7975c2db4..1cad8e54d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25933,7 +25933,7 @@ also be usable with other GSSAPI mechanisms.") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) (native-inputs - (list git-minimal/fixed python-pytest)) + (list git-minimal/pinned python-pytest)) (propagated-inputs (list python-pypa-build python-setuptools python-tomli)) (home-page "https://github.com/mgedmin/check-manifest") @@ -28578,7 +28578,7 @@ and frame grabber interface.") (native-inputs (list cmake-minimal gfortran - git-minimal/fixed ;for tests + git-minimal/pinned ;for tests ninja python-coverage python-cython diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 78a89cfd5b..12e21336ce 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -67,6 +67,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) @@ -670,7 +671,11 @@ everything from small to very large projects with speed and efficiency.") perl zlib)))) -(define-public git-minimal/fixed +;;; The symbol git-minimal/fixed should be used when git-minimal needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias git-minimal/fixed git-minimal/pinned) + +(define-public git-minimal/pinned ;; Version that rarely changes, depended on by Graphene/GTK+. (package/inherit git-minimal (version "2.33.1") -- cgit 1.4.1 From 81f8cfcf0b52b9928793e5cf8d93d551d771206a Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:01 +0100 Subject: gnu: Rename 'libnftnl/fixed' to 'libnftnl/pinned'. * gnu/packages/linux.scm: Rename variable 'libnftnl/fixed' to 'libnftnl/pinned', add deprecation. (iptables)[native-inputs]: Replace 'libnftnl/fixed' with 'libnftnl/pinned'. Signed-off-by: Liliana Marie Prikler --- gnu/packages/linux.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e105bad406..54e3da8be2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2848,7 +2848,7 @@ external rate conversion.") (native-inputs (list pkg-config flex bison)) (inputs - (list libmnl libnftnl/fixed)) + (list libmnl libnftnl/pinned)) (arguments (list #:tests? #f ; no test suite #:configure-flags ; add $libdir to the RUNPATH of executables @@ -7654,9 +7654,13 @@ libnftnl has been previously known as libnftables. This library is currently used by nftables.") (license license:gpl2+))) +;;; The symbol libnftl/fixed should be used when libnftnl needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias libnftnl/fixed libnftnl/pinned) + ;; This is used in iptables, which contributes to rust. We're pinning this ;; variant to avoid accidental rebuilds of rust. -(define-public libnftnl/fixed +(define-public libnftnl/pinned (package (inherit libnftnl) (version "1.2.0") (source -- cgit 1.4.1 From c3e61c8c1f5ce867408ba7a113882a4b0ad5b2cb Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:02 +0100 Subject: gnu: Rename 'guile-3.0/fixed' to 'guile-3.0/pinned'. * gnu/packages/guile.scm: Rename variable 'guile-3.0/fixed' to 'guile-3.0/pinned', add deprecation. * etc/release-manifest.scm (%packages-to-cross-build): Replace 'guile-3.0/fixed' with 'guile-3.0/pinned'. * gnu/packages/autotools.scm (make-autoconf-wrapper)[inputs]: Likewise. * gnu/packages/commencement.scm (guile-final): Likewise. Signed-off-by: Liliana Marie Prikler --- etc/release-manifest.scm | 2 +- gnu/packages/autotools.scm | 2 +- gnu/packages/commencement.scm | 2 +- gnu/packages/guile.scm | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 3ef3483300..83983c0738 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -82,7 +82,7 @@ TARGET." ;; Packages that must be cross-buildable from x86_64-linux. ;; FIXME: Add (@ (gnu packages gcc) gcc) when ;; is fixed. - (append (list (@ (gnu packages guile) guile-3.0/fixed)) + (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" "gawk" "gettext" "gzip" "xz" diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 118f25ba09..006a9e202b 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -209,7 +209,7 @@ files with a system-specific shebang." (inputs `(("guile" ;; XXX: Kludge to hide the circular dependency. ,(module-ref (resolve-interface '(gnu packages guile)) - 'guile-3.0/fixed)) + 'guile-3.0/pinned)) ("autoconf" ,autoconf) ("bash" ,bash-minimal))) (arguments diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b4566b41cc..7335aedec2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3623,7 +3623,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (with-boot4 (hidden-package - (package-with-bootstrap-guile guile-3.0/fixed)))) + (package-with-bootstrap-guile guile-3.0/pinned)))) (define-public glibc-utf8-locales-final ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index edf289e574..2fd9b711ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -419,7 +419,11 @@ without requiring the source code to be rewritten.") "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) '()))))))) -(define-public guile-3.0/fixed +;;; The symbol guile-3.0/fixed should be used when guile-3.0 needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias guile-3.0/fixed guile-3.0/pinned) + +(define-public guile-3.0/pinned ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. (package -- cgit 1.4.1 From 2c3d1cdfccf60685877f2848eeb00a395f710dfd Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:03 +0100 Subject: gnu: Rename 'samba/fixed' to 'samba/pinned'. * gnu/packages/samba.scm: Rename variable 'samba/fixed' to 'samba/pinned' and 'samba/fixed-patched' to 'samba/fixed'. * gnu/packages/gnome.scm (libsoup-minimal)[inputs]: Replace 'samba/fixed' with 'samba/pinned'. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- gnu/packages/samba.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a4d3182b2..19a96ef9f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5199,7 +5199,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") sqlite zlib)) (inputs - (list mit-krb5 samba/fixed)) ; For ntlm_auth support + (list mit-krb5 samba/pinned)) ; For ntlm_auth support (home-page "https://wiki.gnome.org/Projects/libsoup") (synopsis "GLib-based HTTP Library") (description diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 00442d9645..da103ed839 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -275,14 +275,14 @@ Samba is an important component to seamlessly integrate Linux/Unix Servers and Desktops into Active Directory environments using the winbind daemon.") (license license:gpl3+))) -;;; FIXME: Invert inheritance relationship; the "fixed" package shouldn't be +;;; FIXME: Invert inheritance relationship; the "pinned" package shouldn't be ;;; susceptible to changes in the free one. -(define-public samba/fixed +(define-public samba/pinned ;; Version that rarely changes, depended on by libsoup. (hidden-package (package (inherit samba) - (replacement samba/fixed-patched) + (replacement samba/fixed) (version "4.15.3") (source (origin @@ -306,9 +306,9 @@ Desktops into Active Directory environments using the winbind daemon.") libxslt libxml2))))) -(define-public samba/fixed-patched +(define-public samba/fixed (package - (inherit samba/fixed) + (inherit samba/pinned) ;; This is 4.15.13, but we need to trim the store file name to have ;; the same length as the one we are grafting above. (version "4.15.A") -- cgit 1.4.1 From c7c97ac6a351807fb480f4e260079e27f195db2d Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 2 Feb 2023 21:23:34 +0000 Subject: gnu: wine: Update to 8.0. * gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0. [arguments]: Remove superfluous rpath setting in configure-flags. Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e86add4e3..7ca2ac5bdf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2022 Liliana Marie Prikler +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-public wine (package (name "wine") - (version "7.19") + (version "8.0") (source (origin (method url-fetch) @@ -88,7 +89,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) (native-inputs (list bison flex gettext-minimal perl pkg-config)) @@ -142,9 +143,6 @@ ;; pass. #:tests? #f - #:configure-flags - #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32")) - #:make-flags #~(list "SHELL=bash" (string-append "libdir=" #$output "/lib/wine32")) @@ -197,7 +195,7 @@ (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", so_dir );")))))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -260,7 +258,7 @@ integrate Windows applications into your desktop.") (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", so_dir );"))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -293,8 +291,7 @@ integrate Windows applications into your desktop.") (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))))))) #:configure-flags - #~(list "--enable-win64" - (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine)))) -- cgit 1.4.1 From fae79a9065f5c6cfe73554300d2cd5482d1ced24 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 2 Feb 2023 21:23:42 +0000 Subject: gnu: wine-staging: Update to 8.0. * gnu/packages/wine.scm (wine-staging,wine64-staging): Update to 8.0. Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..6e43494c68 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -336,7 +336,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "7.8") + (version "8.0") (source (origin (method git-fetch) @@ -345,7 +345,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) + (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -395,7 +395,7 @@ integrate Windows applications into your desktop.") "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg -- cgit 1.4.1 From 6bfd48ff72660369ab0d4d409530b80484e08542 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 2 Feb 2023 21:23:59 +0000 Subject: gnu: wine-minimal: Make the parent of wine so phases can be shared. * gnu/packages/wine.scm (wine,wine-minimal): Have wine expand upon the package definition of wine-minimal instead of having wine-minimal trim down the package definition of wine, and share the phases between them. Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 166 +++++++++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 91 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e43494c68..ceef09ea5d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -74,9 +74,11 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -(define-public wine +;; This minimal build of Wine is needed to prevent a circular dependency with +;; vkd3d. +(define-public wine-minimal (package - (name "wine") + (name "wine-minimal") (version "8.0") (source (origin @@ -91,8 +93,72 @@ (sha256 (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) + (native-inputs (list bison flex)) + (inputs `()) + (arguments + (list + ;; Force a 32-bit build targeting a similar architecture, i.e.: + ;; armhf for armhf/aarch64, i686 for i686/x86_64. + #:system (match (%current-system) + ((or "armhf-linux" "aarch64-linux") "armhf-linux") + (_ "i686-linux")) + + ;; XXX: There's a test suite, but it's unclear whether it's supposed to + ;; pass. + #:tests? #f + + #:make-flags + #~(list "SHELL=bash" + (string-append "libdir=" #$output "/lib/wine32")) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-SHELL + (lambda _ + (substitute* "configure" + ;; configure first respects CONFIG_SHELL, clobbers SHELL later. + (("/bin/sh") + (which "bash"))))) + (add-after 'configure 'patch-dlopen-paths + ;; Hardcode dlopened sonames to absolute paths. + (lambda _ + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path library-path soname)))) + (substitute* "include/config.h" + (("(#define SONAME_.* )\"(.*)\"" _ defso soname) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-after 'patch-generated-file-shebangs 'patch-makedep + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "tools/makedep.c" + (("output_filenames\\( unix_libs \\);" all) + (string-append all + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))) + #:configure-flags + #~(list "--without-freetype" + "--without-x"))) + (home-page "https://www.winehq.org/") + (synopsis "Implementation of the Windows API (32-bit only)") + (description + "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a +compatibility layer capable of running Windows applications. Instead of +simulating internal Windows logic like a virtual machine or emulator, Wine +translates Windows API calls into POSIX calls on-the-fly, eliminating the +performance and memory penalties of other methods and allowing you to cleanly +integrate Windows applications into your desktop.") + ;; Any platform should be able to build wine, but based on '#:system' these + ;; are the ones we currently support. + (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) + (license license:lgpl2.1+))) + +(define-public wine + (package + (inherit wine-minimal) + (name "wine") (native-inputs - (list bison flex gettext-minimal perl pkg-config)) + (modify-inputs (package-native-inputs wine-minimal) + (prepend gettext-minimal perl pkg-config))) (inputs ;; Some libraries like libjpeg are now compiled into native PE objects. ;; The ELF objects provided by Guix packages are of no use. Whilst this @@ -100,6 +166,7 @@ ;; to build some of these from Guix PACKAGE-SOURCE but attempts were not ;; fruitful so far. See . (list alsa-lib + bash-minimal cups dbus eudev @@ -132,23 +199,9 @@ vkd3d vulkan-loader)) (arguments - (list - ;; Force a 32-bit build targeting a similar architecture, i.e.: - ;; armhf for armhf/aarch64, i686 for i686/x86_64. - #:system (match (%current-system) - ((or "armhf-linux" "aarch64-linux") "armhf-linux") - (_ "i686-linux")) - - ;; XXX: There's a test suite, but it's unclear whether it's supposed to - ;; pass. - #:tests? #f - - #:make-flags - #~(list "SHELL=bash" - (string-append "libdir=" #$output "/lib/wine32")) - - #:phases - #~(modify-phases %standard-phases + (substitute-keyword-arguments (package-arguments wine-minimal) + ((#:phases phases) + #~(modify-phases #$phases ;; Explicitly set the 32-bit version of vulkan-loader when installing ;; to i686-linux or x86_64-linux. ;; TODO: Add more JSON files as they become available in Mesa. @@ -173,42 +226,8 @@ "/radeon_icd.i686.json" ":" icd "/intel_icd.i686.json"))))))))) (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL later. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname))))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))))) - (home-page "https://www.winehq.org/") - (synopsis "Implementation of the Windows API (32-bit only)") - (description - "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a -compatibility layer capable of running Windows applications. Instead of -simulating internal Windows logic like a virtual machine or emulator, Wine -translates Windows API calls into POSIX calls on-the-fly, eliminating the -performance and memory penalties of other methods and allowing you to cleanly -integrate Windows applications into your desktop.") - ;; Any platform should be able to build wine, but based on '#:system' these - ;; are thr ones we currently support. - (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) - (license license:lgpl2.1+))) + `())))) + ((#:configure-flags _ '()) #~'()))))) (define-public wine64 (package @@ -298,41 +317,6 @@ integrate Windows applications into your desktop.") (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -;; This minimal build of Wine is needed to prevent a circular dependency with -;; vkd3d. -(define-public wine-minimal - (package - (inherit wine) - (name "wine-minimal") - (native-inputs (modify-inputs (package-native-inputs wine) - (delete "gettext" "perl" "pkg-config"))) - (inputs `()) - (arguments - `(#:validate-runpath? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL later. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - (list "--without-freetype" - "--without-x") - ,@(strip-keyword-arguments '(#:configure-flags #:phases) - (package-arguments wine)))))) - (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") -- cgit 1.4.1 From d9a7bc96aeba4cf501daa5b4bd8eb2dfbd1152a5 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 2 Feb 2023 21:24:08 +0000 Subject: gnu: wine64: Share phases with parent wine package. * gnu/packages/wine.scm (wine64): Share phases with parent wine package. Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 134 +++++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 78 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ceef09ea5d..3b637f76e5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -236,84 +236,62 @@ integrate Windows applications into your desktop.") (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - (cons* - #:make-flags - #~(list "SHELL=bash" - (string-append "libdir=" #$output "/lib/wine64")) - #:phases - #~(modify-phases %standard-phases - ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader - ;; when installing to x86_64-linux so both are available. - ;; TODO: Add more JSON files as they become available in Mesa. - #$@(match (%current-system) - ((or "x86_64-linux") - `((add-after 'copy-wine32-binaries 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd-files (map - (lambda (basename) - (search-input-file - inputs - (string-append "/share/vulkan/icd.d/" - basename))) - '("radeon_icd.x86_64.json" - "intel_icd.x86_64.json" - "radeon_icd.i686.json" - "intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = ,icd-files)) - (wrap-program (string-append out "/bin/wine64-preloader") - `("VK_ICD_FILENAMES" ":" = ,icd-files))))))) - (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL later. - (("/bin/sh") - (which "bash"))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (search-input-file inputs "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrapped - ;; version. - (copy-file (search-input-file inputs "/bin/.wine-preloader-real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - (copy-recursively (search-input-directory inputs "/lib/wine32") - (string-append out "/lib/wine32"))))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from wine. - (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz") - (string-append out "/share/man/man1/wine.1.gz"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - #~(list "--enable-win64") - (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (substitute-keyword-arguments + (strip-keyword-arguments '(#:system) (package-arguments wine)) + ((#:make-flags _) + #~(list "SHELL=bash" + (string-append "libdir=" #$output "/lib/wine64")) + ) + ((#:phases phases) + #~(modify-phases #$phases + ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader + ;; when installing to x86_64-linux so both are available. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "x86_64-linux") + `((delete 'wrap-executable) + (add-after 'copy-wine32-binaries 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd-files (map + (lambda (basename) + (search-input-file + inputs + (string-append "/share/vulkan/icd.d/" + basename))) + '("radeon_icd.x86_64.json" + "intel_icd.x86_64.json" + "radeon_icd.i686.json" + "intel_icd.i686.json")))) + (wrap-program (string-append out "/bin/wine-preloader") + `("VK_ICD_FILENAMES" ":" = ,icd-files)) + (wrap-program (string-append out "/bin/wine64-preloader") + `("VK_ICD_FILENAMES" ":" = ,icd-files))))))) + (_ + `())) + (add-after 'install 'copy-wine32-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + ;; Copy the 32-bit binaries needed for WoW64. + (copy-file (search-input-file inputs "/bin/wine") + (string-append out "/bin/wine")) + ;; Copy the real 32-bit wine-preloader instead of the wrapped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preloader-real") + (string-append out "/bin/wine-preloader"))))) + (add-after 'install 'copy-wine32-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + (copy-recursively (search-input-directory inputs "/lib/wine32") + (string-append out "/lib/wine32"))))) + (add-after 'compress-documentation 'copy-wine32-manpage + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + ;; Copy the missing man file for the wine binary from wine. + (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz") + (string-append out "/share/man/man1/wine.1.gz"))))))) + ((#:configure-flags configure-flags '()) + #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -- cgit 1.4.1 From d9e2ad989a651846e24d28e0c8b837833e440f7c Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 2 Feb 2023 21:24:21 +0000 Subject: gnu: wine-minimal: Build more reproducibly. * gnu/packages/wine.scm (wine-minimal)[phases]: Add a new 'set-widl-time-override phase. Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 3b637f76e5..88f146b46b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -134,7 +134,12 @@ (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags #~(list "--without-freetype" "--without-x"))) -- cgit 1.4.1 From add37404d9ef23018df059ae0de76bd62d0a443a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 5 Nov 2022 12:25:04 -0300 Subject: gnu: hypercorn: Update to 0.14.3. * gnu/packages/python-web.scm (hypercorn): Update to 0.14.3. [source]: Fetch from GitHub. [build-system]: Switch to pyproject-build-system. [arguments]: Don't override the 'check phase. [native-inputs]: Add python-poetry-core. --- gnu/packages/python-web.scm | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 765a07a20c..758cd9124c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2020 Holger Peters ;;; Copyright © 2020 Noisytoot ;;; Copyright © 2020 Edouard Klein -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020, 2022 Giacomo Leidi ;;; Copyright © 2021 Ekaitz Zarraga @@ -2059,22 +2059,17 @@ RFC6455, regardless of your programming paradigm.") (define-public hypercorn (package (name "hypercorn") - (version "0.11.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Hypercorn" version)) - (sha256 - (base32 "16kai5d12f05jr89mj611zslxqri4cd7ixcgd6yhl211qlcyg8av")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest"))))))) + (version "0.14.3") + (source (origin + (method git-fetch) ;PyPI does not have tests + (uri (git-reference + (url "https://github.com/pgjones/hypercorn") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hkph0sdr94hxmrq1grnh842snm561sw4az5q6a3ba9hqnrl890h")))) + (build-system pyproject-build-system) ;; Propagate because Hypercorn also exposes functionality over a module. (propagated-inputs (list python-h11 @@ -2086,6 +2081,7 @@ RFC6455, regardless of your programming paradigm.") (native-inputs (list python-hypothesis python-mock + python-poetry-core python-pytest python-pytest-asyncio python-pytest-cov @@ -2096,8 +2092,8 @@ RFC6455, regardless of your programming paradigm.") (description "Hypercorn is an ASGI web server based on the sans-io hyper, h11, h2, and wsproto libraries and inspired by Gunicorn. It supports HTTP/1, HTTP/2, -WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications. It can -utilise asyncio, uvloop, or trio worker types.") +WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications. It +can utilise asyncio, uvloop, or trio worker types.") (license license:expat))) (define-public python-hypercorn -- cgit 1.4.1 From f70baf8af0821af68784cdc48a4d00290522fee9 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 28 Aug 2022 17:21:54 -0300 Subject: gnu: python-diff-match-patch: Update to 20200713. * gnu/packages/python-xyz.scm (python-diff-match-patch): Update to 20200713. [arguments]: Override the 'check phase. [home-page]: Update URL. --- gnu/packages/python-xyz.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1cad8e54d8..e7edbccb7c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -80,7 +80,7 @@ ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020, 2022 Michael Rohleder -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Malte Frank Gerdes @@ -20338,16 +20338,23 @@ point is the point of maximum curvature.") (define-public python-diff-match-patch (package (name "python-diff-match-patch") - (version "20121119") + (version "20200713") (source (origin (method url-fetch) (uri (pypi-uri "diff-match-patch" version)) (sha256 (base32 - "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx")))) + "063s8zcxz787xfg7d1wxpqh59fxg3iz85ww9zhyz4vaqm80mlvys")))) (build-system python-build-system) - (home-page "https://code.google.com/p/google-diff-match-patch") + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" + "diff_match_patch.tests"))))))) + (home-page "https://github.com/diff-match-patch-python/diff-match-patch") (synopsis "Synchronize plain text") (description "Diff Match and Patch libraries offer robust algorithms to perform the operations required for synchronizing plain text.") -- cgit 1.4.1 From 39e80baafce41a7e8ae516953625f27e2f087f57 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 3 Dec 2022 11:25:29 -0300 Subject: gnu: python-pyqtgraph: Update to 0.13.1. * gnu/packages/python-xyz.scm (python-pyqtgraph): Update to 0.13.1. [build-system]: Use pyproject-build-system. [arguments]: Rewrite as G-expressions; disable tests through test-flags, not by replacing the 'check phase. [phases]: Remove trailing #t; rename the 'set-home-and-qpa phase to 'set-qpa. [native-inputs]: Replace python-pytest with python-pytest-7.1. [home-page]: Use https. --- gnu/packages/python-xyz.scm | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e7edbccb7c..de71c48d84 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16146,48 +16146,31 @@ ISO 8859, etc.).") (define-public python-pyqtgraph (package (name "python-pyqtgraph") - (version "0.12.1") + (version "0.13.1") (source (origin (method url-fetch) (uri (pypi-uri "pyqtgraph" version)) (sha256 - (base32 "0kc7ncv0lr3spni29i9g8nszyr4xinswqi2zzs6v8kqqi593pvyj")))) - (build-system python-build-system) + (base32 "026wq2p7h1dmg2ldwhxiv28i5qld0llhnak06dxp4rdrkpsqg3v9")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-home-and-qpa - (lambda _ - (setenv "HOME" "/tmp") - (setenv "QT_QPA_PLATFORM" "offscreen") - #t)) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "-k" - (string-append - ;; These tests try to download online data. - "not test_PolyLineROI" - " and not test_getArrayRegion_axisorder" - " and not test_getArrayRegion" - " and not test_PlotCurveItem" - " and not test_NonUniformImage_colormap" - " and not test_NonUniformImage_lut" - " and not test_ImageItem_axisorder" - " and not test_ImageItem" - ;; The test_reload test fails and suggests adding - ;; "--assert=plain" to the pytest command, but it - ;; doesn't solve the failure. - " and not test_reload"))))))) - (native-inputs - (list python-pytest python-pytest-cov python-pytest-xdist)) + ;; This test fails. It suggests to disable assert rewriting in Pytest, + ;; but it still doesn't pass. + (list #:test-flags #~'("-k" "not test_reload") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-qpa + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (native-inputs + (list python-pytest-7.1 python-pytest-cov python-pytest-xdist)) (inputs (list qtbase-5)) (propagated-inputs (list python-h5py python-numpy python-pyopengl python-scipy python-pyqt-without-qtwebkit)) - (home-page "http://www.pyqtgraph.org") + (home-page "https://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description "PyQtGraph is a Pure-python graphics library for PyQt5, PyQt6, PySide2 -- cgit 1.4.1 From cd0ae604f4dcb3799c23c9332cc463eb1a04957c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 5 Dec 2022 21:20:04 -0300 Subject: gnu: python-janus: Update to 1.0.0. * gnu/packages/python-xyz.scm (python-janus): Update to 1.0.0. [build-system]: Switch to pyproject-build-system. [arguments]: Don't override the 'check phase. [propagated-inputs]: Add python-typing-extensions. --- gnu/packages/python-xyz.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index de71c48d84..1866f9c920 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -291,24 +291,17 @@ similar XML files, in the same way the @command{diff} utility does it.") (define-public python-janus (package (name "python-janus") - (version "0.6.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "janus" version)) (sha256 - (base32 "030xvl2vghi5ispfalhvch1rl6i2jsy5bf1dgjafa7vifppy04j7")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "--cov=janus" "--cov=tests"))))))) + (base32 "04hnrdcf03g1s0x3sr72sh9gnszz6kyfsl9dg8a4n0zvvhn6z5yz")))) + (build-system pyproject-build-system) (native-inputs (list python-pytest python-pytest-cov python-pytest-asyncio)) + (propagated-inputs (list python-typing-extensions)) (home-page "https://github.com/aio-libs/janus/") (synopsis "Sync-async queue to interoperate between asyncio tasks and classic threads") -- cgit 1.4.1 From 7100720b58f38ec965852db02c6cd3f7863e0510 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 29 Jan 2023 07:56:04 -0300 Subject: gnu: python-cartopy: Update to 0.21.1. * gnu/packages/geo.scm (python-cartopy): Update to 0.21.1. --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6402e56a0f..097ced33e1 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Christopher Baines ;;; Copyright © 2020, 2021, 2022 Felix Gruber ;;; Copyright © 2021 Sharlatan Hellseher -;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021, 2023 Vinicius Monego ;;; Copyright © 2021 Clément Lassieur ;;; Copyright © 2021, 2022 Nikolay Korotkiy ;;; Copyright © 2022 Roman Scherer @@ -1167,13 +1167,13 @@ utilities for data translation and processing.") (package (name "python-cartopy") ;; This is a post-release fix that adds build_ext to setup.py. - (version "0.21.0") + (version "0.21.1") (source (origin (method url-fetch) (uri (pypi-uri "Cartopy" version)) (sha256 - (base32 "0hnfs75dcnz12ximah5xn9566r8zz189lxikmj4lrs9jl4l3l7ff")))) + (base32 "02i5rjhvrsi3vgj8kfsdx77g1xl59jh2a671qqqj4n682abn9mc9")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From e053fcd3e30532c4126779c02053106a0a68b8d8 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 29 Jan 2023 07:59:47 -0300 Subject: gnu: python-wand: Update to 0.6.11. * gnu/packages/python-xyz.scm (python-wand): Update to 0.6.11. [arguments]: Override the 'check phase. --- gnu/packages/python-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1866f9c920..15f1a80fed 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2083,13 +2083,13 @@ conventions and aliases in the same expression.") (define-public python-wand (package (name "python-wand") - (version "0.6.10") + (version "0.6.11") (source (origin (method url-fetch) (uri (pypi-uri "Wand" version)) (sha256 - (base32 "0mywzs235skwq670c80achrd34kangwy24793k1nij3651zllgrp")))) + (base32 "15d9kxyc7qvknx0kv27m2jamnmisckyf89i7wlqykwgqm46p0qdn")))) (build-system python-build-system) (arguments `(#:phases @@ -2097,7 +2097,11 @@ conventions and aliases in the same expression.") (add-after 'unpack 'find-magickwand (lambda* (#:key inputs #:allow-other-keys) (setenv "MAGICK_HOME" (assoc-ref inputs "imagemagick")) - (setenv "WAND_MAGICK_LIBRARY_SUFFIX" ".Q16")))))) + (setenv "WAND_MAGICK_LIBRARY_SUFFIX" ".Q16"))) + (replace 'check + (lambda _ + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs (list python-pytest)) (inputs -- cgit 1.4.1 From 8a7dbb42c848bbe6279b6ca049710799f4727432 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 4 Feb 2023 08:55:28 +0100 Subject: gnu: msmtp: Update to 1.8.23. * gnu/packages/mail.scm (msmtp): Update to 1.8.23. Signed-off-by: Leo Famulari --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 80e2ce2a9b..d0812e5288 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1795,14 +1795,14 @@ addons which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.22") + (version "1.8.23") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "1rx3ksvwdfrwahsd2lwf52vnhhq72ygb0kjy6ci2df55hri2010v")))) + (base32 "1f2nqdj3k8q7l4m3a6n8ckaslilxxp2kzfdmni6l2gcv15mw216g")))) (build-system gnu-build-system) (inputs (list libsecret gnutls zlib gsasl)) -- cgit 1.4.1 From cf219e35ecd08ff51d216224732b29f9b92adf1e Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 4 Feb 2023 09:04:26 +0100 Subject: gnu: mpop: Add release-monitoring-url. * gnu/packages/mail.scm (mpop)[properties]: New field. Signed-off-by: Leo Famulari --- gnu/packages/mail.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d0812e5288..84c5067a9e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2905,6 +2905,8 @@ easily (one at a time).") (native-inputs (list pkg-config)) (home-page "https://marlam.de/mpop/") + (properties + '((release-monitoring-url . "https://marlam.de/mpop/download/"))) (synopsis "POP3 mail client") (description "mpop is a small and fast POP3 client suitable as a fetchmail replacement. -- cgit 1.4.1 From 9006704a38c7848e39bf7cc634406ec3f4c6cd75 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 4 Feb 2023 09:04:28 +0100 Subject: gnu: mpop: Update to 1.4.18. * gnu/packages/mail.scm (mpop): Update to 1.4.18. Signed-off-by: Leo Famulari --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 84c5067a9e..adac3cce4b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2891,14 +2891,14 @@ easily (one at a time).") (define-public mpop (package (name "mpop") - (version "1.4.17") + (version "1.4.18") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "1mcbvzdbdr86zsq8zr1zryjrmfiqikckx3648zvdjh99mm5lkbj2")))) + (base32 "1dw5kwflga26kfjl999lilq14vvk6fcapryihakr9l7phh0rb6b0")))) (build-system gnu-build-system) (inputs (list gnutls)) -- cgit 1.4.1 From 19e4bb8da2eab765da030107930b030540779585 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:48 +0100 Subject: gnu: imv: Update to 4.4.0. * gnu/packages/image-viewers.scm (imv): Update to 4.4.0. Signed-off-by: Leo Famulari --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 200b8c1cc3..0701f7bd4f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -750,7 +750,7 @@ displayed in a terminal.") (define-public imv (package (name "imv") - (version "4.3.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -758,7 +758,7 @@ displayed in a terminal.") (commit (string-append "v" version)))) (sha256 (base32 - "01x6qg7nhikqh68gnzrdvq0rxma5v9z19il89y8bvdrcr7r1vh40")) + "1zlds43z17jrnsrfz3rf3sb3pa5gkmxaibq87509ikc7p1p09c9c")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments -- cgit 1.4.1 From 1ec22406b2f773e6c901b4afbc1a7723855a66f8 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:49 +0100 Subject: gnu: imv: Use new package style. * gnu/packages/image-viewers.scm (imv)[arguments]: Use G-expressions. Signed-off-by: Leo Famulari --- gnu/packages/image-viewers.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 0701f7bd4f..02e25aee5f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -762,17 +762,15 @@ displayed in a terminal.") (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'record-absolute-file-names - (lambda* (#:key outputs #:allow-other-keys) - ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. - ;; Record their absolute file name. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (substitute* (string-append bin "/imv") - (("imv-") - (string-append bin "/imv-"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'record-absolute-file-names + (lambda _ + ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. + ;; Record their absolute file name. + (let ((bin (string-append #$output "/bin"))) + (substitute* (string-append bin "/imv") + (("imv-") (string-append bin "/imv-"))))))))) (native-inputs (list asciidoc pkg-config)) -- cgit 1.4.1 From ce28d14a9cdc2002b48acfe1b1bb627bc6a9c9d8 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 5 Feb 2023 13:23:50 +0100 Subject: gnu: imv: Record absolute file name of 'imv' script. * gnu/packages/image-viewers.scm (imv)[arguments]: Fix the 'imv-dir' script in the 'record-absolute-file-names' phase. Signed-off-by: Leo Famulari --- gnu/packages/image-viewers.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 02e25aee5f..1879b9949c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -767,10 +767,12 @@ displayed in a terminal.") (add-after 'install 'record-absolute-file-names (lambda _ ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. - ;; Record their absolute file name. + ;; 'imv-dir' execs 'imv'. Record their absolute file names. (let ((bin (string-append #$output "/bin"))) (substitute* (string-append bin "/imv") - (("imv-") (string-append bin "/imv-"))))))))) + (("imv-") (string-append bin "/imv-"))) + (substitute* (string-append bin "/imv-dir") + (("imv") (string-append bin "/imv"))))))))) (native-inputs (list asciidoc pkg-config)) -- cgit 1.4.1 From 716f2b330fb0566e48423a7f928759a351e73850 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 5 Feb 2023 13:44:17 +0100 Subject: gnu: xfce4-notifyd: Update to 0.7.3. * gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.7.3. Signed-off-by: Leo Famulari --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index dda3cff901..30c0305f4c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1350,7 +1350,7 @@ several different time zones.") (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1358,7 +1358,7 @@ several different time zones.") name "-" version ".tar.bz2")) (sha256 (base32 - "0yzdidi7x8bfnypn0pnahpc25vmjmdiclvbybjqxmdk9pl8ylhfq")))) + "0hz9x42cfwd52i02a50mqvw3qwpgb3hpnlxqnnlkc8bwadfn1nah")))) (build-system glib-or-gtk-build-system) (native-inputs (list intltool pkg-config)) -- cgit 1.4.1 From 42731de1d93100d82b7917825d1bf52b1f4c52e4 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 23 Jan 2023 20:04:25 +0000 Subject: gnu: mpd: Add missing inputs. Enable more features for MPD. * gnu/packages/mpd.scm (mpd)[inputs]: Add liburing, chromaprint, expat, libgme, libnfs, libopenmpt, libshout, pcre2, soxr, yajl and zziplib. Signed-off-by: Leo Famulari --- gnu/packages/mpd.scm | 67 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7c5d7b9486..983fbaf3b2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) ;for MPD #:use-module (gnu packages cpp) + #:use-module (gnu packages file-systems) #:use-module (gnu packages freedesktop) ;elogind #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -81,7 +82,8 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) - #:use-module (gnu packages xiph)) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xml)) (define-public libmpdclient (package @@ -144,41 +146,50 @@ interfacing MPD in the C, C++ & Objective C languages.") (string-append "_" all))) (substitute* "meson.build" (("systemd_dep,") "systemd_dep, _systemd_dep,"))))))) - (inputs (list ao - alsa-lib - avahi - boost - curl - elogind - ffmpeg - flac - fmt - glib - icu4c - ;; The LAME decoder comes from FFmpeg, but is added here so that - ;; configure picks up the LAME encoder. - lame - libid3tag - libmpdclient - libsamplerate - libsndfile - libvorbis - opus - pipewire - pulseaudio - sqlite - zlib)) + (inputs (append + (if (target-linux?) (list liburing) '()) + (list ao + alsa-lib + avahi + boost + chromaprint + curl + elogind + expat + ffmpeg + flac + fmt + glib + icu4c + ;; The LAME decoder comes from FFmpeg, but is added here so that + ;; configure picks up the LAME encoder. + lame + libgme + libid3tag + libmpdclient + libnfs + libopenmpt + libsamplerate + libshout + libsndfile + libvorbis + opus + pcre2 + pipewire + pulseaudio + soxr + sqlite + yajl + zlib + zziplib))) (native-inputs (list cmake pkg-config python-sphinx)) ;; Missing optional inputs: - ;; yajl ;; libcdio_paranoia ;; libmms ;; libadplug ;; libaudiofile ;; faad2 ;; fluidsynth - ;; libgme - ;; libshout ;; libmpg123 ;; libmodplug ;; libmpcdec -- cgit 1.4.1 From 95ecff4289e37cf15e3d19847076a8a9d108527d Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 23 Jan 2023 20:04:26 +0000 Subject: gnu: mpd: Update to 0.23.12. * gnu/packages/mpd.scm (mpd): Update to 0.23.12. Signed-off-by: Leo Famulari --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 983fbaf3b2..4df2dfd655 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -118,7 +118,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.23.11") + (version "0.23.12") (source (origin (method url-fetch) (uri @@ -127,7 +127,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1afwvw2670yz3kxzlqjlg9r8ra8fjihj97hgc6skiwnzz6lfgd7d")))) + "1rq2hyfvwwri3sivab747csza2i096y7m8563rl5mhpchhiadz5p")))) (build-system meson-build-system) (arguments (list -- cgit 1.4.1 From 0fe13918de0a4bf386c95e6263ffce6d7f27e63f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 29 Jan 2023 11:58:50 +0800 Subject: gnu: xfce: Add more packages. * gnu/packages/xfce.scm (xfce)[inputs]: Add mousepad, xfce4-screenshooter, xfce4-taskmanager and xkill. --- gnu/packages/xfce.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 30c0305f4c..7a64667139 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1195,6 +1195,7 @@ for and start applications.") greybird-gtk-theme hicolor-icon-theme mate-polkit-for-xfce + mousepad ristretto shared-mime-info thunar @@ -1204,12 +1205,15 @@ for and start applications.") xfce4-notifyd ;for pop-up notifications xfce4-panel xfce4-power-manager + xfce4-screenshooter xfce4-session xfce4-settings + xfce4-taskmanager xfce4-terminal xfconf xfdesktop xfwm4 + xkill ;; Panel plugins. xfce4-battery-plugin xfce4-clipman-plugin -- cgit 1.4.1 From 0890cb97473f1ec8d03cec2347f63deb546d2231 Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Fri, 30 Dec 2022 16:42:02 -0500 Subject: gnu: Add python-setuptools-lint. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/check.scm (python-setuptools-lint): New variable. Signed-off-by: 宋文武 --- gnu/packages/check.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index aaa41777dc..3d14cb7585 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2672,6 +2672,24 @@ pragmas to control it from within your code. Additionally, it is possible to write plugins to add your own checks.") (license license:gpl2+))) +(define-public python-setuptools-lint + (package + (name "python-setuptools-lint") + (version "0.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "setuptools-lint" version)) + (sha256 + (base32 + "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577")))) + (build-system python-build-system) + (propagated-inputs (list python-pylint)) + (home-page "https://github.com/johnnoone/setuptools-pylint") + (synopsis "Run pylint with @command{python setup.py lint}") + (description "This package expose pylint as a lint command into +setup.py.") + (license license:bsd-3))) + (define-public python-paramunittest (package (name "python-paramunittest") -- cgit 1.4.1 From a582d863465990642d331bc05bf073f47fb80908 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Feb 2023 10:52:14 +0100 Subject: gnu: Add r-ggsankey. * gnu/packages/bioinformatics.scm (r-ggsankey): New variable. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 656eb7f13a..ef1e7ae988 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7995,6 +7995,36 @@ sequence.") 3D perspective axes, 3D perspective annotations, and wireframe plots.") (license license:gpl3+)))) +(define-public r-ggsankey + (let ((commit "be08dd0f86eaee9f9ff9e7ff95d47930660a3c36") + (revision "1")) + (package + (name "r-ggsankey") + (version (git-version "0.0.99999" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/davidsjoberg/ggsankey") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0acpmydqqc91pq5p9wpkpmgqp3nhiljabd7d3i00kwhjxgm2bvba")))) + (properties `((upstream-name . "ggsankey"))) + (build-system r-build-system) + (propagated-inputs (list r-dplyr + r-ggplot2 + r-magrittr + r-purrr + r-stringr + r-tidyr)) + (home-page "https://github.com/davidsjoberg/ggsankey") + (synopsis "Sankey, Alluvial and Sankey bump plots") + (description + "This package provides a package that makes it easy to implement +sankey, alluvial and sankey bump plots in @code{ggplot2}.") + (license license:expat)))) + (define-public r-gutils (let ((commit "10e36c7b580aacb2d952140a3fdd82418aaddea6") (revision "1")) -- cgit 1.4.1 From 1df2430f4625b46e8493c94d24982bbe3f78b959 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 25 Dec 2022 21:32:22 -0600 Subject: gnu: lilypond: Update to 2.24.0. * gnu/packages/music.scm (lilypond): Update to 2.24.0. [arguments]: Remove adjust-to-API-change, prepare-configuration, and install-info phases. Use disable-documentation flag and GUILE_FLAVOUR environment variable. Remove make-flags keyword option. [inputs]: Add extractpdfmark and update guile to 3.0. [native-inputs]: Update Python 2 to 3 and add missing texlive-fontinst and texlive-lm. [home-page]: Update it. Signed-off-by: Jonathan Brielmaier Tested-by: Jonathan Brielmaier --- gnu/packages/music.scm | 69 ++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 967d9e4b23..4ae15d2e09 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jose G Perez Taveras +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -1386,7 +1387,7 @@ and auto-mapping slices to MIDI note numbers.") (define-public lilypond (package (name "lilypond") - (version "2.20.0") + (version "2.24.0") (source (origin (method url-fetch) @@ -1394,60 +1395,32 @@ and auto-mapping slices to MIDI note numbers.") "v" (version-major+minor version) "/" "lilypond-" version ".tar.gz")) (sha256 - (base32 "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar")))) + (base32 "0scbyzbxqnzgibls62npg2i3sywnb146gw7jlvinj9dhj8xvxv9w")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;out-test/collated-files.html fails - #:out-of-source? #t - #:make-flags '("conf=www") ;to generate images for info manuals - #:configure-flags - (list "CONFIGURATION=www" - (string-append "--with-texgyre-dir=" - (assoc-ref %build-inputs "font-tex-gyre") - "/share/fonts/opentype/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-path-references - (lambda _ - (substitute* "scm/backend-library.scm" - (("\\(search-executable '\\(\"gs\"\\)\\)") - (string-append "\"" (which "gs") "\"")) - (("\"/bin/sh\"") - (string-append "\"" (which "sh") "\""))))) - (add-after 'fix-path-references 'adjust-to-API-change - (lambda _ - (substitute* '("Documentation/pictures/GNUmakefile" - "stepmake/stepmake/tex-rules.make") - ((".*-c .setpdfwrite.*") "")) - (substitute* "scm/backend-library.scm" - (("\"-c.setpdfwrite\"") "")) - (substitute* "scm/framework-ps.scm" - (("\".setpdfwrite ") "\"")))) - (add-before 'configure 'prepare-configuration - (lambda _ - (substitute* "configure" - (("SHELL=/bin/sh") "SHELL=sh") - ;; When checking the fontforge version do not consider the - ;; version string that's part of the directory. - (("head -n") "tail -n") - ;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge. - (("20110222") "19700101")) - (setenv "out" "www") - (setenv "conf" "www"))) - (add-after 'install 'install-info - (lambda _ - (invoke "make" - "-j" (number->string (parallel-job-count)) - "conf=www" "install-info")))))) + (list #:tests? #f ;out-test/collated-files.html fails + #:out-of-source? #t + #:configure-flags + #~(list "--disable-documentation" "GUILE_FLAVOR=guile-3.0") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scm/backend-library.scm" + (("\\(search-executable '\\(\"gs\"\\)\\)") + (string-append "\"" (search-input-file inputs "bin/gs") "\"")) + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "bin/sh") "\"")))))))) (inputs - `(("guile" ,guile-1.8) + `(("guile" ,guile-3.0) + ("extractpdfmark" ,extractpdfmark) ("font-dejavu" ,font-dejavu) ("font-tex-gyre" ,font-tex-gyre) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("ghostscript" ,ghostscript) ("pango" ,pango) - ("python" ,python-2))) + ("python" ,python))) (native-inputs `(("bison" ,bison) ("perl" ,perl) @@ -1459,14 +1432,16 @@ and auto-mapping slices to MIDI note numbers.") ("netpbm" ,netpbm) ;for pngtopnm ("texlive" ,(texlive-updmap.cfg (list texlive-metapost texlive-epsf + texlive-fontinst texlive-lh + texlive-lm texlive-latex-cyrillic))) ("texinfo" ,texinfo) ("texi2html" ,texi2html-1.82) ("rsync" ,rsync) ("pkg-config" ,pkg-config) ("zip" ,zip))) - (home-page "http://www.lilypond.org/") + (home-page "https://lilypond.org") (synopsis "Music typesetting") (description "GNU LilyPond is a music typesetter, which produces high-quality sheet -- cgit 1.4.1 From 607f1738db545875bd050c07b233fd2e1909386c Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Mon, 6 Feb 2023 23:24:27 +0100 Subject: gnu: lilypond: Remove input labels. * gnu/packages/music.scm (lilypond)[inputs]: Remove input labels. [native-inputs]: Dito. --- gnu/packages/music.scm | 58 ++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4ae15d2e09..69e8cbcc79 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1412,35 +1413,36 @@ and auto-mapping slices to MIDI note numbers.") (("\"/bin/sh\"") (string-append "\"" (search-input-file inputs "bin/sh") "\"")))))))) (inputs - `(("guile" ,guile-3.0) - ("extractpdfmark" ,extractpdfmark) - ("font-dejavu" ,font-dejavu) - ("font-tex-gyre" ,font-tex-gyre) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("ghostscript" ,ghostscript) - ("pango" ,pango) - ("python" ,python))) + (list extractpdfmark + font-dejavu + font-tex-gyre + fontconfig + freetype + ghostscript + guile-3.0 + pango + python)) (native-inputs - `(("bison" ,bison) - ("perl" ,perl) - ("flex" ,flex) - ("fontforge" ,fontforge) - ("dblatex" ,dblatex) - ("gettext" ,gettext-minimal) - ("imagemagick" ,imagemagick) - ("netpbm" ,netpbm) ;for pngtopnm - ("texlive" ,(texlive-updmap.cfg (list texlive-metapost - texlive-epsf - texlive-fontinst - texlive-lh - texlive-lm - texlive-latex-cyrillic))) - ("texinfo" ,texinfo) - ("texi2html" ,texi2html-1.82) - ("rsync" ,rsync) - ("pkg-config" ,pkg-config) - ("zip" ,zip))) + (list bison + dblatex + flex + fontforge + gettext-minimal + imagemagick + netpbm + perl + pkg-config + rsync + texinfo + texi2html-1.82 + (texlive-updmap.cfg + (list texlive-epsf + texlive-fontinst + texlive-latex-cyrillic + texlive-lh + texlive-lm + texlive-metapost)) + zip)) (home-page "https://lilypond.org") (synopsis "Music typesetting") (description -- cgit 1.4.1 From e8ad02e7065f5226c433c83b400a25e41188b88d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 3 Dec 2022 11:06:12 -0300 Subject: gnu: Add python-pyvisa. * gnu/packages/engineering.scm (python-pyvisa): New variable. --- gnu/packages/engineering.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ef184c5c23..466bb3cc03 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2020, 2021 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020, 2021 Morgan Smith ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Gerd Heber @@ -68,6 +68,7 @@ #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (gnu packages) @@ -2351,6 +2352,38 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") (home-page "https://3mf.io/") (license license:bsd-2))) +(define-public python-pyvisa + (package + (name "python-pyvisa") + (version "1.13.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyVISA" version)) + (sha256 + (base32 + "1iprr3h6d4w6v8ksgqpkgg545sai7i8hi5a5an394p26b25h1yl9")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete bundled python-prettytable. + (delete-file-recursively "pyvisa/thirdparty"))))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'use-system-prettytable + (lambda _ + (substitute* "pyvisa/shell.py" + (("from .thirdparty import prettytable") + "import prettytable"))))))) + (native-inputs (list python-pytest-7.1)) + (propagated-inputs (list python-dataclasses python-prettytable + python-typing-extensions)) + (home-page "https://pyvisa.readthedocs.io/en/latest/") + (synopsis "Python binding for the VISA library") + (description "PyVISA is a Python package for support of the +@acronym{VISA, Virtual Instrument Software Architecture}, in order to control +measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") + (license license:expat))) + (define-public openscad (package (name "openscad") -- cgit 1.4.1 From 2a6cee99b38f17850bf0e5294b70ce0ee402802d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 3 Dec 2022 11:06:25 -0300 Subject: gnu: Add python-scikit-rf. * gnu/packages/engineering.scm (python-scikit-rf): New variable. --- gnu/packages/engineering.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 466bb3cc03..78059ceb7e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2384,6 +2384,42 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (license license:expat))) +(define-public python-scikit-rf + (package + (name "python-scikit-rf") + (version "0.24.1") + (source (origin + (method git-fetch) ;PyPI misses some files required for tests + (uri (git-reference + (url "https://github.com/scikit-rf/scikit-rf") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1shp8q8324dkwf448mv9zzi7krx882p122ma4fk015qz91sg4wff")) + (file-name (git-file-name name version)))) + (build-system pyproject-build-system) + (propagated-inputs (list python-matplotlib + python-networkx + python-numpy + python-openpyxl + python-pandas + python-pyqt + python-pyqtgraph + python-qtpy + python-scipy)) + (native-inputs (list python-coverage + python-flake8 + python-nbval + python-networkx + python-pytest-7.1 + python-pytest-cov + python-pyvisa)) + (home-page "https://scikit-rf.org/") + (synopsis "Radio frequency and Microwave Engineering Scikit") + (description "Scikit-rf, or @code{skrf}, is a Python package for RF and +Microwave engineering.") + (license license:bsd-3))) + (define-public openscad (package (name "openscad") -- cgit 1.4.1 From 0fd87785bd91bd3fea8be22865310aa57cd4d965 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:46 -0700 Subject: gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60. * gnu/packages/golang.scm (go-golang-org-x-sync): Update to 0.1.0-1.8fcdb60. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 79d5bc6f9c..cc042e934d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2018, 2019, 2020 Katherine Cox-Buday +;;; Copyright © 2018, 2019, 2020, 2023 Katherine Cox-Buday ;;; Copyright © 2019 Giovanni Biscuolo ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020, 2021 Arun Isaac @@ -3021,11 +3021,11 @@ processing.") (license license:bsd-3)))) (define-public go-golang-org-x-sync - (let ((commit "6e8e738ad208923de99951fe0b48239bfd864f28") + (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1") (revision "1")) (package (name "go-golang-org-x-sync") - (version (git-version "0.0.0" revision commit)) + (version (git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3034,17 +3034,17 @@ processing.") (file-name (git-file-name name version)) (sha256 (base32 - "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9")))) + "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sync" #:tests? #f ;; Source-only package - #:phases - (modify-phases %standard-phases - (delete 'build)))) + #:phases (modify-phases %standard-phases + (delete 'build)))) (synopsis "Additional Go concurrency primitives") - (description "This package provides Go concurrency primitives in addition + (description + "This package provides Go concurrency primitives in addition to the ones provided by the language and “sync” and “sync/atomic” packages.") (home-page "https://go.googlesource.com/sync/") -- cgit 1.4.1 From 855c203fed8c34bf7d093fe088e32b81c3ae92ec Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:47 -0700 Subject: gnu: go-golang-org-x-mod: Update to 0.7.0. * gnu/packages/golang.scm (go-golang-org-x-mod): Update to 0.7.0. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cc042e934d..caf6e1a618 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3190,28 +3190,27 @@ time.") (license license:bsd-3)))) (define-public go-golang-org-x-mod - (let ((commit "0f08993efd8a8ec67e75bcccf86b0e1569b0ab0a") + (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") (revision "0")) (package (name "go-golang-org-x-mod") - (version (git-version "0.5.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/mod") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pl0jc5jvg7hxj4z66zg6kglnq5g7li09f3k9klwvyr4jx5dw88k")))) + (version (git-version "0.7.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/mod") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/mod/" #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + #:phases (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) (home-page "https://golang.org/x/mod") (synopsis "Tools to work directly with Go module mechanics") (description -- cgit 1.4.1 From 0d1caba124fffb0598673f0e2ce57a46885064ff Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:48 -0700 Subject: gnu: Add go-golang-org-x-exp. * gnu/packages/golang.scm (go-golang-org-x-exp): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index caf6e1a618..a643efd283 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2855,6 +2855,33 @@ expressing configuration which is easy for both humans and machines to read.") (home-page "https://github.com/hashicorp/hcl") (license license:mpl2.0))) +(define-public go-golang-org-x-exp + (package + (name "go-golang-org-x-exp") + (version "0.0.0-20221004215720-b9f4876ce741") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/exp") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/exp" + ;; Source-only package + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'build)))) + (home-page "https://golang.org/x/exp") + (synopsis "Experimental and deprecated Go packages") + (description + "This subrepository holds experimental and deprecated (in the @code{old} +directory) packages.") + (license license:bsd-3))) + (define-public go-golang-org-x-tools (let ((commit "8b927904ee0dec805c89aaf9172f4459296ed6e8") (revision "0")) -- cgit 1.4.1 From 9fbbfea40badff3667fa14973bcb2ffcc87232f4 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:49 -0700 Subject: gnu: Add go-github-com-jba-printsrc. * gnu/packages/golang.scm (go-github-com-jba-printsrc): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a643efd283..6e398ccd2e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8560,6 +8560,31 @@ This makes it virtually free to implement mocks and testing over file system operations.") (license license:asl2.0))) +(define-public go-github-com-jba-printsrc + (package + (name "go-github-com-jba-printsrc") + (version "0.2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jba/printsrc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gyy3kmb5a5i710wkv3b7ah7i7sz5sdc7v3sab5m4rxch1sd2fpj")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jba/printsrc" + ;; TODO: Open bug; expecting time.Local, but when local=UTC, we get time.UTC + #:tests? #f)) + (home-page "https://github.com/jba/printsrc") + (synopsis "Prints Go values as sourcecode") + (description + "Package printsrc prints Go values as Go source. It strives to render +legal Go source code, and returns an error when detects that it cannot.") + (license license:expat))) + (define-public go-github-com-jbenet-go-context (let ((commit "d14ea06fba99483203c19d92cfcd13ebe73135f4") (revision "1")) -- cgit 1.4.1 From 195780da771109c9b6177d52ee779e024c65cddd Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:50 -0700 Subject: gnu: Add go-github-com-google-safehtml. * gnu/packages/golang.scm (go-github-com-google-safehtml): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6e398ccd2e..b3710559ac 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10965,6 +10965,31 @@ production-ready implementation, compatible with the original Jsonnet C++ implementation.") (license license:asl2.0))) +(define-public go-github-com-google-safehtml + (package + (name "go-github-com-google-safehtml") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/safehtml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/safehtml")) + (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text))) + (home-page "https://github.com/google/safehtml") + (synopsis "Safe HTML for Go") + (description + "Package safehtml provides immutable string-like types which represent values +that are guaranteed to be safe, by construction or by escaping or sanitization, +to use in various HTML contexts and with various DOM APIs.") + (license license:bsd-3))) + (define-public go-github-com-google-shlex (package (name "go-github-com-google-shlex") -- cgit 1.4.1 From ed4effffd24baf7b1f5e5a3f8d064e425ed529d7 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:51 -0700 Subject: gnu: Add go-github-com-jba-templatecheck. * gnu/packages/golang.scm (go-github-com-jba-templatecheck): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b3710559ac..4e88ceec0c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8585,6 +8585,32 @@ file system operations.") legal Go source code, and returns an error when detects that it cannot.") (license license:expat))) +(define-public go-github-com-jba-templatecheck + (package + (name "go-github-com-jba-templatecheck") + (version "0.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jba/templatecheck") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12iwkidz4p6wdl65jfddqxls80mv879k2rpb42dj7y4dja5advlc")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jba/templatecheck")) + (propagated-inputs (list go-github-com-google-safehtml)) + (home-page "https://github.com/jba/templatecheck") + (synopsis "Checks Go templates for problems") + (description + "Package templatecheck checks Go templates for problems. It can detect +many errors that are normally caught only during execution. Use templatecheck +in tests to find template errors early, and along template execution paths +that might only rarely be reached.") + (license license:expat))) + (define-public go-github-com-jbenet-go-context (let ((commit "d14ea06fba99483203c19d92cfcd13ebe73135f4") (revision "1")) -- cgit 1.4.1 From edace44c4ad0350148e0a7264fb975685d189cf5 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:52 -0700 Subject: gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9. * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Update to 0.5.9. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4e88ceec0c..c6bd9fa225 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7024,28 +7024,27 @@ colorized or SGR defined output to the standard output.") (define-public go-github-com-google-go-cmp-cmp (package (name "go-github-com-google-go-cmp-cmp") - (version "0.5.2") + (version "0.5.9") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/google/go-cmp") - (commit (string-append "v" version)))) + (url "https://github.com/google/go-cmp") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0qchy411jm9q2l9mf7x3ry2ycaqp9xdhf2nx14qrpzcxfigv2705")))) + "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm")))) (build-system go-build-system) (arguments '(#:import-path "github.com/google/go-cmp/cmp" #:unpack-path "github.com/google/go-cmp")) - (propagated-inputs - (list go-golang-org-x-xerrors)) (synopsis "Determine equality of values in Go") - (description "This package provides a more powerful and safer -alternative to @code{reflect.DeepEqual} for comparing whether two values -are semantically equal in Go (for writing tests).") - (home-page "https://godoc.org/github.com/google/go-cmp/cmp") - (license license:asl2.0))) + (description + "This package is intended to be a more powerful and safer +alternative to @@code{reflect.DeepEqual} for comparing whether two values are +semantically equal.") + (home-page "https://github.com/google/go-cmp") + (license license:bsd-3))) (define-public go-github-com-google-uuid (package -- cgit 1.4.1 From 1c55f1258e44590c64df15fea08ee7850b189a3c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:53 -0700 Subject: gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e. * gnu/packages/golang.scm (go-github-com-pkg-diff): Update to 0.0.0-20210226163009-20ebb0f2a09e. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c6bd9fa225..c6c5792204 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8779,30 +8779,26 @@ temporal directories.") (license license:asl2.0))) (define-public go-github-com-pkg-diff - (let ((commit "531926345625d489a6b56f860a569e68245ace36") - (revision "1")) - (package - (name "go-github-com-pkg-diff") - (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pkg/diff") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1770m7qhww6lm0wj1v3mhv6hwa2v92p4w2fqxj1xyrg5dd58d944")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/pkg/diff")) - (native-inputs - (list go-github-com-sergi-go-diff)) - (home-page "https://github.com/pkg/diff/") - (synopsis "Create and print diffs") - (description - "This package provides a Go library to create and print diffs.") - (license license:bsd-3)))) + (package + (name "go-github-com-pkg-diff") + (version "0.0.0-20210226163009-20ebb0f2a09e") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkg/diff") + (commit "20ebb0f2a09e612109b224b32f79370409108bcc"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g3dzgwhz4fx3ddpsv7fsa4r1v5clsp2lbw2qrkdk9y1vc5gi8yi")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pkg/diff")) + (home-page "https://github.com/pkg/diff/") + (synopsis "Create and print diffs") + (description + "This package provides a Go library to create and print diffs.") + (license license:bsd-3))) (define-public go-github-com-twpayne-go-shell (package -- cgit 1.4.1 From 4b249fcb03b9f021e3778e1e20348aa89cba9024 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:54 -0700 Subject: gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0. * gnu/packages/golang.scm (go-github-com-rogpeppe-go-internal): Update to 1.9.0. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c6c5792204..18823c09e5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9147,7 +9147,7 @@ the necessary APIs to build a wide array of higher-level primitives.") (define-public go-github-com-rogpeppe-go-internal (package (name "go-github-com-rogpeppe-go-internal") - (version "1.6.1") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -9156,7 +9156,7 @@ the necessary APIs to build a wide array of higher-level primitives.") (file-name (git-file-name name version)) (sha256 (base32 - "00j2vpp1bsggdvw1winkz23mg0q6drjiir5q0k49pmqx1sh7106l")))) + "0bh08k8fy1qcc0vzyv0xkg0sx5kjx348zd1dpjmp3rbrr6xrpaaw")))) (build-system go-build-system) (arguments `(#:import-path "github.com/rogpeppe/go-internal" @@ -9165,6 +9165,8 @@ the necessary APIs to build a wide array of higher-level primitives.") #:phases (modify-phases %standard-phases (delete 'build)))) + (propagated-inputs + (list go-github-com-pkg-diff)) (home-page "https://github.com/rogpeppe/go-internal/") (synopsis "Internal packages from the Go standard library") (description "This repository factors out an opinionated selection of -- cgit 1.4.1 From 19c81c151738e2a548878d63a14fc99a3e91de5d Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:55 -0700 Subject: gnu: gopkg-in-errgo-fmt-errors: Rename to go-gopkg-in-errgo-fmt-errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors): Rename to … (go-gopkg-in-errgo-fmt-errors): … this. * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update accordingly. Signed-off-by: Christopher Baines --- gnu/packages/configuration-management.scm | 2 +- gnu/packages/golang.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 3ebb6957c8..b66f70545a 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -97,7 +97,7 @@ go-golang-org-x-net go-golang-org-x-oauth2 go-github-com-rogpeppe-go-internal - gopkg-in-errgo-fmt-errors)) + go-gopkg-in-errgo-fmt-errors)) (home-page "https://www.chezmoi.io/") (synopsis "Personal configuration files manager") (description "This package helps to manage personal configuration files diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 18823c09e5..0f935276c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9190,9 +9190,9 @@ Included are the following: @end itemize\n") (license license:bsd-3))) -(define-public gopkg-in-errgo-fmt-errors +(define-public go-gopkg-in-errgo-fmt-errors (package - (name "gopkg-in-errgo-fmt-errors") + (name "go-gopkg-in-errgo-fmt-errors") (version "2.1.0") (source (origin (method git-fetch) @@ -9205,7 +9205,7 @@ Included are the following: "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2")))) (build-system go-build-system) (arguments - `(#:import-path "gopkg.in/errgo.v2/fmt/errors" + `(#:import-path "gopkg.in/errgo.v2" #:tests? #f ;; Source-only package #:phases -- cgit 1.4.1 From 35fedd1719315f8256d42f968aa1ddfcc7c63084 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:56 -0700 Subject: gnu: go-golang-org-x-tools: Update to 0.5.0. * gnu/packages/golang.scm (go-golang-org-x-tools): Update to 0.5.0. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 64 ++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0f935276c7..0f87b80c13 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2883,35 +2883,45 @@ directory) packages.") (license license:bsd-3))) (define-public go-golang-org-x-tools - (let ((commit "8b927904ee0dec805c89aaf9172f4459296ed6e8") - (revision "0")) - (package - (name "go-golang-org-x-tools") - (version (git-version "0.1.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/tools") - (commit commit))) - (file-name (string-append "go.googlesource.com-tools-" - version "-checkout")) - (sha256 - (base32 - "0iinb70xhcjsddgi42ia1n745lx2ibnjdm6m2v666qrk3876vpck")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/tools" + (package + (name "go-golang-org-x-tools") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n")) + (modules '((guix build utils))) + (snippet + '(begin + ;; gopls versions are tagged separately, and it is a + ;; separate Guix package. + (delete-file-recursively "gopls"))))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/tools" + ;; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (synopsis "Tools that support the Go programming language") - (description "This package provides miscellaneous tools that support the + (delete 'build)))) + (propagated-inputs + (list + go-github-com-yuin-goldmark + go-golang-org-x-mod + go-golang-org-x-net + go-golang-org-x-sys)) + (synopsis "Tools that support the Go programming language") + (description "This package provides miscellaneous tools that support the Go programming language.") - (home-page "https://go.googlesource.com/tools/") - (license license:bsd-3)))) + (home-page "https://go.googlesource.com/tools/") + (license license:bsd-3))) (define-public go-golang-org-x-crypto (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a") -- cgit 1.4.1 From cd51d1340cb002ce2660d2d5aefb67c9962ff127 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:57 -0700 Subject: gnu: Add xurls. * gnu/packages/golang.scm (xurls): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0f87b80c13..248c7953f9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9803,6 +9803,38 @@ atomic access.") "@code{multierr} allows combining one or more Go errors together.") (license license:expat))) +(define-public xurls + (package + (name "xurls") + (version "2.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mvdan/xurls") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b040nbk1vwlk1qljavh8w8fn2r243q700n6gr8j2asmnz0xq84p")))) + (build-system go-build-system) + (arguments + `(#:import-path "mvdan.cc/xurls/v2" + #:unpack-path "mvdan.cc/xurls/v2" + #:phases (modify-phases %standard-phases + (replace 'build + (lambda arguments + (apply (assoc-ref %standard-phases + 'build) + `(,@arguments #:import-path + "mvdan.cc/xurls/v2/cmd/xurls"))))))) + (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal)) + (home-page "https://mvdan.cc/xurls/v2/") + (synopsis "Extracts URLs from text") + (description + "Xurls extracts urls from plain text using regular expressions. It can +be used as both a binary and a library.") + (license license:bsd-3))) + (define-public go-golang-org-x-lint (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") (revision "0")) -- cgit 1.4.1 From 7938d68b6b2a804b48ab6799eab53630399f9c88 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:58 -0700 Subject: gnu: Add go-mvdan-cc-xurls. * gnu/packages/golang.scm (go-mvdan-cc-xurls): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 248c7953f9..55d8794a5b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9835,6 +9835,20 @@ atomic access.") be used as both a binary and a library.") (license license:bsd-3))) +(define-public go-mvdan-cc-xurls + (package + (inherit xurls) + (name "go-mvdan-cc-xurls") + (arguments + `(#:import-path "mvdan.cc/xurls" + #:tests? #f + #:install-source? #t + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (package-inputs xurls)) + (native-inputs '()) + (inputs '()))) + (define-public go-golang-org-x-lint (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") (revision "0")) -- cgit 1.4.1 From 502f7ed25c86b1037ba51fe419a6e172d6fda94e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:44:59 -0700 Subject: gnu: Add misspell. * gnu/packages/golang.scm (misspell): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 55d8794a5b..c791deac03 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4821,6 +4821,37 @@ Looks for an identical word on a list of words, if none is found, look for a similar word.") (license license:expat)))) +(define-public misspell + (package + (name "misspell") + (version "0.3.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/client9/misspell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/client9/misspell" + #:phases (modify-phases %standard-phases + (replace 'build + (lambda arguments + (apply (assoc-ref %standard-phases + 'build) + `(,@arguments #:import-path + "github.com/client9/misspell/cmd/misspell"))))))) + (home-page "https://github.com/client9/misspell") + (synopsis "Correct commonly misspelled English words in source files") + (description + "misspell assists with correcting commonly misspelled English words in +source files. A neutral variety of English is used by default, but a US or UK +locale can be selected.") + (license license:expat))) + (define-public go-github-com-stevedonovan-luar (let ((commit "22d247e5366095f491cd83edf779ee99a78f5ead") (revision "0")) -- cgit 1.4.1 From 068a3709dc45264145e5e82c87d569a2ba5f1354 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:00 -0700 Subject: gnu: Add go-github-com-client9-misspell. * gnu/packages/golang.scm (go-github-com-client9-misspell): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c791deac03..561abf224d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4852,6 +4852,20 @@ source files. A neutral variety of English is used by default, but a US or UK locale can be selected.") (license license:expat))) +(define-public go-github-com-client9-misspell + (package + (inherit misspell) + (name "go-github-com-client9-misspell") + (arguments + `(#:import-path "github.com/client9/misspell" + #:tests? #f + #:install-source? #t + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (package-inputs misspell)) + (native-inputs '()) + (inputs '()))) + (define-public go-github-com-stevedonovan-luar (let ((commit "22d247e5366095f491cd83edf779ee99a78f5ead") (revision "0")) -- cgit 1.4.1 From a62ed0b3bf7a0ce87da8545627c09a0ca5d5ad8e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:01 -0700 Subject: gnu: Add go-github-com-google-go-cmdtest. * gnu/packages/golang.scm (go-github-com-google-go-cmdtest): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 561abf224d..30ca12cb5f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11089,6 +11089,35 @@ production-ready implementation, compatible with the original Jsonnet C++ implementation.") (license license:asl2.0))) +(define-public go-github-com-google-go-cmdtest + (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5") + (revision "0")) + (package + (name "go-github-com-google-go-cmdtest") + (version (git-version "0.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmdtest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/go-cmdtest")) + (propagated-inputs (list go-github-com-google-renameio + go-github-com-google-go-cmp-cmp)) + (home-page "https://github.com/google/go-cmdtest") + (synopsis "Testing for your CLI") + (description + "The cmdtest package simplifies testing of command-line interfaces. It +provides a simple, cross-platform, shell-like language to express command +execution. It can compare actual output with the expected output, and can +also update a file with new \"golden\" output that is deemed correct.") + (license license:asl2.0)))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") -- cgit 1.4.1 From 347ac7fbdec6147744efea4d35c2758059a0fa83 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:02 -0700 Subject: gnu: Add unparam. * gnu/packages/golang.scm (unparam): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 30ca12cb5f..17ba262804 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9848,6 +9848,31 @@ atomic access.") "@code{multierr} allows combining one or more Go errors together.") (license license:expat))) +(define-public unparam + (package + (name "unparam") + (version "0.0.0-20221223090309-7455f1af531d") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mvdan/unparam") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c")))) + (build-system go-build-system) + (arguments + `(#:import-path "mvdan.cc/unparam" + #:go ,go-1.19)) + (inputs (list go-golang-org-x-sys go-golang-org-x-mod + go-github-com-pkg-diff go-golang-org-x-tools + go-github-com-rogpeppe-go-internal)) + (home-page "https://mvdan.cc/unparam/") + (synopsis "Find unused parameters in Go") + (description "Reports unused function parameters and results in Go code.") + (license license:bsd-3))) + (define-public xurls (package (name "xurls") -- cgit 1.4.1 From cfbd6e90a0c9a284060cdde278f38b3ab4b0bae1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:03 -0700 Subject: gnu: Add go-mvdan-cc-unparam. * gnu/packages/golang.scm (go-mvdan-cc-unparam): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 17ba262804..270c94068f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9873,6 +9873,20 @@ atomic access.") (description "Reports unused function parameters and results in Go code.") (license license:bsd-3))) +(define-public go-mvdan-cc-unparam + (package + (inherit unparam) + (name "go-mvdan-cc-unparam") + (arguments + `(#:import-path "github.com/mvdan/unparam" + #:tests? #f + #:install-source? #t + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (package-inputs unparam)) + (native-inputs '()) + (inputs '()))) + (define-public xurls (package (name "xurls") -- cgit 1.4.1 From 83b58b5f51134b8faf02e07b83f2349e335abb84 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:04 -0700 Subject: gnu: Add govulncheck. * gnu/packages/golang.scm (govulncheck): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 270c94068f..3602441b80 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2956,6 +2956,56 @@ for the Go language.") (home-page "https://go.googlesource.com/crypto/") (license license:bsd-3)))) +(define-public govulncheck + (package + (name "govulncheck") + (version "0.0.0-20221229164908-ebf31f7dc3ef") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/vuln") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w055g90k7anrrcvfrsqklxzl9pl0vqdiwpayj9f0brwys9xhj7d")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/vuln" + #:go ,go-1.19 + #:install-source? #f + #:phases ,#~(modify-phases %standard-phases + (add-after 'unpack 'remove-go-mod-tidy + (lambda _ + (substitute* "src/golang.org/x/vuln/checks.bash" + (("go mod tidy") + #$(file-append coreutils-minimal "/bin/true"))))) + (replace 'build + (lambda arguments + (apply (assoc-ref %standard-phases + 'build) + `(,@arguments #:import-path + "golang.org/x/vuln/cmd/govulncheck"))))))) + (native-inputs (list coreutils-minimal)) + (inputs (list go-golang-org-x-sys + go-github-com-google-renameio + go-github-com-burntsushi-toml + go-mvdan-cc-unparam + go-honnef-co-go-tools + go-golang-org-x-tools + go-golang-org-x-sync + go-golang-org-x-mod + go-golang-org-x-exp + go-github-com-google-go-cmp-cmp + go-github-com-google-go-cmdtest + go-github-com-client9-misspell)) + (home-page "https://golang.org/x/vuln") + (synopsis "Go Vulnerability Management") + (description + "This repository contains packages for accessing and analyzing data from +the @url{https://vuln.go.dev,Go Vulnerability Database}.") + (license license:bsd-3))) + (define-public go-github-com-protonmail-go-crypto (package (name "go-github-com-protonmail-go-crypto") -- cgit 1.4.1 From 967ce806f4abcd3323adf3488c39afaf5f527c25 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:05 -0700 Subject: gnu: Add go-golang-org-x-vuln. * gnu/packages/golang.scm (go-golang-org-x-vuln): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3602441b80..4bf62976d4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3006,6 +3006,20 @@ for the Go language.") the @url{https://vuln.go.dev,Go Vulnerability Database}.") (license license:bsd-3))) +(define-public go-golang-org-x-vuln + (package + (inherit govulncheck) + (name "go-golang-org-x-vuln") + (arguments + `(#:import-path "golang.org/x/vuln" + #:tests? #f + #:install-source? #t + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (package-inputs govulncheck)) + (native-inputs '()) + (inputs '()))) + (define-public go-github-com-protonmail-go-crypto (package (name "go-github-com-protonmail-go-crypto") -- cgit 1.4.1 From 90a2ef549b9e6d4f8eae8f07d7c070f29f9b8bb6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:06 -0700 Subject: gnu: go-github-com-burntsushi-toml: Update to 1.2.1. * gnu/packages/golang.scm (go-github-com-burntsushi-toml): Update to 1.2.1. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4bf62976d4..b95f046178 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3327,23 +3327,23 @@ loading algorithms.") (define-public go-github-com-burntsushi-toml (package (name "go-github-com-burntsushi-toml") - (version "0.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BurntSushi/toml") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6")))) + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BurntSushi/toml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) (build-system go-build-system) (arguments '(#:import-path "github.com/BurntSushi/toml")) (home-page "https://github.com/BurntSushi/toml") (synopsis "Toml parser and encoder for Go") - (description "This package is toml parser and encoder for Go. The interface + (description + "This package is toml parser and encoder for Go. The interface is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) -- cgit 1.4.1 From dfd1bcb3a61edc20f3954a525282ae8f1644a75b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:07 -0700 Subject: gnu: go-honnef-co-go-tools: Update to 0.3.3. * gnu/packages/golang.scm (go-honnef-co-go-tools): Update to 0.3.3. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b95f046178..026ee25be1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10052,27 +10052,26 @@ tools with similar semantics.") (define-public go-honnef-co-go-tools (package (name "go-honnef-co-go-tools") - (version "0.1.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dominikh/go-tools") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n")))) + (version "0.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominikh/go-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32")))) (build-system go-build-system) (arguments `(#:import-path "honnef.co/go/tools" #:tests? #f ;; Source-only package - #:phases - (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs - (list go-golang-org-x-tools go-github-com-kisielk-gotool - go-github-com-burntsushi-toml)) + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools + go-golang-org-x-mod go-github-com-kisielk-gotool + go-github-com-burntsushi-toml)) (home-page "https://honnef.co/go/tools") (synopsis "Staticcheck advanced Go linter") (description -- cgit 1.4.1 From 15330b625ae928d6b94b5dc4515fa65e7e192cc1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:08 -0700 Subject: gnu: Add gofumpt. * gnu/packages/golang.scm (gofumpt): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 026ee25be1..2b16eb786f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9912,6 +9912,74 @@ atomic access.") "@code{multierr} allows combining one or more Go errors together.") (license license:expat))) +(define-public gofumpt + (package + (name "gofumpt") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mvdan/gofumpt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13ahi8q1a9h4dj6a7xp95c79d5svz5p37b6z91aswbq043qd417k")) + (modules '((guix build utils))) + (snippet `(let ((fixed-version (string-append ,version + " (GNU Guix)"))) + ;; Gofumpt formats Go files, and therefore modifies + ;; them. To help the developers diagnose issues, it + ;; replaces any occurrence of a `//gofumpt:diagnose` + ;; comment with some debugging information which + ;; includes the module version. In the event gofumpt + ;; was built without module support, it falls back + ;; to a string "(devel)". Since our build system + ;; does not yet support modules, we'll inject our + ;; version string instead, since this is more + ;; helpful. + (substitute* "internal/version/version.go" + (("^const fallbackVersion.+") + (format #f "const fallbackVersion = \"~a\"~%" + fixed-version))) + ;; These tests rely on `//gofumpt:diagnose` comments + ;; being replaced with fixed information injected + ;; from the test scripts, but this requires a binary + ;; compiled as a Go module. Since we can't do this + ;; yet, modify the test scripts with the version + ;; string we're injecting. + (delete-file "testdata/script/diagnose.txtar") + (substitute* (find-files "testdata/script/" + "\\.txtar$") + (("v0.0.0-20220727155840-8dda8068d9f3") + fixed-version) + (("(devel)") + fixed-version) + (("v0.3.2-0.20220627183521-8dda8068d9f3") + fixed-version)))))) + (build-system go-build-system) + (arguments + `(#:import-path "mvdan.cc/gofumpt" + #:go ,go-1.19)) + (native-inputs (list go-gopkg-in-errgo-fmt-errors)) + (propagated-inputs (list go-github-com-pkg-diff + go-github-com-kr-text + go-github-com-kr-pretty + go-golang-org-x-tools + go-golang-org-x-sys + go-golang-org-x-sync + go-golang-org-x-mod + go-github-com-rogpeppe-go-internal + go-github-com-google-go-cmp-cmp + go-github-com-frankban-quicktest)) + (home-page "https://mvdan.cc/gofumpt/") + (synopsis "Formats Go files with a stricter ruleset than gofmt") + (description + "Enforce a stricter format than @code{gofmt}, while being backwards compatible. +That is, @code{gofumpt} is happy with a subset of the formats that +@code{gofmt} is happy with.") + (license license:bsd-3))) + (define-public unparam (package (name "unparam") -- cgit 1.4.1 From 3b223b8e915c437215f8770649eb506af03f839d Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:09 -0700 Subject: gnu: Add go-mvdan-cc-gofumpt. * gnu/packages/golang.scm (go-mvdan-cc-gofumpt): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2b16eb786f..4478ade953 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9980,6 +9980,20 @@ That is, @code{gofumpt} is happy with a subset of the formats that @code{gofmt} is happy with.") (license license:bsd-3))) +(define-public go-mvdan-cc-gofumpt + (package + (inherit gofumpt) + (name "go-mvdan-cc-gofumpt") + (arguments + `(#:import-path "mvdan.cc/gofumpt" + #:tests? #f + #:install-source? #t + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs (package-inputs gofumpt)) + (native-inputs '()) + (inputs '()))) + (define-public unparam (package (name "unparam") -- cgit 1.4.1 From f3ab5888a0bc6446104ddbba41a413a86eb298e2 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 17 Jan 2023 18:45:10 -0700 Subject: gnu: Add gopls. * gnu/packages/golang.scm (gopls): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4478ade953..62766d8dd2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3020,6 +3020,52 @@ the @url{https://vuln.go.dev,Go Vulnerability Database}.") (native-inputs '()) (inputs '()))) +(define-public gopls + (package + (name "gopls") + (version "0.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/tools") + (commit (string-append "gopls/v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l9y1rp7x51s6dnjn227fhdlnz4z1h41jn3x1aq49qki241w7m73")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/tools/gopls" + #:unpack-path "golang.org/x/tools" + #:install-source? #f + #:phases (modify-phases %standard-phases + (add-before 'unpack 'override-tools + (lambda _ + (delete-file-recursively "src/golang.org/x/tools")))))) + (propagated-inputs (list go-github-com-google-go-cmp-cmp + go-github-com-jba-printsrc + go-github-com-jba-templatecheck + go-github-com-sergi-go-diff + go-golang-org-x-mod + go-golang-org-x-sync + go-golang-org-x-sys + go-golang-org-x-text + go-gopkg-in-yaml-v3 + go-honnef-co-go-tools + go-github-com-burntsushi-toml + go-github-com-google-safehtml + go-golang-org-x-exp + go-mvdan-cc-gofumpt + go-golang-org-x-vuln + go-mvdan-cc-xurls)) + (home-page "https://golang.org/x/tools/gopls") + (synopsis "Official language server for the Go language") + (description + "Pronounced ``Go please'', this is the official Go language server +developed by the Go team. It provides IDE features to any LSP-compatible +editor.") + (license license:bsd-3))) + (define-public go-github-com-protonmail-go-crypto (package (name "go-github-com-protonmail-go-crypto") -- cgit 1.4.1 From 1f684d00d25f0f205c4cc4b762d8f56911062581 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 24 Dec 2022 08:03:01 -0300 Subject: gnu: Add python-cma. * gnu/packages/machine-learning.scm (python-cma): New variable. --- gnu/packages/machine-learning.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index bcee6a6fc3..1cd430de5f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Edouard Klein -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -1400,6 +1400,31 @@ data by providing clean labels during training.") (native-inputs (list python-pytest)))) +(define-public python-cma + (package + (name "python-cma") + (version "3.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "cma" version)) + (sha256 + (base32 + "1v31b2vnnr4v6ack7zfmw7zb47vbzjr9nyvx2lbfhyjf7zhbhj5p")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "cma.test"))))))) + (propagated-inputs (list python-numpy)) + (home-page "https://github.com/CMA-ES/pycma") + (synopsis "Python implementation of CMA-ES") + (description "This package provides a Python implementation of the +@acronym{CMA-ES, Covariance Matrix Adaptation Evolution Strategy} algorithm +and a few related numerical optimization tools.") + (license license:bsd-3))) + (define-public python-cmaes (package (name "python-cmaes") -- cgit 1.4.1 From e9606d88a9a81c5ce2f7fb85ff531cb0ba1f451d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 7 Feb 2023 09:06:10 +0100 Subject: gnu: nar-herder: Update to 0-14.8f7b2b2. * gnu/packages/package-management.scm (nar-herder): Update to 0-14.8f7b2b2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0d695ab0a8..d152442659 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1666,8 +1666,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "66a2862b68087c9bd100b903fe32066d790cbe2c") - (revision "13")) + (let ((commit "8f7b2b24e36b306d543670b6a4d3310e5be2f944") + (revision "14")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1678,7 +1678,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "0ry5m4h80mm1za4aqg73753083pjwajzzbs2hzpwng516ylh5c3r")) + "1bgcsldrihsv357kyfcgv2brvdai03d7lrqs7sfgm7zfb75xvbl1")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From abb73a603bea385c6e92e631339a75f63724d7ea Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Tue, 24 Jan 2023 23:44:57 +0000 Subject: gnu: rasdaemon: Update to 0.7.0. * gnu/packages/linux.scm (rasdaemon): Update to 0.7.0. Signed-off-by: Christopher Baines --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 54e3da8be2..b3dbec107f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9532,7 +9532,7 @@ provides user-space tools for creating EROFS file systems.") (define-public rasdaemon (package (name "rasdaemon") - (version "0.6.8") + (version "0.7.0") (source (origin (method git-fetch) @@ -9541,7 +9541,7 @@ provides user-space tools for creating EROFS file systems.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0r0339mg4rc12p63iiq2kwdqn1zjakyiv014i2a2l9s8v5rjik41")))) + (base32 "1a3ycx1g2zyshlna9fg8c9329m8wia42vkmlh2awfab0ngwi3g50")))) (native-inputs (list autoconf automake libtool)) (inputs (list perl perl-dbd-sqlite sqlite dmidecode kmod)) (arguments -- cgit 1.4.1 From 9b07a4b045be4fd3b69ea7b3ca1b2459c00032ba Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Thu, 2 Feb 2023 03:16:18 +0100 Subject: gnu: xdg-desktop-portal: Update to 1.14.6. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.14.6. Signed-off-by: Christopher Baines --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a986c8c350..90398f0e70 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2666,7 +2666,7 @@ compatible with the well-known scripts of the same name.") (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.14.4") + (version "1.14.6") (source (origin (method url-fetch) (uri (string-append @@ -2674,7 +2674,7 @@ compatible with the well-known scripts of the same name.") version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "0wqc9x3k7lf3mig53i4rjazi0xi8bcykwaaw7r7prvnscnd1k405")))) + "1q0djpnwlrqm0h0alyh1r6dlkqdrr7mj5hiam4mqzxqa5jbqkrgj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 7a87298e2fea9aa718c3b3b994c538dc4a6d35dd Mon Sep 17 00:00:00 2001 From: ギャラ Date: Sun, 5 Feb 2023 14:51:02 +0900 Subject: gnu: neovim: Update to 0.8.3. * gnu/packages/vim.scm (neovim): Update to 0.8.3. Signed-off-by: Christopher Baines --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 6939057ff2..0593986d87 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -692,7 +692,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.8.2") + (version "0.8.3") (source (origin (method git-fetch) (uri (git-reference @@ -701,7 +701,7 @@ are detected, the user is notified."))) (file-name (git-file-name name version)) (sha256 (base32 - "1jjw9a42l7wrziki2qznn7wiw5r59n4hs9i6g2hxnjyzixpg9xvl")))) + "1zff73yxbnxym6sn43xk6r0zc2ncingsib81v9g39ibrcinpwaa9")))) (build-system cmake-build-system) (arguments (list #:modules -- cgit 1.4.1 From 76a3929add520b855286b67d316e4fcb16b129ca Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 5 Feb 2023 23:11:02 -0600 Subject: gnu: janet: Update to 1.26.0. * gnu/packages/lisp.scm (janet): Update to 1.26.0. Signed-off-by: Christopher Baines --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2afeb30a55..e63511fd9a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1231,7 +1231,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.25.1") + (version "1.26.0") (source (origin (method git-fetch) @@ -1240,7 +1240,7 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0d601imsndkmjyanja6pqp234fwmn9jxzpcbigwpra969x4a4qjd")))) + (base32 "1ghxchyxhcjs0vfzisafc27v05im4kya1jg827l4q2h92ras17x3")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 8f09b385d9184f009d02690e4382d54ee827e346 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 6 Feb 2023 23:32:37 +0800 Subject: gnu: font-lxgw-wenkai-tc: Update to 0.932. * gnu/packages/fonts.scm (font-lxgw-wenkai-tc): Update to 0.932. Signed-off-by: Christopher Baines --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 634c48db00..9b7d965e76 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2900,7 +2900,7 @@ within GB 2312, standard glyphs for Mainland China is used.") (package (inherit font-lxgw-wenkai) (name "font-lxgw-wenkai-tc") - (version "0.931") + (version "0.932") (source (origin (method url-fetch) (uri (string-append @@ -2908,7 +2908,7 @@ within GB 2312, standard glyphs for Mainland China is used.") version "/lxgw-wenkai-tc-v" version ".tar.gz")) (sha256 (base32 - "1dba201p8ch09n5wcr5gx263rd2851v76m6f3xac5m3pd9f4i8fg")))) + "12yp3q3hhv847qj7a51cjxxqb2rqm4lvbm54wdr2j4awg3g8lflg")))) (home-page "https://github.com/lxgw/LxgwWenKaitc") (synopsis "Traditional Chinese Imitation Song typeface") (description -- cgit 1.4.1 From 27178151c3d0856edaf7de85fbfec2421656ea55 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:48 +0100 Subject: gnu: Add r-glad. * gnu/packages/bioconductor.scm (r-glad): New variable. --- gnu/packages/bioconductor.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a7c53257b..703edb3524 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6145,6 +6145,30 @@ GenomicRanges package defines general purpose containers for storing and manipulating genomic intervals and variables defined along a genome.") (license license:artistic2.0))) +(define-public r-glad + (package + (name "r-glad") + (version "2.62.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GLAD" version)) + (sha256 + (base32 + "0gb52ic5r6nkgm2ynm174vcvbmkbhhjgv71lsmxpxzcsb6rr7qj6")))) + (properties `((upstream-name . "GLAD"))) + (build-system r-build-system) + (inputs (list gsl)) + (propagated-inputs (list r-aws)) + (native-inputs (list pkg-config)) + (home-page "http://bioinfo.curie.fr") + (synopsis "Gain and loss analysis of DNA") + (description + "This package helps with the analysis of array @acronym{CGH, comparative +genomic hybridization} data by detecting of the breakpoints in the genomic +profiles and assignment of a status (gain, normal or loss) to each chromosomal +regions identified.") + (license license:gpl2))) + (define-public r-gostats (package (name "r-gostats") -- cgit 1.4.1 From c8734d7873e3a0c184a9e83499f39eaecf061b1d Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:49 +0100 Subject: gnu: Add r-italicsdata. * gnu/packages/bioconductor.scm (r-italicsdata): New variable. --- gnu/packages/bioconductor.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 703edb3524..ea2722645f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1454,6 +1454,25 @@ genomation package. Included are Chip Seq, Methylation and Cage data, downloaded from Encode.") (license license:gpl3+))) +(define-public r-italicsdata + (package + (name "r-italicsdata") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ITALICSData" version 'experiment)) + (sha256 + (base32 "09d2igic3b5p7wpq98hb2lffxm1nfq9mwmnqlbdn3jv49pgz3hmw")))) + (properties `((upstream-name . "ITALICSData"))) + (build-system r-build-system) + (home-page "http://bioinfo.curie.fr") + (synopsis "ITALICS data") + (description "This package provides data needed to use the ITALICS +package.") + ;; Expanded from GPL + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-macrophage (package (name "r-macrophage") -- cgit 1.4.1 From b0657721520a301b268aef66ca10c924454a424f Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:50 +0100 Subject: gnu: Add r-pd-mapping50k-xba240. * gnu/packages/bioconductor.scm (r-pd-mapping50k-xba240): New variable. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ea2722645f..34630a8f33 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -115,6 +115,33 @@ analysis.") based on mapping using Entrez Gene identifiers.") (license license:artistic2.0))) +(define-public r-pd-mapping50k-xba240 + (package + (name "r-pd-mapping50k-xba240") + (version "3.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "pd.mapping50k.xba240" version + 'annotation)) + (sha256 + (base32 "1a1f3lh5ywhyjawdbj2fzban85c8jz70lfcv3pagd5piincjwxq8")))) + (properties `((upstream-name . "pd.mapping50k.xba240"))) + (build-system r-build-system) + (propagated-inputs + (list r-biostrings + r-dbi + r-iranges + r-oligo + r-oligoclasses + r-rsqlite + r-s4vectors)) + (home-page "https://bioconductor.org/packages/pd.mapping50k.xba240") + (synopsis "Platform design info for Affymetrix Mapping50K_Xba240") + (description "This package provides platform design info for Affymetrix +Mapping50K_Xba240 (pd.mapping50k.xba240).") + (license license:artistic2.0))) + (define-public r-reactome-db (package (name "r-reactome-db") -- cgit 1.4.1 From 8dc953fe5debf18faaa6813bac80c5fbecbe428e Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:51 +0100 Subject: gnu: Add r-italics. * gnu/packages/bioconductor.scm (r-italics): New variable. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 34630a8f33..9225d39246 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4536,6 +4536,37 @@ domains etc.) from quantification of all types of RNASeq by tools such as Kallisto, Salmon, StringTie, Cufflinks/Cuffdiff etc.") (license license:gpl2+))) +(define-public r-italics + (package + (name "r-italics") + (version "2.58.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ITALICS" version)) + (sha256 + (base32 "0g937h9zxkxnm424wh58b46mfasdd7pqy5c04r0a46mx9lxibgbs")))) + (properties `((upstream-name . "ITALICS"))) + (build-system r-build-system) + (propagated-inputs + (list r-affxparser + r-dbi + r-glad + r-italicsdata + r-oligo + r-oligoclasses + r-pd-mapping50k-xba240)) + (home-page "http://bioinfo.curie.fr") + (synopsis "Normalizing of the Affymetrix GeneChip human mapping") + (description + "This package provides tools for normalizing and analyzing of GeneChip +Mapping 100K and 500K Set. Affymetrix GeneChip Human Mapping 100K and 500K +Set allows the DNA copy number mea- surement of respectively 2× 50K and 2× +250K SNPs along the genome. Their high density allows a precise localization +of genomic alterations and makes them a powerful tool for cancer and copy +number polymorphism study.") + (license license:gpl2))) + ;; This is a CRAN package, but it depends on r-biobase and r-limma from Bioconductor. (define-public r-absfiltergsea (package -- cgit 1.4.1 From c738ab4805819799c0e8f9db7b016802fa48076b Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:52 +0100 Subject: gnu: Add r-manor. * gnu/packages/bioconductor.scm (r-manor): New variable. --- gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9225d39246..b5a120c267 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6547,6 +6547,29 @@ containing the location/probe set membership mapping. The other one creates a package that automatically loads that environment.") (license license:gpl2+))) +(define-public r-manor + (package + (name "r-manor") + (version "1.70.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MANOR" version)) + (sha256 + (base32 "16b30bmyzml97cjdbh6h9ky5c4h5ws2a3g2xkxnd55sd3jg64jgx")))) + (properties `((upstream-name . "MANOR"))) + (build-system r-build-system) + (propagated-inputs (list r-glad)) + (native-inputs (list r-knitr)) + (home-page "http://bioinfo.curie.fr/projects/manor/index.html") + (synopsis "CGH micro-array normalization") + (description + "This package ofers functions for importation, normalization, +visualization, and quality control to correct identified sources of +variability in array of @acronym{CGH, comparative genomic hybridization} +experiments.") + (license license:gpl2))) + (define-public r-maser (package (name "r-maser") -- cgit 1.4.1 From 372843576d0efd50d2d4d97dd536b7293e9dc180 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:53 +0100 Subject: gnu: Add r-tilingarray. * gnu/packages/bioconductor.scm (r-tilingarray): New variable. --- gnu/packages/bioconductor.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b5a120c267..de20271329 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14989,6 +14989,47 @@ be applied to the analysis of other NGS data obtained from experimental procedures that induce nucleotide substitutions (e.g. BisSeq).") (license license:gpl2))) +(define-public r-tilingarray + (package + (name "r-tilingarray") + (version "1.76.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "tilingArray" version)) + (sha256 + (base32 + "19bkgblpkcp3w3sdyn82c37gkz1sv3r4d546zpbnh36q2pi3l4zd")))) + (properties `((upstream-name . "tilingArray"))) + (build-system r-build-system) + (propagated-inputs + (list r-affy + r-biobase + r-genefilter + r-pixmap + r-rcolorbrewer + r-strucchange + r-vsn)) + (home-page "https://bioconductor.org/packages/tilingArray") + (synopsis "Transcript mapping with high-density oligonucleotide tiling arrays") + (description + "The package provides functionality that can be useful for the analysis +of the high-density tiling microarray data (such as from Affymetrix genechips) +or for measuring the transcript abundance and the architecture. The main +functionalities of the package are: + +@enumerate +@item the class segmentation for representing partitionings of a linear series + of data; +@item the function segment for fitting piecewise constant models using a + dynamic programming algorithm that is both fast and exact; +@item the function @code{confint} for calculating confidence intervals using + the @code{strucchange} package; +@item the function @code{plotAlongChrom} for generating pretty plots; +@item the function @code{normalizeByReference} for probe-sequence dependent + response adjustment from a (set of) reference hybridizations. +@end enumerate") + (license license:artistic2.0))) + (define-public r-timeseriesexperiment (package (name "r-timeseriesexperiment") -- cgit 1.4.1 From b4d90dfdb80f097e092ab4784eb9b2f6197e5d95 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:54 +0100 Subject: gnu: Add r-snapcgh. * gnu/packages/bioconductor.scm (r-snapcgh): New variable. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index de20271329..f6a7222f8d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -18215,6 +18215,34 @@ integrates with pathway and gene set (enrichment) analysis tools for large-scale and fully automated analysis.") (license license:gpl3+))) +(define-public r-snapcgh + (package + (name "r-snapcgh") + (version "1.68.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "snapCGH" version)) + (sha256 + (base32 + "1zxvl8mkby7yb5kppddag6k9w78d1fm6adx52h4cgrfckn28w64q")))) + (properties `((upstream-name . "snapCGH"))) + (build-system r-build-system) + (propagated-inputs + (list r-acgh + r-cluster + r-dnacopy + r-glad + r-limma + r-tilingarray)) + (home-page "https://bioconductor.org/packages/snapCGH") + (synopsis "Segmentation, normalisation and processing of the aCGH data") + (description + "This package provides methods for segmenting, normalising and processing +aCGH data. snapCGH also includes plotting functions for visualising raw and +segmented data for individual and multiple arrays.") + ;; Expanded from GPL + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-snpstats (package (name "r-snpstats") -- cgit 1.4.1 From 4fb1703a0a16f087e7b52660f384929933204adc Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:55 +0100 Subject: gnu: Add r-quantsmooth. * gnu/packages/bioconductor.scm (r-quantsmooth): New variable. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f6a7222f8d..07da3c49b3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8767,6 +8767,33 @@ arrays (expression/SNP/tiling/exon) at probe-level. It currently supports Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (license license:lgpl2.0+))) +(define-public r-quantsmooth + (package + (name "r-quantsmooth") + (version "1.64.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "quantsmooth" version)) + (sha256 + (base32 "1adwws3brb01d4g6yidipnd8akkiyc3gpdr876hy57qnmcq8xipp")))) + (properties `((upstream-name . "quantsmooth"))) + (build-system r-build-system) + (propagated-inputs (list r-quantreg)) + (home-page "https://bioconductor.org/packages/quantsmooth") + (synopsis "Quantile smoothing and genomic visualization of array data") + (description + "This package implements quantile smoothing. It contains a dataset used +to produce human chromosomal ideograms for plotting purposes and a collection +of arrays that contains data of chromosome 14 of 3 colorectal tumors. The +package provides functions for painting chromosomal icons, chromosome or +chromosomal idiogram and other types of plots. Quantsmooth offers options +like converting chromosomal ids to their numeric form, retrieving the human +chromosomal length from NCBI data, retrieving regions of interest in a vector +of intensities using quantile smoothing, determining cytoband position based +on the location of the probe, and other useful tools.") + (license license:gpl2))) + (define-public r-qvalue (package (name "r-qvalue") -- cgit 1.4.1 From d451470b5d7ce911a7c2a4f0f9e8dc062ba6f504 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:56 +0100 Subject: gnu: Add r-beadarraysnp. * gnu/packages/bioconductor.scm (r-beadarraysnp): New variable. --- gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 07da3c49b3..cb610dd003 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -17111,6 +17111,26 @@ variety of commonly used matrix types, including sparse and HDF5-backed matrices.") (license license:gpl3))) +(define-public r-beadarraysnp + (package + (name "r-beadarraysnp") + (version "1.64.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "beadarraySNP" version)) + (sha256 + (base32 "06hy89pclbyxjw5yf5i9bc3wr789b9pmhd9sdchgljlijs9vcj6g")))) + (properties `((upstream-name . "beadarraySNP"))) + (build-system r-build-system) + (propagated-inputs (list r-biobase r-quantsmooth)) + (home-page "https://bioconductor.org/packages/beadarraySNP") + (synopsis "Normalization and reporting of Illumina SNP bead arrays") + (description + "This package is importing data from Illumina SNP experiments and it +performs copy number calculations and reports.") + (license license:gpl2))) + ;; This package includes files that have been taken from kentutils. Some ;; parts of kentutils are not released under a free license, but this package ;; only uses files that are also found in the free parts of kentutils. -- cgit 1.4.1 From e7b4b691da5ea394716b7f9d299452ae64aea648 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 2 Feb 2023 03:26:57 +0100 Subject: gnu: Add r-adacgh2. * gnu/packages/bioconductor.scm (r-adacgh2): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cb610dd003..d2eb9a0daf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1826,6 +1826,48 @@ expression level and gene-specific dispersion, that might facilitate the gene ranking by fold-change and visualization.") (license license:gpl3+))) +(define-public r-adacgh2 + (package + (name "r-adacgh2") + (version "2.38.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ADaCGH2" version)) + (sha256 + (base32 "0g9x3lnr56035wq9ijdcri4sz5pwj8184yxm415gmsxrii9xvpfd")))) + (properties `((upstream-name . "ADaCGH2"))) + (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'python3-compatibility + (lambda _ + (substitute* "inst/imagemap-example/toMap.py" + (("print nameMap") "print(nameMap)"))))))) + (inputs (list python-wrapper)) + (propagated-inputs + (list r-acgh + r-bit + r-cluster + r-dnacopy + r-ff + r-glad + r-snapcgh + r-tilingarray + r-waveslim)) + (home-page "https://github.com/rdiaz02/adacgh2") + (synopsis "Big data analysis from aCGH experiments") + (description + "This package analyzes and creates plots of array @acronym{CGH, +comparative genomic hybridization} data. Also, it allows usage of +@acronym{CBS, Circular Binary Segementation}, wavelet-based smoothing, HMM, +BioHMM, GLAD, CGHseg. Most computations are parallelized (either via forking +or with clusters, including MPI and sockets clusters) and use @code{ff} for +storing data.") + (license license:gpl3+))) + (define-public r-adam (package (name "r-adam") -- cgit 1.4.1 From 9fb2dcfb6a68f875543ce2246e7bb2a90e6451a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 10:46:55 +0100 Subject: gnu: azr3: Remove lash. * gnu/packages/patches/azr3-remove-lash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/audio.scm (azr3)[source]: Add patch. [inputs]: Remove lash. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 5 +- gnu/packages/patches/azr3-remove-lash.patch | 191 ++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/azr3-remove-lash.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index fdbb8ce461..a5f4b83961 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -917,6 +917,7 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-4.3-fno-common.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/azr3.patch \ + %D%/packages/patches/azr3-remove-lash.patch \ %D%/packages/patches/barony-fix-textures.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3e46cedd53..77cd44fb36 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1102,7 +1102,8 @@ formant warp.") (sha256 (base32 "18mdw6nc0vgj6k9rsy0x8w64wvzld0frqshrxxbxfj9qi9843vlc")) - (patches (search-patches "azr3.patch")))) + (patches (search-patches "azr3.patch" + "azr3-remove-lash.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1118,7 +1119,7 @@ formant warp.") (utime "azr3.1" early-1980 early-1980)) #t))))) (inputs - (list gtkmm-2 lvtk jack-1 lash)) + (list gtkmm-2 lvtk jack-1)) (native-inputs (list pkg-config)) (home-page "http://ll-plugins.nongnu.org/azr3/") diff --git a/gnu/packages/patches/azr3-remove-lash.patch b/gnu/packages/patches/azr3-remove-lash.patch new file mode 100644 index 0000000000..d62bd1e93c --- /dev/null +++ b/gnu/packages/patches/azr3-remove-lash.patch @@ -0,0 +1,191 @@ +Remove any reference to LASH, which has been abandoned and still requires the +use of Python 2. + +diff --git a/Makefile b/Makefile +index 7c9f4f0..f82ba75 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ PACKAGE_WEBPAGE = "http://ll-plugins.nongnu.org/azr3/" + PACKAGE_BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=ll-plugins" + PACKAGE_VC = "http://git.savannah.gnu.org/cgit/ll-plugins/azr3-jack.git/" + +-PKG_DEPS = gtkmm-2.4>=2.8.8 jack>=0.103.0 lash-1.0>=0.5.3 ++PKG_DEPS = gtkmm-2.4>=2.8.8 jack>=0.103.0 + + + PROGRAMS = azr3 +@@ -32,8 +32,8 @@ azr3_SOURCES = \ + drawbar.hpp drawbar.cpp \ + textbox.hpp textbox.cpp + azr3_SOURCEDIR = azr3 +-azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack lash-1.0` -DDATADIR=\"$(pkgdatadir)\" +-azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack lash-1.0` ++azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack` -DDATADIR=\"$(pkgdatadir)\" ++azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack` -lpthread + azr3_cpp_CFLAGS = $(shell if pkg-config --atleast-version=0.107 jack ; then echo -include azr3/newjack.hpp; fi) + main_cpp_CFLAGS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" + +diff --git a/azr3/main.cpp b/azr3/main.cpp +index 344fd03..fbe5671 100644 +--- a/azr3/main.cpp ++++ b/azr3/main.cpp +@@ -32,13 +32,6 @@ using namespace std; + + + Main::Main(int& argc, char**& argv) : m_ok(false) { +- +- /* this is a bit dumb, but the only way I know of to check whether we were +- started by lashd is to see if lash_extract_args() removes any arguments */ +- int old_argc = argc; +- lash_args_t* lash_args = lash_extract_args(&argc, &argv); +- m_started_by_lashd = (argc != old_argc); +- + // parse all non-LASH arguments + OptionParser op; + bool help(false); +@@ -166,10 +159,6 @@ Main::Main(int& argc, char**& argv) : m_ok(false) { + } + } + +- // initialise LASH +- if (!init_lash(lash_args, jack_get_client_name(m_jack_client))) +- return; +- + m_win->set_title("AZR-3"); + m_win->set_resizable(false); + m_win->add(*m_gui); +@@ -184,14 +173,11 @@ void Main::run() { + jack_activate(m_jack_client); + + // auto-connect JACK ports if desired +- if (!m_started_by_lashd) +- auto_connect(); ++ auto_connect(); + + Glib::signal_timeout(). + connect(sigc::bind_return(sigc::mem_fun(*this, &Main::check_changes), + true), 10); +- Glib::signal_timeout(). +- connect(sigc::mem_fun(*this, &Main::check_lash_events), 500); + m_kit->run(*m_win); + jack_deactivate(m_jack_client); + m_engine->deactivate(); +@@ -343,83 +329,7 @@ int Main::process(jack_nframes_t nframes) { + + return 0; + } +- +- +-bool Main::check_lash_events() { +- lash_event_t* event; +- bool go_on = true; +- while ((event = lash_get_event(m_lash_client))) { +- +- // save +- if (lash_event_get_type(event) == LASH_Save_File) { +- cerr<<"Received LASH Save command"<clear_programs(); +- for (unsigned char i = 0; i < 128; ++i) { +- if (!m_presets[i].empty) +- m_gui->add_program(i, m_presets[i].name.c_str()); +- } +- ifstream fin((dir + "/state").c_str()); +- int prog; +- fin>>prog; +- m_gui->set_program(prog); +- for (uint32_t p = 0; p < 63; ++p) { +- float tmp; +- fin>>tmp; +- m_gui->set_control(p, tmp); +- } +- lash_send_event(m_lash_client, +- lash_event_new_with_type(LASH_Restore_File)); +- } +- +- // quit +- else if (lash_event_get_type(event) == LASH_Quit) { +- cerr<<"Received LASH Quit command"<quit(); +- go_on = false; +- } +- +- lash_event_destroy(event); +- } +- return go_on; +-} +- +- +-bool Main::init_lash(lash_args_t* lash_args, const std::string& jack_name) { +- +- m_lash_client = lash_init(lash_args, "AZR-3", +- LASH_Config_File, LASH_PROTOCOL(2, 0)); +- if (m_lash_client) { +- lash_event_t* event = lash_event_new_with_type(LASH_Client_Name); +- lash_event_set_string(event, "AZR-3"); +- lash_send_event(m_lash_client, event); +- lash_jack_client_name(m_lash_client, jack_name.c_str()); +- Glib::signal_timeout(). +- connect(sigc::mem_fun(*this, &Main::check_lash_events), 500); +- } +- else +- cerr<<"Could not initialise LASH!"<(arg)->process(frames); + } +diff --git a/azr3/main.hpp b/azr3/main.hpp +index 48a425c..0406295 100644 +--- a/azr3/main.hpp ++++ b/azr3/main.hpp +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + + #include "azr3.hpp" + #include "azr3gui.hpp" +@@ -65,10 +64,6 @@ protected: + + int process(jack_nframes_t nframes); + +- bool check_lash_events(); +- +- bool init_lash(lash_args_t* lash_args, const std::string& jack_name); +- + void auto_connect(); + + static int static_process(jack_nframes_t frames, void* arg); +@@ -89,10 +84,8 @@ protected: + sem_t m_gui_changed; + float m_gui_controls[63]; + Preset m_presets[128]; +- lash_client_t* m_lash_client; + + bool m_ok; +- bool m_started_by_lashd; + std::string m_auto_midi; + std::string m_auto_audio; + -- cgit 1.4.1 From f46b962b7eef877d219c640af92ab1473fd3d364 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 10:48:29 +0100 Subject: gnu: azr3: Remove trailing #T from build phase. * gnu/packages/audio.scm (azr3)[arguments]: Remove trailing #T from fix-timestamp build phase. --- gnu/packages/audio.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 77cd44fb36..f47da1c37d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1116,8 +1116,7 @@ formant warp.") (add-before 'install 'fix-timestamp (lambda _ (let ((early-1980 315619200)) ; 1980-01-02 UTC - (utime "azr3.1" early-1980 early-1980)) - #t))))) + (utime "azr3.1" early-1980 early-1980))))))) (inputs (list gtkmm-2 lvtk jack-1)) (native-inputs -- cgit 1.4.1 From fb3dfff677e5610897fd0154d764aa9ec208c2e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 10:50:11 +0100 Subject: gnu: azr3: Use Gexp. * gnu/packages/audio.scm (azr3)[arguments]: Use Gexp to dispose of %output references. --- gnu/packages/audio.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f47da1c37d..132a1018ce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1106,13 +1106,14 @@ formant warp.") "azr3-remove-lash.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:make-flags - (list "LV2PEG=ttl2c" - (string-append "prefix=" %output) - (string-append "pkgdatadir=" %output "/share/azr3-jack")) - #:phases - (modify-phases %standard-phases + (list + #:tests? #f ; no check target + #:make-flags + #~(list "LV2PEG=ttl2c" + (string-append "prefix=" #$output) + (string-append "pkgdatadir=" #$output "/share/azr3-jack")) + #:phases + '(modify-phases %standard-phases (add-before 'install 'fix-timestamp (lambda _ (let ((early-1980 315619200)) ; 1980-01-02 UTC -- cgit 1.4.1 From e8f4ce74280f035c2224875602bb06e3b59ed746 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:09:42 +0100 Subject: gnu: azr3: Update to 1.2.3-1.3391a0a. * gnu/packages/audio.scm (azr3): Update to 1.2.3-1.3391a0a. [arguments]: Replace bootstrap phase. * gnu/packages/patches/azr3-remove-lash.patch, gnu/packages/patches/azr3.patch: Update patches. --- gnu/packages/audio.scm | 82 ++++++++++++++++------------- gnu/packages/patches/azr3-remove-lash.patch | 2 +- gnu/packages/patches/azr3.patch | 12 ++--- 3 files changed, 53 insertions(+), 43 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 132a1018ce..e7065c2f53 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1091,46 +1091,56 @@ formant warp.") (license license:gpl2+))) (define-public azr3 - (package - (name "azr3") - (version "1.2.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/ll-plugins/azr3-jack-" - version - ".tar.bz2")) - (sha256 - (base32 - "18mdw6nc0vgj6k9rsy0x8w64wvzld0frqshrxxbxfj9qi9843vlc")) - (patches (search-patches "azr3.patch" - "azr3-remove-lash.patch")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; no check target - #:make-flags - #~(list "LV2PEG=ttl2c" - (string-append "prefix=" #$output) - (string-append "pkgdatadir=" #$output "/share/azr3-jack")) - #:phases - '(modify-phases %standard-phases - (add-before 'install 'fix-timestamp - (lambda _ - (let ((early-1980 315619200)) ; 1980-01-02 UTC - (utime "azr3.1" early-1980 early-1980))))))) - (inputs - (list gtkmm-2 lvtk jack-1)) - (native-inputs - (list pkg-config)) - (home-page "http://ll-plugins.nongnu.org/azr3/") - (synopsis "Tonewheel organ synthesizer") - (description - "AZR-3 is a port of the free VST plugin AZR-3. It is a tonewheel organ + (let ((commit "3391a0a509e7fa3fb46c7627fd5979b67e468038") + (revision "1")) + (package + (name "azr3") + (version (git-version "1.2.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/ll-plugins/azr3-jack.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09wy0z4kiid7mwf5b5j8rzzgxafi4mg88xs550n7864p0n351chx")) + (patches (search-patches "azr3.patch" + "azr3-remove-lash.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no check target + #:make-flags + #~(list "LV2PEG=ttl2c" + (string-append "prefix=" #$output) + (string-append "pkgdatadir=" #$output "/share/azr3-jack")) + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (call-with-output-file "Makefile.config" + (lambda (port) (display "" port))) + (substitute* "Makefile" + (("^PACKAGE_VERSION =.*") + (string-append "PACKAGE_VERSION = \"" #$version "\"\n"))))) + (add-before 'install 'fix-timestamp + (lambda _ + (let ((early-1980 315619200)) ; 1980-01-02 UTC + (utime "azr3.1" early-1980 early-1980))))))) + (inputs + (list gtkmm-2 lvtk jack-1)) + (native-inputs + (list pkg-config)) + (home-page "http://ll-plugins.nongnu.org/azr3/") + (synopsis "Tonewheel organ synthesizer") + (description + "AZR-3 is a port of the free VST plugin AZR-3. It is a tonewheel organ with drawbars, distortion and rotating speakers. The organ has three sections, two polyphonic sections with nine drawbars each and one monophonic bass section with five drawbars. A standalone JACK application and LV2 plugins are provided.") - (license license:gpl2))) + (license license:gpl2)))) (define-public calf (package diff --git a/gnu/packages/patches/azr3-remove-lash.patch b/gnu/packages/patches/azr3-remove-lash.patch index d62bd1e93c..d5d481c5dd 100644 --- a/gnu/packages/patches/azr3-remove-lash.patch +++ b/gnu/packages/patches/azr3-remove-lash.patch @@ -19,7 +19,7 @@ index 7c9f4f0..f82ba75 100644 textbox.hpp textbox.cpp azr3_SOURCEDIR = azr3 -azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack lash-1.0` -DDATADIR=\"$(pkgdatadir)\" --azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack lash-1.0` +-azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack lash-1.0` -lpthread +azr3_CFLAGS = `pkg-config --cflags gtkmm-2.4 jack` -DDATADIR=\"$(pkgdatadir)\" +azr3_LDFLAGS = `pkg-config --libs gtkmm-2.4 jack` -lpthread azr3_cpp_CFLAGS = $(shell if pkg-config --atleast-version=0.107 jack ; then echo -include azr3/newjack.hpp; fi) diff --git a/gnu/packages/patches/azr3.patch b/gnu/packages/patches/azr3.patch index 5849383c5b..93e9b5b11a 100644 --- a/gnu/packages/patches/azr3.patch +++ b/gnu/packages/patches/azr3.patch @@ -68,9 +68,9 @@ The patch has been sent to the developer on 2016-09-26. Widget* eb = add_clickbox(m_fbox, 14, 319, 14, 44); eb->signal_button_press_event(). - connect(sigc::hide(bind(bind(mem_fun(*this, &AZR3GUI::change_mode), -- ref(m_fbox)), false))); +- sigc::ref(m_fbox)), false))); + connect(sigc::hide(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::change_mode), -+ false, std::ref(m_fbox)))); ++ false, sigc::ref(m_fbox)))); m_fx_widgets.push_back(eb); // Mr Valve controls @@ -79,15 +79,15 @@ The patch has been sent to the developer on 2016-09-26. Widget* eb2 = add_clickbox(m_vbox, 14, 53, 14, 44); eb2->signal_button_press_event(). - connect(sigc::hide(bind(bind(mem_fun(*this, &AZR3GUI::change_mode), -- ref(m_fbox)), true))); +- sigc::ref(m_fbox)), true))); + connect(sigc::hide(sigc::bind(sigc::mem_fun(*this, &AZR3GUI::change_mode), -+ true, std::ref(m_fbox)))); ++ true, sigc::ref(m_fbox)))); // vibrato controls add_switch(m_vbox, n_1_vibrato, 39, 17, Switch::Green); @@ -352,9 +352,9 @@ knob->set_style(s); - if (port >= 0 && port < m_adj.size()) { + if (port < m_adj.size()) { knob->get_adjustment().signal_value_changed(). - connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port), - mem_fun(knob->get_adjustment(), @@ -100,7 +100,7 @@ The patch has been sent to the developer on 2016-09-26. } @@ -382,8 +382,8 @@ db->set_style(s); - if (port >= 0 && port < m_adj.size()) { + if (port < m_adj.size()) { db->get_adjustment().signal_value_changed(). - connect(compose(bind<0>(mem_fun(*this, &AZR3GUI::control_changed), port), - mem_fun(db->get_adjustment(), &Adjustment::get_value))); -- cgit 1.4.1 From a402c9c20fe660d362aa34c51cfad7f17e12ae1f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:11:01 +0100 Subject: gnu: azr3: Use JACK 2. * gnu/packages/audio.scm (azr3)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e7065c2f53..ea2ae73f4d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1129,7 +1129,7 @@ formant warp.") (let ((early-1980 315619200)) ; 1980-01-02 UTC (utime "azr3.1" early-1980 early-1980))))))) (inputs - (list gtkmm-2 lvtk jack-1)) + (list gtkmm-2 jack-2 lvtk)) (native-inputs (list pkg-config)) (home-page "http://ll-plugins.nongnu.org/azr3/") -- cgit 1.4.1 From c3115e3517ad90340bdf1f13d020d497f6e05649 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:03:20 -0500 Subject: gnu: seq24: Remove lash input. * gnu/packages/music.scm (seq24) [inputs]: Remove lash. [home-page]: Update URL. --- gnu/packages/music.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 69e8cbcc79..6c7b3b4533 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4626,11 +4626,9 @@ defined as tabs in the main control surface.") "12dphdhnvfk1k0vmagi1v2lhyxjyj1j3cz6ksjw0ydcvid1x8ap2")) (patches (search-patches "seq24-rename-mutex.patch")))) (build-system gnu-build-system) - (inputs - (list gtkmm-2 alsa-lib jack-1 lash)) - (native-inputs - (list pkg-config)) - (home-page "https://edge.launchpad.net/seq24/") + (inputs (list gtkmm-2 alsa-lib jack-1)) + (native-inputs (list pkg-config)) + (home-page "https://launchpad.net/seq24/") (synopsis "Real-time MIDI sequencer") (description "Seq24 is a real-time MIDI sequencer. It was created to provide a very simple interface for editing and playing MIDI loops.") -- cgit 1.4.1 From 73b248c8419d05bf9522d394fea11144cb6bfdfb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:07:41 -0500 Subject: gnu: muse-sequencer: Remove lash input. * gnu/packages/music.scm (muse-sequencer) [inputs]: Remove lash. [native-inputs]: Remove labels. --- gnu/packages/music.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6c7b3b4533..f6aceecac4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4987,7 +4987,6 @@ sample library.") glib jack-1 ladspa - lash libinstpatch liblo libsamplerate @@ -5004,10 +5003,10 @@ sample library.") rubberband sord)) (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list perl + pkg-config + python-wrapper + qttools-5)) (home-page "https://muse-sequencer.github.io/") (synopsis "MIDI/Audio sequencer") (description "MusE is a MIDI/Audio sequencer with recording and editing -- cgit 1.4.1 From 5449290b57f1241d1e90a0671efa8a620e755915 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:09:58 -0500 Subject: gnu: jack-keyboard: Remove lash input. * gnu/packages/music.scm (jack-keyboard) [inputs]: Remove lash. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f6aceecac4..9c7bef516f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3218,7 +3218,7 @@ on the library.") "0mzmg8aavybcfdlq2yd9d0vscqd6is5p6jzrgfpfm5j3xdcvh2s3")))) (build-system gnu-build-system) (inputs - (list jack-1 lash gtk+-2)) + (list jack-1 gtk+-2)) (native-inputs (list pkg-config)) (home-page "http://jack-keyboard.sourceforge.net/") -- cgit 1.4.1 From 42ee282d2d2dc6a35b58d6c14042a2f7d0bc3321 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Feb 2023 22:50:23 -0500 Subject: gnu: jack-keyboard: Update to 2.7.2. * gnu/packages/music.scm (jack-keyboard): Update to 2.7.2. [build-system]: Use cmake-build-system. [arguments]: Set #:tests? to #f. Adjust configure-flags for CMake. [native-inputs]: Delete field. [home-page]: Update URL. --- gnu/packages/music.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9c7bef516f..8c2f74613c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -46,7 +46,7 @@ ;;; Copyright © 2021 Thomas Albers Raviola ;;; Copyright © 2022, 2023 Sughosha ;;; Copyright © 2022 Remco van 't Veer -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 jgart @@ -3207,7 +3207,7 @@ on the library.") (define-public jack-keyboard (package (name "jack-keyboard") - (version "2.5") + (version "2.7.2") (source (origin (method url-fetch) @@ -3215,13 +3215,21 @@ on the library.") version "/jack-keyboard-" version ".tar.gz")) (sha256 (base32 - "0mzmg8aavybcfdlq2yd9d0vscqd6is5p6jzrgfpfm5j3xdcvh2s3")))) - (build-system gnu-build-system) - (inputs - (list jack-1 gtk+-2)) - (native-inputs - (list pkg-config)) - (home-page "http://jack-keyboard.sourceforge.net/") + "1z34ga1z6ivgxbp0afsfghz7rn6s8vc9fxnb9ini8mx0dackr5ar")))) + (build-system cmake-build-system) + ;; Disable Lash support, as it is unmaintained and depends on Python 2. + (arguments + (list #:tests? #f ;no test suite + #:configure-flags + #~(list "-DLashEnable=OFF" + ;; XXX: FindGTK2.cmake from CMake expects the + ;; headers to be in FHS locations; give it some + ;; clues. + (string-append "-DGTK2_ADDITIONAL_SUFFIXES=" + "lib/glib-2.0;" ;for glibconfig.h + "lib/gtk-2.0")))) ;for gdkconfig.h + (inputs (list jack-1 gtk+-2)) + (home-page "https://jack-keyboard.sourceforge.net/") (synopsis "Virtual MIDI keyboard") (description "Jack-keyboard is a virtual MIDI keyboard, a program that allows you to send JACK MIDI events (i.e. play) using your PC keyboard.") -- cgit 1.4.1 From 6e946a55b538fa3d0b8e06dec04bbf6771e62b9f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:11:56 -0500 Subject: gnu: hydrogen: Remove lash input. * gnu/packages/music.scm (hydrogen) [inputs]: Remove lash. [phases]: Remove trailing #t. [native-inputs]: Remove labels. [home-page]: Update URL. --- gnu/packages/music.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8c2f74613c..edb8131d3c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -766,17 +766,15 @@ settings (aliasing, linear interpolation and cubic interpolation).") (substitute* "CMakeLists.txt" (("/usr/share/pixmaps") (string-append (assoc-ref outputs "out") - "/share/pixmaps"))) - #t))))) + "/share/pixmaps")))))))) (native-inputs - `(("cppunit" ,cppunit) - ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools-5))) + (list cppunit + pkg-config + qttools-5)) (inputs (list alsa-lib jack-1 ;; ("ladspa" ,ladspa) ; require LADSPA_PATH to be set - lash libarchive liblo libsndfile @@ -785,7 +783,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") qtbase-5 qtxmlpatterns zlib)) - (home-page "http://www.hydrogen-music.org") + (home-page "http://hydrogen-music.org/") (synopsis "Drum machine") (description "Hydrogen is an advanced drum machine for GNU/Linux. Its main goal is to -- cgit 1.4.1 From 46952ddc3400ce0ebe52da00f86a9b5119a3d840 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:23:24 -0500 Subject: gnu: calf: Remove lash input. * gnu/packages/audio.scm (calf) [inputs]: Remove lash. --- gnu/packages/audio.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ea2ae73f4d..a60bb85b67 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1160,7 +1160,6 @@ plugins are provided.") glib gtk+-2 cairo - lash jack-1 lv2 ladspa -- cgit 1.4.1 From 5a88a42fdee5993fd5f2722b0158e69824a9027a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:21:22 +0100 Subject: gnu: lmms: Drop input labels. * gnu/packages/music.scm (lmms)[inputs]: Drop labels. --- gnu/packages/music.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index edb8131d3c..191ad5241e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4766,23 +4766,23 @@ are a C compiler and glib. Full API documentation and examples are included.") (base32 "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay")))))) (inputs - `(("sdl" ,sdl) - ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) - ("fltk" ,fltk) - ("libogg" ,libogg) - ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth) - ("libvorbis" ,libvorbis) - ("alsa-lib" ,alsa-lib) - ("portaudio" ,portaudio) - ("ladspa" ,ladspa) - ("libsndfile1" ,libsndfile) - ("libxft" ,libxft) - ("freetype2" ,freetype) - ("fftw3f" ,fftwf) - ("jack" ,jack-1) - ("carla" ,carla))) + (list alsa-lib + carla + fftwf + fltk + fluidsynth + freetype + jack-1 + ladspa + libogg + libsamplerate + libsndfile + libvorbis + libxft + portaudio + qtbase-5 + qtx11extras + sdl)) (home-page "https://lmms.io/") (synopsis "Music composition tool") (description "LMMS is a digital audio workstation. It includes tools for sequencing -- cgit 1.4.1 From 7dcc4d70ee44271b5437a0d773e356039ab75b9c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:21:44 +0100 Subject: gnu: lmms: Use Gexp. * gnu/packages/music.scm (lmms)[arguments]: Use gexp; drop trailing #T from build phase. --- gnu/packages/music.scm | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 191ad5241e..aaa8c49fd2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4725,29 +4725,25 @@ are a C compiler and glib. Full API documentation and examples are included.") "11xgf461cnmq0jkgdgx5bddi87ammpik4whg1m4fcvd3i0d5i601")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - ;; Qt 5 support must be explicitly enabled in the 1.2 stable versions of - ;; LMMS, so try removing "-DWANT_QT5=ON" in later versions. - ;; Also, explicitly disabling VST support gets rid of the in-tree - ;; dependency on qt5-x11embed. - #:configure-flags '("-DWANT_QT5=ON" - "-DWANT_VST=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-rpmalloc - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "rpmalloc") - "src/3rdparty/rpmalloc/rpmalloc") - #t)) - (add-before 'configure 'set-ldflags - (lambda* (#:key outputs #:allow-other-keys) - (setenv "LDFLAGS" - (string-append - "-Wl,-rpath=\"" - (assoc-ref outputs "out") "/lib/lmms" - ":" - (assoc-ref outputs "out") "/lib/lmms/ladspa" - "\""))))))) + (list + #:tests? #f ; no tests + ;; Qt 5 support must be explicitly enabled in the 1.2 stable versions of + ;; LMMS, so try removing "-DWANT_QT5=ON" in later versions. + ;; Also, explicitly disabling VST support gets rid of the in-tree + ;; dependency on qt5-x11embed. + #:configure-flags '(list "-DWANT_QT5=ON" "-DWANT_VST=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-rpmalloc + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "rpmalloc") + "src/3rdparty/rpmalloc/rpmalloc"))) + (add-before 'configure 'set-ldflags + (lambda _ + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=\"" #$output "/lib/lmms" + ":" #$output "/lib/lmms/ladspa" "\""))))))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools-5" ,qttools-5) -- cgit 1.4.1 From 76f4f792670a56a2ee8484c0b3d83900523520da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:22:17 +0100 Subject: gnu: lmms: Reformat description. * gnu/packages/music.scm (lmms)[description]: Reformat. --- gnu/packages/music.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aaa8c49fd2..221d97369d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4781,9 +4781,10 @@ are a C compiler and glib. Full API documentation and examples are included.") sdl)) (home-page "https://lmms.io/") (synopsis "Music composition tool") - (description "LMMS is a digital audio workstation. It includes tools for sequencing -melodies and beats and for mixing and arranging songs. LMMS includes instruments based on -audio samples and various soft sythesizers. It can receive input from a MIDI keyboard.") + (description "LMMS is a digital audio workstation. It includes tools for +sequencing melodies and beats and for mixing and arranging songs. LMMS +includes instruments based on audio samples and various soft sythesizers. It +can receive input from a MIDI keyboard.") (license license:gpl2+))) (define-public liquidsfz -- cgit 1.4.1 From 6de3c1088e0fe7e7df487ff1d74ffdf294e79c40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:25:42 +0100 Subject: gnu: libsmf: Use gexp. * gnu/packages/music.scm (libsmf)[arguments]: Use gexp. --- gnu/packages/music.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 221d97369d..15ba78060c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4682,21 +4682,19 @@ inventory, and orders.") (outputs '("out" "static")) ; 88KiB of .a files (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) - (slib (string-append static "/lib"))) - (mkdir-p slib) - (for-each (lambda (file) - (install-file file slib) - (delete-file file)) - (find-files lib "\\.a$")) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-static-libraries + (lambda _ + ;; Move static libraries to the "static" output. + (let ((lib (string-append #$output "/lib")) + (slib (string-append #$output:static "/lib"))) + (mkdir-p slib) + (for-each (lambda (file) + (install-file file slib) + (delete-file file)) + (find-files lib "\\.a$")))))))) (inputs (list readline glib)) (native-inputs -- cgit 1.4.1 From 85e387fe89a59a17347674bd8dc6ad3abcac0695 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:26:16 +0100 Subject: gnu: libsmf: Simplify description. * gnu/packages/music.scm (libsmf)[description]: Remove claim about dependencies. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 15ba78060c..51aed7ba5b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4702,9 +4702,9 @@ inventory, and orders.") (home-page "http://libsmf.sourceforge.net/") (synopsis "Standard MIDI File format library") (description - "LibSMF is a C library for handling SMF (\"*.mid\") files. It transparently handles -conversions between time and pulses, tempo map handling and more. The only dependencies -are a C compiler and glib. Full API documentation and examples are included.") + "LibSMF is a C library for handling SMF (\"*.mid\") files. It +transparently handles conversions between time and pulses, tempo map handling +and more. Full API documentation and examples are included.") (license license:bsd-2))) (define-public lmms -- cgit 1.4.1 From 3339f6f5503d86b418753533afdca2dddb253e2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:28:59 +0100 Subject: gnu: foo-yc20: Drop input labels. * gnu/packages/music.scm (foo-yc20)[inputs]: Drop labels. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 51aed7ba5b..38a0a34bb9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5971,10 +5971,10 @@ and debugging of event signal flows inside plugin graphs.") (("-march=native") "")) #t))))) (inputs - `(("jack" ,jack-1) - ("lv2" ,lv2) - ("cairo" ,cairo) - ("gtk" ,gtk+-2))) + (list cairo + gtk+-2 + jack-1 + lv2)) (native-inputs (list faust pkg-config)) (home-page "https://foo-yc20.codeforcode.com/") -- cgit 1.4.1 From cd53d64876a3148b3c64e2c3ee36560ac6c0c3fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:29:28 +0100 Subject: gnu: foo-yc20: Use gexp. * gnu/packages/music.scm (foo-yc20)[arguments]: Use gexp. --- gnu/packages/music.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 38a0a34bb9..b2d1f350d4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5959,17 +5959,17 @@ and debugging of event signal flows inside plugin graphs.") "1drzfyr7mzb58pdv0gsqkg6ds6kbgp6g25rrv1yya1611cljgvjh")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ; no automated test - #:phases - (modify-phases %standard-phases + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output)) + #:tests? #f ; no automated test + #:phases + '(modify-phases %standard-phases (replace 'configure (lambda _ (substitute* "Makefile" (("-mtune=native") "") - (("-march=native") "")) - #t))))) + (("-march=native") ""))))))) (inputs (list cairo gtk+-2 -- cgit 1.4.1 From 2774640996861569350224e9abd21904237237c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:39:42 +0100 Subject: gnu: yoshimi: Drop input labels. * gnu/packages/music.scm (yoshimi)[inputs]: Drop labels. --- gnu/packages/music.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b2d1f350d4..9be77b75af 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3150,19 +3150,19 @@ capabilities, custom envelopes, effects, etc.") (string-append flag " -msse -msse2 -mfpmath=sse"))) #t))))) (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("fontconfig" ,fontconfig) - ("minixml" ,minixml) - ("mesa" ,mesa) - ("fltk" ,fltk) - ("lv2" ,lv2) - ("readline" ,readline) - ("ncurses" ,ncurses) - ("cairo" ,cairo) - ("zlib" ,zlib))) + (list alsa-lib + boost + cairo + fftwf + fltk + fontconfig + jack-1 + lv2 + mesa + minixml + ncurses + readline + zlib)) (native-inputs (list pkg-config)) (home-page "http://yoshimi.sourceforge.net/") -- cgit 1.4.1 From dd62d949897e7e0e1192a1fe552935144f832fb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:40:04 +0100 Subject: gnu: yoshimi: Use gexp. * gnu/packages/music.scm (yoshimi)[arguments]: Use gexp and drop trailing #t from build phases. --- gnu/packages/music.scm | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9be77b75af..5ba0f9272a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3124,31 +3124,30 @@ capabilities, custom envelopes, effects, etc.") (base32 "1axrbk1qwsiq77g5957db744481zb2v158psnk2w530wxhls2442")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; there are no tests - #:configure-flags - (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" - (assoc-ref %outputs "out") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'enter-dir - (lambda _ (chdir "src") #t)) - ;; Move SSE compiler optimization flags from generic target to - ;; athlon64 and core2 targets, because otherwise the build would fail - ;; on non-Intel machines. - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* (list "src/Interface/InterChange.cpp" - "src/Misc/Bank.cpp" - "src/Misc/Config.cpp") - (("/usr/share") (string-append (assoc-ref outputs "out") - "/share"))))) - (add-after 'unpack 'remove-sse-flags-from-generic-target - (lambda _ - (substitute* "src/CMakeLists.txt" - (("-msse -msse2 -mfpmath=sse") "") - (("-march=(athlon64|core2)" flag) - (string-append flag " -msse -msse2 -mfpmath=sse"))) - #t))))) + (list + #:tests? #f ; there are no tests + #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" + #$output "/share")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'enter-dir + (lambda _ (chdir "src"))) + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* (list "src/Interface/InterChange.cpp" + "src/Misc/Bank.cpp" + "src/Misc/Config.cpp") + (("/usr/share") (string-append #$output "/share"))))) + ;; Move SSE compiler optimization flags from generic target to + ;; athlon64 and core2 targets, because otherwise the build would fail + ;; on non-Intel machines. + (add-after 'unpack 'remove-sse-flags-from-generic-target + (lambda _ + (substitute* "src/CMakeLists.txt" + (("-msse -msse2 -mfpmath=sse") "") + (("-march=(athlon64|core2)" flag) + (string-append flag " -msse -msse2 -mfpmath=sse")))))))) (inputs (list alsa-lib boost -- cgit 1.4.1 From ca82f35ffcb86bda6d96077086423301eff53a80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:48:23 +0100 Subject: gnu: lmms: Use JACK 2. * gnu/packages/music.scm (lmms)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5ba0f9272a..3a1889c805 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4765,7 +4765,7 @@ and more. Full API documentation and examples are included.") fltk fluidsynth freetype - jack-1 + jack-2 ladspa libogg libsamplerate -- cgit 1.4.1 From 08751bcebb5dfd38d0deea9f096e8e97f6774441 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 11:49:15 +0100 Subject: gnu: yoshimi: Use JACK 2. * gnu/packages/music.scm (yoshimi)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3a1889c805..87100c698d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3155,7 +3155,7 @@ capabilities, custom envelopes, effects, etc.") fftwf fltk fontconfig - jack-1 + jack-2 lv2 mesa minixml -- cgit 1.4.1 From f55cc9cb0fb6c5dd56196009681e042c1aef415d Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 26 Jan 2023 17:37:18 +0100 Subject: gnu: Add bitmapperbs. * gnu/packages/bioinformatics.scm (bitmapperbs): New variable. --- gnu/packages/bioinformatics.scm | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ef1e7ae988..782dd6bdd8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -512,6 +512,57 @@ BED, GFF/GTF, VCF.") (inputs (list samtools zlib)))) +(define-public bitmapperbs + (package + (name "bitmapperbs") + (version "1.0.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chhylp123/BitMapperBS/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02ksssfnvmpskld0a2016smfz5nrzm3d90v8974f3cpzywckvp8v")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "libdivsufsort-2.0.1") + (delete-file-recursively "pSAscan-0.1.0"))))) + ;;this package bundles a modified copy of htslib, so we cannot unbundle it + (build-system gnu-build-system) + (arguments + (list + #:tests? #false + #:make-flags '(list "bitmapperBS") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (install-file "bitmapperBS" + (string-append #$output "/bin/")))) + #;(add-after 'unpack 'fix-build-system + (lambda _ + (substitute* "Makefile" + (("-Wl,-rpath=htslib_aim/lib") "") + #;(("^HTSLIB_INFO.*") "")))) + (add-after 'unpack 'patch-references-to-psascan + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("\"(./)?psascan" pre all) + (string-append "\"" pre (search-input-file inputs "/bin/psascan")))))) + (delete 'configure)))) + (inputs + (list libdivsufsort + psascan + zlib)) + (home-page "https://github.com/chhylp123/BitMapperBS/") + (synopsis "read aligner for whole-genome bisulfite sequencing") + (description + "BitMapperBS is memory-efficient aligner that +is designed for WGBS reads from directional protocol.") + (license license:gpl3+))) + (define-public cellsnp-lite ;; Last release is from November 2021 and does not contain fixes. (let ((commit "0885d746b0b1ea65c8ef92f8943ca7669ca9734a") -- cgit 1.4.1 From 74f5a0d8f2d9edf5b99115ac8793063b5894f796 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Mon, 6 Feb 2023 20:12:11 +0100 Subject: gnu: Add emacs-langtool. * gnu/packages/emacs-xyz.scm (emacs-langtool): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d30696c7be..852fe6e7c5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24549,6 +24549,34 @@ the GIF result.") on-line service.") (license license:gpl3+))) +(define-public emacs-langtool + (package + (name "emacs-langtool") + (version "2.3.7") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/mhayashi1120/Emacs-langtool") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "make" "test"))) + (propagated-inputs (list emacs-popup)) + (home-page "https://github.com/mhayashi1120/Emacs-langtool") + (synopsis "Emacs interface to LanguageTool") + (description + "Emacs Langtool offers a frontend to @url{https://languagetool.org, +LanguageTool} server.") + (license license:gpl3+))) + (define-public emacs-lingva (let ((commit "6c33594068fa33de622172503deeec6778d9c744") (revision "1")) -- cgit 1.4.1 From 809cbefa8efe18d568221db534539252e16d4115 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Feb 2023 14:13:35 +0100 Subject: gnu: emacs-citeproc-el: Update to 0.9.3. * gnu/packages/emacs-xyz.scm (emacs-citeproc-el): Update to 0.9.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 852fe6e7c5..e8cbd08a62 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3772,7 +3772,7 @@ Its features are: (define-public emacs-citeproc-el (package (name "emacs-citeproc-el") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) @@ -3781,7 +3781,7 @@ Its features are: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0p9gch5iijia5pm9rzlv50xcad2g9mis9mc90nvh31in9xjcccpz")))) + (base32 "0md8pfmd0v9ipnxj1q13vv81hl90wf4rm46czbk1fdzkyf9js08m")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support -- cgit 1.4.1 From c5ce4b315a62717f0c3ae01837307c504e3f055a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Feb 2023 15:00:48 +0100 Subject: gnu: emacs-consult: Update to 0.32. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 0.32. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e8cbd08a62..a9a087bd10 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10429,7 +10429,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.31") + (version "0.32") (source (origin (method git-fetch) @@ -10437,7 +10437,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "0ckyn4sdhc9dykbbdiin75jxza883dqa3g4mvf8qgsnzlqcjvvg6")) + (base32 "00cgc3bzj37319ds027rpj60wfk0c10cgp5xish2g1cq5ny74q32")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) -- cgit 1.4.1 From 9a0f840b383839bd3d02b7328cf4396783f2fd90 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Feb 2023 15:02:27 +0100 Subject: gnu: emacs-org-transclusion: Update to 1.3.2. * gnu/packages/emacs-xyz.scm (emacs-org-transclusion): Update to 1.3.2. [native-inputs]: Remove EMACS-ERT-RUNNER. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a9a087bd10..1efbaaa538 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17724,10 +17724,10 @@ running tests easier.") (license license:gpl3+))) (define-public emacs-org-transclusion - (let ((commit "cf51df7b87e0d32ba13ac5380557e81d9845d81b")) ;version bump + (let ((commit "7f4ad67bf1944b814a8763d304d4d27325504eb4")) ;version bump (package (name "emacs-org-transclusion") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -17736,7 +17736,7 @@ running tests easier.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ix5l8cjcafw8lqhkmwa3cpdw6cbpx65k0iww426nxya849y61yx")))) + (base32 "0dgqbazr22y0kmyw5ki1rkca10j6fy0ps5s9gx247gqlbmqz7088")))) (build-system emacs-build-system) (arguments (list @@ -17745,8 +17745,6 @@ running tests easier.") "-l" "org-transclusion.el" "-l" "test/unit-tests.el" "-f" "ert-run-tests-batch-and-exit"))) - (native-inputs - (list emacs-ert-runner)) (home-page "https://nobiot.github.io/org-transclusion/") (synopsis "Enable transclusion with Org Mode") (description "Org-transclusion lets you insert a copy of text content via -- cgit 1.4.1 From a083a9b512b695f5a5c7bca7d5a19dda97bd33b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 15:36:21 +0100 Subject: Revert "gnu: Add bitmapperbs." This reverts commit f55cc9cb0fb6c5dd56196009681e042c1aef415d. This commit was prematurely pushed. --- gnu/packages/bioinformatics.scm | 51 ----------------------------------------- 1 file changed, 51 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 782dd6bdd8..ef1e7ae988 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -512,57 +512,6 @@ BED, GFF/GTF, VCF.") (inputs (list samtools zlib)))) -(define-public bitmapperbs - (package - (name "bitmapperbs") - (version "1.0.2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chhylp123/BitMapperBS/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02ksssfnvmpskld0a2016smfz5nrzm3d90v8974f3cpzywckvp8v")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "libdivsufsort-2.0.1") - (delete-file-recursively "pSAscan-0.1.0"))))) - ;;this package bundles a modified copy of htslib, so we cannot unbundle it - (build-system gnu-build-system) - (arguments - (list - #:tests? #false - #:make-flags '(list "bitmapperBS") - #:phases - #~(modify-phases %standard-phases - (replace 'install - (lambda _ - (install-file "bitmapperBS" - (string-append #$output "/bin/")))) - #;(add-after 'unpack 'fix-build-system - (lambda _ - (substitute* "Makefile" - (("-Wl,-rpath=htslib_aim/lib") "") - #;(("^HTSLIB_INFO.*") "")))) - (add-after 'unpack 'patch-references-to-psascan - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile" - (("\"(./)?psascan" pre all) - (string-append "\"" pre (search-input-file inputs "/bin/psascan")))))) - (delete 'configure)))) - (inputs - (list libdivsufsort - psascan - zlib)) - (home-page "https://github.com/chhylp123/BitMapperBS/") - (synopsis "read aligner for whole-genome bisulfite sequencing") - (description - "BitMapperBS is memory-efficient aligner that -is designed for WGBS reads from directional protocol.") - (license license:gpl3+))) - (define-public cellsnp-lite ;; Last release is from November 2021 and does not contain fixes. (let ((commit "0885d746b0b1ea65c8ef92f8943ca7669ca9734a") -- cgit 1.4.1 From b5e300f9c15640090c82225ca13c25bd54eb0ed4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 10:08:06 -0500 Subject: gnu: jami: Update to 20230206.0. * gnu/packages/jami.scm (jami): Update to 20230206.0. (%jami-version): Update version. (%jami-sources): Adjust URI. Streamline snippet. (jami-apply-custom-patches): Use a wildcard to match the top-level directory, which now includes the version. (%ffmpeg-default-configure-flags): Adjust URL in top comment. * gnu/packages/patches/jami-libjami-headers-search.patch: Adjust file names for new tarball layout. --- gnu/packages/jami.scm | 47 +++++++++------------- .../patches/jami-libjami-headers-search.patch | 18 ++++----- 2 files changed, 28 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b74cdff0c7..e425a6547a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2019, 2020 Jan Wielkiewicz -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,31 +69,24 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20221220.0956.79e1207") +(define %jami-version "20230206.0") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the ;; Jami project. (origin (method url-fetch) - (uri (string-append "https://dl.jami.net/release/tarballs/jami_" - %jami-version - ".tar.gz")) + (uri (string-append "https://dl.jami.net/release/tarballs/jami-" + %jami-version ".tar.gz")) (modules '((guix build utils))) (snippet - `(begin - ;; Delete multiple MiBs of bundled tarballs. The contrib directory - ;; contains the custom patches for pjproject and other libraries used - ;; by Jami. - (delete-file-recursively "daemon/contrib/tarballs") - ;; Remove the git submodule directories of unused Jami clients. - (for-each delete-file-recursively '("client-android" - "client-ios" - "client-macosx" - "plugins")))) + ;; Delete multiple MiBs of bundled tarballs. The daemon/contrib + ;; directory contains the custom patches for pjproject and other + ;; libraries used by Jami. + '(delete-file-recursively "daemon/contrib/tarballs")) (sha256 (base32 - "0g5709rmb9944s0ij9g4pm1b871f5z0s5nawvm10z14wx3y1np8m")) + "1fx7c6q8j0x3q8cgzzd4kpsw3npqggsi1n493cv1jg7v5d01d3jz")) (patches (search-patches "jami-disable-integration-tests.patch" "jami-libjami-headers-search.patch")))) @@ -107,14 +100,12 @@ (invoke "tar" "-xvf" #$%jami-sources "-C" patches-directory "--strip-components=5" - (string-append "jami-project/daemon/contrib/src/" - dep-name)) - (for-each - (lambda (file) - (invoke "patch" "--force" "--ignore-whitespace" "-p1" "-i" - (string-append patches-directory "/" - file ".patch"))) - patches)))) + "--wildcards" + (string-append "jami-*/daemon/contrib/src/" dep-name)) + (for-each (lambda (f) + (invoke "patch" "--force" "--ignore-whitespace" "-p1" "-i" + (string-append patches-directory "/" f ".patch"))) + patches)))) (define-public pjproject-jami (let ((commit "513a3f14c44b2c2652f9219ec20dea64b236b713") @@ -153,10 +144,10 @@ '("0009-add-config-site"))))))))))) ;; The following variables are configure flags used by ffmpeg-jami. They're -;; from the jami-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to -;; keep it as close to the official Jami package as possible, to provide all -;; the codecs and extra features that are expected (see: -;; https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak) +;; from the jami/daemon/contrib/src/ffmpeg/rules.mak file. We try to keep it +;; as close to the official Jami package as possible, to provide all the +;; codecs and extra features that are expected (see: +;; https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak) (define %ffmpeg-default-configure-flags '("--disable-everything" "--enable-zlib" diff --git a/gnu/packages/patches/jami-libjami-headers-search.patch b/gnu/packages/patches/jami-libjami-headers-search.patch index 44e099a610..b3384ba563 100644 --- a/gnu/packages/patches/jami-libjami-headers-search.patch +++ b/gnu/packages/patches/jami-libjami-headers-search.patch @@ -20,9 +20,9 @@ Upstream status: https://review.jami.net/c/jami-client-qt/+/22973 src/libclient/qtwrapper/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-) -diff --git a/client-qt/CMakeLists.txt b/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt index d0a8fd70..94ac6074 100644 ---- a/client-qt/CMakeLists.txt +--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") @@ -33,9 +33,9 @@ index d0a8fd70..94ac6074 100644 endif() include(FindPython3) -diff --git a/client-qt/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake +diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake index ddb05319..9ad20d2b 100644 ---- a/client-qt/extras/build/cmake/modules/FindLibJami.cmake +--- a/extras/build/cmake/modules/FindLibJami.cmake +++ b/extras/build/cmake/modules/FindLibJami.cmake @@ -20,28 +20,19 @@ @@ -78,9 +78,9 @@ index ddb05319..9ad20d2b 100644 -message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIRS}) +message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR}) message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB}) -diff --git a/client-qt/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt +diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt index 2676c9c4..ac58ea2b 100644 ---- a/client-qt/src/libclient/CMakeLists.txt +--- a/src/libclient/CMakeLists.txt +++ b/src/libclient/CMakeLists.txt @@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") @@ -91,10 +91,10 @@ index 2676c9c4..ac58ea2b 100644 endif() string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT) -diff --git a/client-qt/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt +diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt index acee0d0c..ba68aac4 100644 ---- a/client-qt/src/libclient/qtwrapper/CMakeLists.txt -+++ b/client-qt/src/libclient/qtwrapper/CMakeLists.txt +--- a/src/libclient/qtwrapper/CMakeLists.txt ++++ b/src/libclient/qtwrapper/CMakeLists.txt @@ -46,7 +46,7 @@ else() endif() -- cgit 1.4.1 From 0eed4a9793cef534a69fdca5ddefa5a277312955 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 11:02:40 -0500 Subject: gnu: efl: Replace ibus with ibus-minimal. This is to avoid having EFL depend on GTK 4, reducing its closure size from 2134.8 MiB to 1446.7 MiB. * gnu/packages/enlightenment.scm (efl) [inputs]: Replace ibus with ibus-minimal. --- gnu/packages/enlightenment.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 8dae5f40d3..a7b48195f0 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -91,7 +91,7 @@ ("giflib" ,giflib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("ibus" ,ibus) + ("ibus-minimal" ,ibus-minimal) ("mesa" ,mesa) ("libraw" ,libraw) ("librsvg" ,(librsvg-for-system)) -- cgit 1.4.1 From 31b707cf5d179eb664df26b72f0f2976ef28f41d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 11:17:02 -0500 Subject: gnu: efl: Remove input labels. * gnu/packages/enlightenment.scm (efl) [native-inputs]: Remove labels. [inputs]: Likewise. [propagated-inputs]: Likewise. [arguments]: Use search-input-file. Only substitute libcurl.so.4, as libcurl.so.5 does not exist in our curl package. --- gnu/packages/enlightenment.scm | 134 ++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 69 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index a7b48195f0..4ad8d57868 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,63 +83,63 @@ "05bxc58hj0z6pkp6yy5cmy1lc575q0nrbr5lxr6z8d4kznh3my6r")))) (build-system meson-build-system) (native-inputs - `(("check" ,check) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list check + gettext-minimal + pkg-config + python)) (inputs - `(("curl" ,curl) - ("giflib" ,giflib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("ibus-minimal" ,ibus-minimal) - ("mesa" ,mesa) - ("libraw" ,libraw) - ("librsvg" ,(librsvg-for-system)) - ("libspectre" ,libspectre) - ("libtiff" ,libtiff) - ("libxau" ,libxau) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) - ("libxi" ,libxi) - ("libxfixes" ,libxfixes) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxss" ,libxscrnsaver) - ("libxtst" ,libxtst) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) - ("poppler" ,poppler) - ("util-linux" ,util-linux "lib") - ("wayland-protocols" ,wayland-protocols))) + (list curl + giflib + gstreamer + gst-plugins-base + ibus-minimal + mesa + libraw + (librsvg-for-system) + libspectre + libtiff + libxau + libxcomposite + libxcursor + libxdamage + libxdmcp + libxext + libxi + libxfixes + libxinerama + libxrandr + libxrender + libxscrnsaver + libxtst + libwebp + openjpeg + poppler + `(,util-linux "lib") + wayland-protocols)) (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. - `(("dbus" ,dbus) - ("elogind" ,elogind) - ("eudev" ,eudev) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("fribidi" ,fribidi) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg-turbo) - ("libsndfile" ,libsndfile) - ("libpng" ,libpng) - ("libunwind" ,libunwind) - ("libx11" ,libx11) - ("libxkbcommon" ,libxkbcommon) - ("luajit" ,luajit) - ("lz4" ,lz4) - ("openssl" ,openssl) - ("pulseaudio" ,pulseaudio) - ("wayland" ,wayland) - ("zlib" ,zlib))) + (list dbus + elogind + eudev + fontconfig + freetype + fribidi + glib + harfbuzz + libinput-minimal + libjpeg-turbo + libsndfile + libpng + libunwind + libx11 + libxkbcommon + luajit + lz4 + openssl + pulseaudio + wayland + zlib)) (arguments `(#:configure-flags `("-Dembedded-lz4=false" @@ -158,22 +159,17 @@ ;; have to wrap the outputs of efl's dependencies in those libraries. (add-after 'unpack 'hardcode-dynamic-libraries (lambda* (#:key inputs #:allow-other-keys) - (let ((curl (assoc-ref inputs "curl")) - (pulse (assoc-ref inputs "pulseaudio")) - (sndfile (assoc-ref inputs "libsndfile")) - (elogind (assoc-ref inputs "elogind")) - (lib "/lib/")) - (substitute* "src/lib/ecore_con/ecore_con_url_curl.c" - (("libcurl.so.?" libcurl) ; libcurl.so.[45] - (string-append curl lib libcurl))) - (substitute* "src/lib/ecore_audio/ecore_audio.c" - (("libpulse.so.0" libpulse) - (string-append pulse lib libpulse)) - (("libsndfile.so.1" libsnd) - (string-append sndfile lib libsnd))) - (substitute* "src/lib/elput/elput_logind.c" - (("libelogind.so.0" libelogind) - (string-append elogind "/lib/" libelogind)))))) + (substitute* "src/lib/ecore_con/ecore_con_url_curl.c" + (("libcurl.so.4") + (search-input-file inputs "lib/libcurl.so.4"))) + (substitute* "src/lib/ecore_audio/ecore_audio.c" + (("libpulse.so.0") + (search-input-file inputs "lib/libpulse.so.0")) + (("libsndfile.so.1") + (search-input-file inputs "lib/libsndfile.so.1"))) + (substitute* "src/lib/elput/elput_logind.c" + (("libelogind.so.0") + (search-input-file inputs "lib/libelogind.so.0"))))) (add-after 'unpack 'fix-install-paths (lambda _ (substitute* "dbus-services/meson.build" -- cgit 1.4.1 From 532dace22d2f1312a53ca91efffdee72e4f3a737 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Tue, 7 Feb 2023 16:08:49 +0100 Subject: gnu: Add bitmapperbs. * gnu/packages/bioinformatics.scm (bitmapperbs): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ef1e7ae988..055c8ca47b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -512,6 +512,63 @@ BED, GFF/GTF, VCF.") (inputs (list samtools zlib)))) +(define-public bitmapperbs + (package + (name "bitmapperbs") + (version "1.0.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chhylp123/BitMapperBS/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02ksssfnvmpskld0a2016smfz5nrzm3d90v8974f3cpzywckvp8v")) + (modules '((guix build utils))) + ;; This package bundles a modified copy of htslib, so we cannot + ;; unbundle it. + (snippet + '(begin + (delete-file-recursively "libdivsufsort-2.0.1") + (delete-file-recursively "pSAscan-0.1.0"))))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #false + #:make-flags '(list "bitmapperBS") + ;; The build system checks for CPU features. For this reason, we want + ;; users to build it locally instead of using substitutes. + #:substitutable? #false + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build-system + (lambda _ + (substitute* "Makefile" + (("make prefix=../htslib_aim install") + (string-append "make prefix=" #$output " install-so")) + (("htslib_aim/include") "htslib") + (("htslib_aim/lib") + (string-append #$output "/lib"))))) + (add-after 'unpack 'patch-references-to-psascan + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("\"(./)?psascan" pre all) + (string-append "\"" pre (search-input-file inputs "/bin/psascan")))))) + (delete 'configure) + (replace 'install + (lambda _ + (install-file "bitmapperBS" + (string-append #$output "/bin/"))))))) + (inputs + (list libdivsufsort psascan zlib)) + (home-page "https://github.com/chhylp123/BitMapperBS/") + (synopsis "Read aligner for whole-genome bisulfite sequencing") + (description + "BitMapperBS is memory-efficient aligner that is designed for +whole-genome bisulfite sequencing (WGBS) reads from directional protocol.") + (license license:asl2.0))) + (define-public cellsnp-lite ;; Last release is from November 2021 and does not contain fixes. (let ((commit "0885d746b0b1ea65c8ef92f8943ca7669ca9734a") -- cgit 1.4.1 From e03c7c32edb957ee36614755a37cbc5c270a2297 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:40:42 +0100 Subject: gnu: bristol: Remove trailing #T. * gnu/packages/music.scm (bristol)[arguments]: Drop trailing #T from build phases. --- gnu/packages/music.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 87100c698d..d870e4016a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2612,22 +2612,19 @@ Laurens Hammond and Don Leslie.") (when (not (or (string-prefix? "x86_64" system) (string-prefix? "i686" system))) (substitute* "bristol/Makefile.in" - (("-msse -mfpmath=sse") ""))) - #t)) + (("-msse -mfpmath=sse") ""))))) ;; alsa-lib 1.1.x no longer provides iatomic.h. That's okay because ;; bristol actually doesn't use it. (add-after 'unpack 'do-not-use-alsa-iatomic (lambda _ (substitute* "libbristolaudio/audioEngineJack.c" - (("#include ") "")) - #t)) + (("#include ") "")))) ;; We know that Bristol has been linked with JACK and we don't have ;; ldd, so we can just skip this check. (add-after 'unpack 'do-not-grep-for-jack (lambda _ (substitute* "bin/startBristol.in" - (("ldd `which bristol` | grep jack") "echo guix")) - #t))))) + (("ldd `which bristol` | grep jack") "echo guix"))))))) (inputs (list alsa-lib jack-1 liblo libx11)) (native-inputs -- cgit 1.4.1 From 6f66df9153d5df11a12efcf6dafcb3ef40492da8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:47:48 +0100 Subject: gnu: bristol: Pass -fcommon. * gnu/packages/music.scm (bristol)[arguments]: Add build phase 'add-fcommon. --- gnu/packages/music.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d870e4016a..ec500a2d17 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2613,6 +2613,10 @@ Laurens Hammond and Don Leslie.") (string-prefix? "i686" system))) (substitute* "bristol/Makefile.in" (("-msse -mfpmath=sse") ""))))) + ;; This is needed to build brighton + (add-after 'unpack 'add-fcommon + (lambda _ + (setenv "CFLAGS" "-fcommon"))) ;; alsa-lib 1.1.x no longer provides iatomic.h. That's okay because ;; bristol actually doesn't use it. (add-after 'unpack 'do-not-use-alsa-iatomic -- cgit 1.4.1 From ea9edbc5254815618501103cbf6ef6f51190b6ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:48:22 +0100 Subject: gnu: bristol: Use JACK 2. * gnu/packages/music.scm (bristol)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ec500a2d17..ae51aa119a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2630,7 +2630,7 @@ Laurens Hammond and Don Leslie.") (substitute* "bin/startBristol.in" (("ldd `which bristol` | grep jack") "echo guix"))))))) (inputs - (list alsa-lib jack-1 liblo libx11)) + (list alsa-lib jack-2 liblo libx11)) (native-inputs (list pkg-config)) (home-page "http://bristol.sourceforge.net/") -- cgit 1.4.1 From 8224c7bef86618a120045ffb0efa4a6db9e199c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:50:47 +0100 Subject: gnu: jack-select: Drop input labels. * gnu/packages/music.scm (jack-select)[inputs]: Drop labels. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ae51aa119a..ba08200155 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3308,12 +3308,12 @@ can connect to any JACK port and record the output into a stereo WAV file.") (native-inputs (list pkg-config)) (inputs - `(("alsa-lib" ,alsa-lib) - ("python" ,python-wrapper) - ("python-pyudev" ,python-pyudev) - ("python-pyxdg" ,python-pyxdg) - ("python-dbus" ,python-dbus) - ("python-pygobject" ,python-pygobject))) + (list alsa-lib + python-dbus + python-pygobject + python-pyudev + python-pyxdg + python-wrapper)) (home-page "https://github.com/SpotlightKid/jack-select") (synopsis "Systray application to quickly change the JACK-DBus configuration") (description "This application displays an icon in the system tray (also -- cgit 1.4.1 From 9f78f3d1504a79b2f087f64d14fd149d784c0cdb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:51:05 +0100 Subject: gnu: jack-keyboard: Use JACK 2. * gnu/packages/music.scm (jack-keyboard)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ba08200155..ce89e56643 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3226,7 +3226,7 @@ on the library.") (string-append "-DGTK2_ADDITIONAL_SUFFIXES=" "lib/glib-2.0;" ;for glibconfig.h "lib/gtk-2.0")))) ;for gdkconfig.h - (inputs (list jack-1 gtk+-2)) + (inputs (list jack-2 gtk+-2)) (home-page "https://jack-keyboard.sourceforge.net/") (synopsis "Virtual MIDI keyboard") (description "Jack-keyboard is a virtual MIDI keyboard, a program that -- cgit 1.4.1 From b46f0b7419797bc160207593b0be798c9bd7d3ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:51:29 +0100 Subject: gnu: jack-capture: Use JACK 2. * gnu/packages/music.scm (jack-capture)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ce89e56643..1d137ed260 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3258,7 +3258,7 @@ allows you to send JACK MIDI events (i.e. play) using your PC keyboard.") (list pkg-config which)) (inputs (list gtk+-2 - jack-1 + jack-2 libogg liblo lame -- cgit 1.4.1 From a3c6998dba35cc7dfd857fb179659a14b0a1e583 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:53:26 +0100 Subject: gnu: seq24: Use JACK 2. * gnu/packages/music.scm (seq24)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1d137ed260..b2219da4b3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4632,7 +4632,7 @@ defined as tabs in the main control surface.") "12dphdhnvfk1k0vmagi1v2lhyxjyj1j3cz6ksjw0ydcvid1x8ap2")) (patches (search-patches "seq24-rename-mutex.patch")))) (build-system gnu-build-system) - (inputs (list gtkmm-2 alsa-lib jack-1)) + (inputs (list alsa-lib gtkmm-2 jack-2)) (native-inputs (list pkg-config)) (home-page "https://launchpad.net/seq24/") (synopsis "Real-time MIDI sequencer") -- cgit 1.4.1 From 8582e68499d643cb31664143fa567e908d320c10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:53:58 +0100 Subject: gnu: milkytracker: Drop input labels. * gnu/packages/music.scm (milkytracker)[inputs]: Drop labels. --- gnu/packages/music.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b2219da4b3..db8b910fea 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4021,13 +4021,13 @@ using the beets FetchArt plugin.") ;; This flag ensures that MilkyTracker links with the JACK library. #:configure-flags '("-DCMAKE_CXX_FLAGS=-ljack"))) (inputs - `(("alsa-lib" ,alsa-lib) - ("lhasa" ,lhasa) - ("jack" ,jack-1) - ("rtmidi" ,rtmidi-4.0) - ("sdl" ,sdl2) - ("zlib" ,zlib) - ("zziplib" ,zziplib))) + (list alsa-lib + lhasa + jack-1 + rtmidi-4.0 + sdl2 + zlib + zziplib)) (native-inputs (list pkg-config)) (synopsis "Music tracker for working with .MOD/.XM module files") -- cgit 1.4.1 From dcb0c379f647cfcc65203f3fdf5ca0f25e91fe44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:54:22 +0100 Subject: gnu: milkytracker: Drop trailing #T from snippet. * gnu/packages/music.scm (milkytracker)[source]: Drop trailing #T. --- gnu/packages/music.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index db8b910fea..1a6e96d3d8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4013,8 +4013,7 @@ using the beets FetchArt plugin.") '(begin (delete-file-recursively "resources/music") (substitute* "CMakeLists.txt" - (("add_subdirectory\\(resources/music\\)") "")) - #t)))) + (("add_subdirectory\\(resources/music\\)") "")))))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 39c7131e8ec3ae78e2fb3c5db517b45035152280 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:54:46 +0100 Subject: gnu: milkytracker: Reformat description. * gnu/packages/music.scm (milkytracker)[description]: Reformat. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1a6e96d3d8..41d9b22088 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4030,10 +4030,10 @@ using the beets FetchArt plugin.") (native-inputs (list pkg-config)) (synopsis "Music tracker for working with .MOD/.XM module files") - (description "MilkyTracker is a music application for creating .MOD and .XM - module files. It attempts to recreate the module replay and user experience of - the popular DOS program Fasttracker II, with special playback modes available - for improved Amiga ProTracker 2/3 compatibility.") + (description "MilkyTracker is a music application for creating .MOD and +.XM module files. It attempts to recreate the module replay and user +experience of the popular DOS program Fasttracker II, with special playback +modes available for improved Amiga ProTracker 2/3 compatibility.") (home-page "https://milkytracker.titandemo.org/") ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later. (license (list license:bsd-3 license:gpl3+)))) -- cgit 1.4.1 From cb1ebc91fb98de2f4130d78800565c6b8ca216ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 19:58:48 +0100 Subject: gnu: milkytracker: Use JACK 2. * gnu/packages/music.scm (milkytracker)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41d9b22088..e99bee9cc7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4022,7 +4022,7 @@ using the beets FetchArt plugin.") (inputs (list alsa-lib lhasa - jack-1 + jack-2 rtmidi-4.0 sdl2 zlib -- cgit 1.4.1 From 09c6de44127f886ed91738ba9d5b8cce3102bcb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 7 Feb 2023 20:00:35 +0100 Subject: gnu: rtmidi: Use JACK 2. * gnu/packages/audio.scm (rtmidi)[inputs]: Replace jack-1 with jack-2. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a60bb85b67..e443934e51 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3603,7 +3603,7 @@ tempo and pitch of an audio recording independently of one another.") "1ff2yfq3k4l209fr71v3w98fpjjv1chs09vkbmxj03lcikahxns8")))) (build-system gnu-build-system) (inputs - (list jack-1 alsa-lib)) + (list alsa-lib jack-2)) (native-inputs (list autoconf automake libtool pkg-config)) (home-page "https://www.music.mcgill.ca/~gary/rtmidi") -- cgit 1.4.1 From ccf742f120452acf587d16e40adea570d15169c4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Feb 2023 23:02:00 +0100 Subject: gnu: emacs-inspector: Update to 0.19. * gnu/packages/emacs-xyz.scm (emacs-inspector): Update to 0.19. [arguments]<#:phases>: Remove unnecessary phases. [native-inputs]: Remove EMACS-ERT-RUNNER. --- gnu/packages/emacs-xyz.scm | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1efbaaa538..bbaafcc730 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -562,10 +562,10 @@ configuration language which makes it trivial to write your own themes.") (license license:gpl3+)))) (define-public emacs-inspector - (let ((commit "32f752c5cd996991c4dba67733cfb4e4159c2e75")) ;version bump + (let ((commit "0766ce48dfbf193df73a1fd343a84a9d41ded8ba")) ;version bump (package (name "emacs-inspector") - (version "0.16") + (version "0.19") (source (origin (uri (git-reference @@ -573,7 +573,7 @@ configuration language which makes it trivial to write your own themes.") (commit commit))) (method git-fetch) (sha256 - (base32 "1zsj24f0qjdy8vxwbn8kc9xy0ffwfc54dyy3dya8j59rlqx5nmdh")) + (base32 "0wi8j3r5lz9ww54jdjb6dv4f2rgjv41v8cb5k652skpxllr4cfwy")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -583,26 +583,7 @@ configuration language which makes it trivial to write your own themes.") "-L" "." "-l" "inspector-tests.el" "-l" "tree-inspector-tests.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'preserve-emacs-28-compatibility - ;; XXX: `cl-constantly' function is defined in "cl-lib" starting - ;; from Emacs 29+. For now, replace it with its definition. - ;; Also, the variables `pp-max-width' and `pp-use-max-width' are - ;; from Emacs 29+. Replace them with their default value. - (lambda _ - (substitute* "tree-inspector.el" - (("cl-constantly") "lambda (_)")) - (substitute* "inspector.el" - (("(defcustom inspector-.*? )pp(-use)?-max-width" _ lead flag) - (string-append lead (if flag "nil" "t")))))) - (add-before 'check 'skip-failing-test - (lambda _ - (substitute* "tree-inspector-tests.el" - (("\\(ert-deftest inspector-tests--inspect-struct-test.*" all) - (string-append all " (skip-unless nil)")))))))) - (native-inputs (list emacs-ert-runner)) + "-f" "ert-run-tests-batch-and-exit"))) (propagated-inputs (list emacs-treeview)) (home-page "https://github.com/mmontone/emacs-inspector") (synopsis "Inspection tool for Emacs Lisp objects") -- cgit 1.4.1 From 99c1c7a30c59c3514a4ced6e0cad0e5c2860331d Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Wed, 8 Feb 2023 09:40:05 +0800 Subject: gnu: lxqt-admin: Fix path for timezone file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-admin)[arguments]: Update hardcoded path for zone.tab to point to tzdata reference. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index dde87382e8..5b39f0e9f4 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -39,6 +39,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages compton) @@ -320,7 +321,8 @@ LXQt and the system it's running on.") libqtxdg polkit-qt qtsvg-5 - qtx11extras)) + qtx11extras + tzdata)) (native-inputs (list lxqt-build-tools qttools-5)) (arguments @@ -328,12 +330,14 @@ LXQt and the system it's running on.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("lxqt-admin-user/CMakeLists.txt" "lxqt-admin-time/CMakeLists.txt") (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION \"share/polkit-1/actions")) - #t))))) + (substitute* '("lxqt-admin-time/timeadmindialog.cpp") + (("/usr/share/zoneinfo/zone.tab") + (search-input-file inputs "share/zoneinfo/zone.tab")))))))) (home-page "https://lxqt-project.org") (synopsis "LXQt system administration tool") (description "lxqt-admin is providing two GUI tools to adjust settings of -- cgit 1.4.1 From 6598e4c56bb94c5032245e54d4f8aeee7fc94f31 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 13:30:02 +0200 Subject: gnu: openbios-qemu-ppc: Fix building on aarch64-linux. * gnu/packages/firmware.scm (openbios-qemu-ppc)[arguments]: When building from aarch64-linux build for armhf-linux. --- gnu/packages/firmware.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 029e84d5c2..fea7d37923 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2017 David Craven -;;; Copyright © 2017, 2018, 2022 Efraim Flashner +;;; Copyright © 2017, 2018, 2022, 2023 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Mathieu Othacehe @@ -414,6 +414,11 @@ provide OpenFirmware functionality on top of an already running system.") (inherit base) (arguments (substitute-keyword-arguments (package-arguments base) + ((#:system system (%current-system)) + (if (string-prefix? "aarch64-linux" (or (%current-system) + (%current-target-system))) + "armhf-linux" + system)) ((#:phases phases) #~(modify-phases #$phases (add-after 'install 'rename-executable -- cgit 1.4.1 From b84a6cd08c7b41653601de0e9d8359e7db76c24c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 13:31:18 +0200 Subject: gnu: openbios-qemu-ppc: Don't build for a specific target. * gnu/packages/firmware.scm (openbios-qemu-ppc)[arguments]: Set target to #f since we're producing a firmware file and not a binary. --- gnu/packages/firmware.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index fea7d37923..080aaed55b 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -419,6 +419,8 @@ provide OpenFirmware functionality on top of an already running system.") (%current-target-system))) "armhf-linux" system)) + ;; No need to cross-compile, package produces reproducible firmware. + ((#:target _ #f) #f) ((#:phases phases) #~(modify-phases #$phases (add-after 'install 'rename-executable -- cgit 1.4.1 From 03ce4e2c13f13c8cb59e30fae995d7d95919dded Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 14:16:11 +0200 Subject: gnu: seabios: Don't build for a specific target. * gnu/packages/firmware.scm (seabios)[arguments]: Set target to #f since we're producing a firmware file. --- gnu/packages/firmware.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 080aaed55b..fa99306abc 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -534,6 +534,7 @@ executing in M-mode.") (arguments (list #:tests? #f ;no tests + #:target #f ; Package produces firmware. #:make-flags ;; If EXTRAVERSION is not set the build system will embed the current ;; date in binaries. Use this opportunity to personalize as recommended -- cgit 1.4.1 From cc588fb854ec5fb3ed6ae3bbcdaa5adfd3ed85a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 14:17:55 +0200 Subject: gnu: sgabios: Don't build for a specific target. * gnu/packages/firmware.scm (sgabios)[arguments]: Set target to #f since we're building a firmware file. --- gnu/packages/firmware.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index fa99306abc..23975c72e8 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -706,6 +706,7 @@ coreboot.") "HOSTCC=gcc") #:parallel-build? #f #:tests? #f ;no tests + #:target #f ; Package produces firmware. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'build-reproducibly -- cgit 1.4.1 From 9695f7674549975ef309eec29d7aaba4dc6826e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 15:40:53 +0200 Subject: gnu: julia-latexstrings: Update to 1.3.0. * gnu/packages/julia-xyz.scm (julia-latexstrings): Update to 1.3.0. --- gnu/packages/julia-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b831b41db2..30e9e4c0c4 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2021, 2022 Simon Tournier -;;; Copyright © 2021, 2022 Efraim Flashner +;;; Copyright © 2021-2023 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 jgart ;;; @@ -3439,7 +3439,7 @@ fixes. The Julia IDE effort is pointed to extension for VSCode.") (define-public julia-latexstrings (package (name "julia-latexstrings") - (version "1.2.1") + (version "1.3.0") (source (origin (method git-fetch) @@ -3448,7 +3448,7 @@ fixes. The Julia IDE effort is pointed to extension for VSCode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "117z27krcf8fydgp6mb0pgn75r4gng9qs7v90qb4bqzsry3faadp")))) + (base32 "0iijp96ca9mqg5skr6ps7q0lvqaa374lr2zkbbia5q6qgpq0j5ww")))) (build-system julia-build-system) (native-inputs (list julia-documenter)) -- cgit 1.4.1 From e16158ddd0744fce7c82c28ee9c79ffe0fc6d8b0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 17:33:07 +0200 Subject: gnu: go-1.16: Remove redundant native-input substitution. * gnu/packages/golang.scm (go-1.16)[native-inputs]: More directly inherit from go-1.14. --- gnu/packages/golang.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 62766d8dd2..cf15b81fe7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -626,9 +626,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (("^#!.*") "#!/usr/bin/env perl\n")))))))) (native-inputs `(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) - ,@(if (not (member (%current-system) (package-supported-systems go-1.4))) - (alist-replace "go" (list gccgo-10) (package-native-inputs go-1.14)) - (package-native-inputs go-1.14)))))) + ,@(package-native-inputs go-1.14))))) (define-public go-1.17 (package -- cgit 1.4.1 From 213073ee26799b9759159583b6a1a6cc75796a77 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 17:35:30 +0200 Subject: gnu: julia-quadgk: Update to 2.5.0. * gnu/packages/julia-xyz.scm (julia-quadgk): Update to 2.5.0. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 30e9e4c0c4..6791678ab1 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -4591,7 +4591,7 @@ Julia with little or no overhead (arrays are passed without making a copy).") (define-public julia-quadgk (package (name "julia-quadgk") - (version "2.4.1") + (version "2.5.0") (source (origin (method git-fetch) @@ -4600,7 +4600,7 @@ Julia with little or no overhead (arrays are passed without making a copy).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hy0629yai6xflgxaflk9764lzr1lzhlghimxk1aqi212q9c6n33")))) + (base32 "0f14dhn0f7ln2j96qvmnsyy9ffzqsngd16ikc136snlxv4k4whiv")))) (build-system julia-build-system) (propagated-inputs (list julia-datastructures)) -- cgit 1.4.1 From 1745c01b49f99c7aec329aa8ad92f0e58dfad4e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 17:36:13 +0200 Subject: gnu: julia-measurements: Update to 2.8.0. * gnu/packages/julia-xyz.scm (julia-measurements): Update to 2.8.0. [native-inputs]: Add julia-aqua. --- gnu/packages/julia-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 6791678ab1..ebd8a189d1 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3716,7 +3716,7 @@ TLS} and cryptography C library for Julia.") (define-public julia-measurements (package (name "julia-measurements") - (version "2.6.0") + (version "2.8.0") (source (origin (method git-fetch) @@ -3725,14 +3725,15 @@ TLS} and cryptography C library for Julia.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05p3f0gr4sv4maq8cix5fi8ldq0zagswqsd43xn6fhy046f936mz")))) + (base32 "1rn7qaf2s3l7awm8q5fjxlp1503g9mjgmsnvrbhjjvwyyn1k705r")))) (build-system julia-build-system) (propagated-inputs (list julia-calculus julia-recipesbase julia-requires)) (native-inputs - (list julia-quadgk + (list julia-aqua + julia-quadgk julia-specialfunctions julia-unitful)) (home-page "https://juliaphysics.github.io/Measurements.jl/stable/") -- cgit 1.4.1 From ef5229fcae11df99cc7e630a22d261cdfeee90e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 17:36:54 +0200 Subject: gnu: julia-optim: Update to 1.7.4. * gnu/packages/julia-xyz.scm (julia-optim): Update to 1.7.4. [arguments]: Update 'adjust-tests phase. --- gnu/packages/julia-xyz.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ebd8a189d1..2e334235a3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -4078,7 +4078,7 @@ doesn't provide any other \"high-level\" functionality like layers or AD.") (define-public julia-optim (package (name "julia-optim") - (version "1.6.0") + (version "1.7.4") (source (origin (method git-fetch) @@ -4087,7 +4087,7 @@ doesn't provide any other \"high-level\" functionality like layers or AD.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nvl3xp9c6r80y9n7fic4zyq2443apfmbcpnx0wvgkv4vsy08x5j")))) + (base32 "0pdwa2xm08c3g979qgsmcr343j4kkh4l6x5rdj1blhqh5gw8172b")))) (build-system julia-build-system) (arguments (list @@ -4095,9 +4095,14 @@ doesn't provide any other \"high-level\" functionality like layers or AD.") #~(modify-phases %standard-phases (add-after 'unpack 'adjust-tests (lambda _ - ;; TODO: Figure out why this test fails. (substitute* "test/runtests.jl" - ((".*l_bfgs.*") ""))))))) + ;; Distributions.jl isn't packaged yet. + ((".*newton_trust_region.*") "")) + (substitute* + "test/multivariate/solvers/constrained/ipnewton/constraints.jl" + ;; TODO: Figure out why this test fails. + (("@test Optim\\.converged") "@test_skip Optim.converged") + (("@test Optim\\.minimum") "@test_skip Optim.minimum"))))))) (propagated-inputs (list julia-compat julia-fillarrays -- cgit 1.4.1 From 1973ddbb6c6255c67e256efbaeaccd1dc4587102 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 30 Jan 2023 12:12:09 +0100 Subject: gnu: Add julia-cfitsio-jll. * gnu/packages/julia-jll.scm (julia-cfitsio-jll): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-jll.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2b0f644736..1aab2f78ce 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Jean-Baptiste Volatier +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix utils) #:use-module (guix build-system julia) #:use-module (gnu packages) + #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages compression) @@ -146,6 +148,48 @@ compression program.") (description "This package provides a wrapper for the cairo library.") (license license:expat))) +(define-public julia-cfitsio-jll + (package + (name "julia-cfitsio-jll") + (version "4.0.0+0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/CFITSIO_jll.jl") + (commit (string-append "CFITSIO-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k0mqmpyfjr3ibcmda08llw8m166zw0n3lh5y5aj81q37lrxw990")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; no runtests + #:phases + (modify-phases %standard-phases + (add-after 'link-depot 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + ;; We're not downloading and unpacking cfitsio. + (("using LibCURL_jll") "") + (("using Zlib_jll") "") + (("generate_init_header.*") "generate_init_header()\n" ) + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"CFITSIO\", \"" + (assoc-ref inputs "cfitsio") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (inputs + (list cfitsio)) + (propagated-inputs + (list julia-jllwrappers)) + (home-page "https://github.com/JuliaBinaryWrappers/CFITSIO_jll.jl") + (synopsis "CFITSIO library wrappers") + (description "This package provides a wrapper for the cfitsio library.") + (license license:expat))) + (define-public julia-compilersupportlibraries-jll (package (name "julia-compilersupportlibraries-jll") -- cgit 1.4.1 From 96d33bfb354c7c4c957a665a1feae08e45d756de Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 30 Jan 2023 12:12:10 +0100 Subject: gnu: Add julia-cfitsio. * gnu/packages/julia-xyz.scm (julia-cfitsio): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 2e334235a3..02f270b35e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021-2023 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 jgart +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -746,6 +747,36 @@ variables, both with unordered (nominal variables) and ordered categories (description "This package provides a C-compatible enum for Julia.") (license license:expat))) +(define-public julia-cfitsio + (package + (name "julia-cfitsio") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaAstro/CFITSIO.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05bxzzjcc021p3hi092h06r2q7qnvql0xz1alggi83i0pp1mxp6d")))) + (build-system julia-build-system) + (native-inputs (list julia-aqua)) + (propagated-inputs (list julia-cfitsio-jll)) + (home-page "https://github.com/JuliaAstro/CFITSIO.jl") + (synopsis "C-style interface to the libcfitsio library") + (description "This package provides Julia implementation of C-style +interface to CFITSIO functions with following features: +@itemize +@item Function names closely mirror the C interface (e.g., +@code{fits_open_file()}). +@item Functions operate on @code{FITSFile}, a thin wrapper for fitsfile C +struct (@code{FITSFile} has concept of \"current HDU\", as in CFITSIO). +@item Wrapper functions do check the return status from CFITSIO and throw an +error with the appropriate message. +@end itemize") + (license license:expat))) + (define-public julia-chainrules (package (name "julia-chainrules") -- cgit 1.4.1 From 0fb287d2635a950a7954f2032cc46c26b32be881 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 30 Jan 2023 12:12:11 +0100 Subject: gnu: Add julia-fitsio. * gnu/packages/julia-xyz.scm (julia-fitsio): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 02f270b35e..1594655179 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -2128,6 +2128,31 @@ types and sparsity.") using finite difference.") (license license:expat))) +(define-public julia-fitsio + (package + (name "julia-fitsio") + (version "0.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaAstro/FITSIO.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10w7cdb2cvcwpkcfdz2fwl4ji5rfdv8w9msc9gfd8d34k58bk8c5")))) + (build-system julia-build-system) + (native-inputs + (list julia-aqua julia-orderedcollections)) + (propagated-inputs + (list julia-cfitsio julia-reexport julia-tables)) + (home-page "https://github.com/JuliaAstro/CFITSIO.jl") + (synopsis "Astronomical FITS file support for Julia") + (description "This package provides Julia implementation for reading and +writing @acronym{FITS, Flexible Image Transport System} files, based on the +@code{cfitsio} library.") + (license license:expat))) + (define-public julia-fixedpointnumbers (let ((commit "59ee94b93f2f1ee75544ef44187fc0e440cd8015") (revision "1")) -- cgit 1.4.1 From a545d0adbbba7df2d328c3b7f1d5b327a07c9232 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Feb 2023 19:28:20 +0200 Subject: gnu: julia-crayons: Update to 4.1.1. * gnu/packages/julia-xyz.scm (julia-crayons): Update to 4.1.1. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 1594655179..b6da796b59 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1233,7 +1233,7 @@ as SLAM (simultaneous localization and mapping).") (define-public julia-crayons (package (name "julia-crayons") - (version "4.0.4") + (version "4.1.1") (source (origin (method git-fetch) @@ -1242,7 +1242,7 @@ as SLAM (simultaneous localization and mapping).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v3zhjlnb2914bxcj4myl8pgb7m31p77aj2k1bckmqs96jdph10z")))) + (base32 "0vfbb02pclwlbpcl7rhr98a495kga5wydf5wz1gp1xn1wxgpgxpd")))) (build-system julia-build-system) (home-page "https://github.com/KristofferC/Crayons.jl") (synopsis "Colored and styled strings for terminals") -- cgit 1.4.1 From e5a381d0ca565915cad066ef992d0aa38e887082 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Feb 2023 12:19:08 +0200 Subject: gnu: rust-vte-0.3: Remove precompiled binary from source. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crates-io.scm (rust-vte-0.3)[source]: Add snippet to remove two bundled binaries. Reported-by: Andrius Štikonas --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1203d10b67..bae25a7136 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov -;;; Copyright © 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2019-2023 Efraim Flashner ;;; Copyright © 2019-2023 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice @@ -65649,7 +65649,11 @@ hardware registers.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg")))) + "1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg")) + (snippet + '(begin + (delete-file "vim10m_match") + (delete-file "vim10m_table"))))) (arguments `(#:tests? #f ; tests not included in release #:cargo-inputs -- cgit 1.4.1 From b6e7fe40e5d975540c4170d059fdd5e1425ac616 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 23:02:17 -0500 Subject: gnu: qtbase: Do not capture cmake-minimal. * gnu/packages/qt.scm (qtbase) [phases]: Add a substitution to the patch-more-paths phase. --- gnu/packages/qt.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7a1d60a2e5..91983d5a4f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -680,7 +680,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files "bin" "\\.in$") (("/bin/pwd") - (search-input-file inputs "bin/pwd"))) + (search-input-file inputs "bin/pwd")) + ;; Do not keep a reference to cmake-minimal; it is looked + ;; from PATH anyway. + (("original_cmake_path=\"@CMAKE_COMMAND@\"") + "original_cmake_path=\"\"")) (substitute* "src/gui/platform/unix/qgenericunixservices.cpp" (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) -- cgit 1.4.1 From 4012ec027621d9d530cd4f6e88d591b3c6a6163e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 08:46:50 -0500 Subject: gnu: qtbase: Do not capture Python from native-inputs. * gnu/packages/qt.scm (qtbase) [phases]: Add do-not-capture-python phase. --- gnu/packages/qt.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 91983d5a4f..3115bb2606 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -695,6 +695,12 @@ developers using C++ or QML, a CSS & JavaScript like language.") (substitute* "src/corelib/CMakeLists.txt" (("/bin/ls") (search-input-file inputs "bin/ls"))))) + (add-after 'patch-source-shebangs 'do-not-capture-python + (lambda _ + (substitute* '("mkspecs/features/uikit/devices.py" + "util/testrunner/qt-testrunner.py") + (((which "python3")) + "/usr/bin/env python3")))) (replace 'configure (assoc-ref %standard-phases 'configure)) (replace 'build -- cgit 1.4.1 From 2c53c2bb6a95e6e51cde451515c4b5f8d1f0f1a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 23:58:27 -0500 Subject: gnu: qtdeclarative: Skip tst_qqmlprofilerservice test. * gnu/packages/qt.scm (qtdeclarative) [phases]: Mark the tst_qqmlprofilerservice test as skipped in the check phase. --- gnu/packages/qt.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3115bb2606..54688a63bb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1287,6 +1287,10 @@ with JavaScript and C++."))) ;; qrc). Import paths used: ;; /gnu/store/...-qtbase-6.3.1/lib/qt6/qml" "tst_qmltc_qprocess" + ;; This test is non-deterministic; may fail under high + ;; load (see: + ;; https://bugreports.qt.io/browse/QTBUG-111008). + "tst_qqmlprofilerservice" ;; These test fail when running qmlimportscanner; perhaps ;; an extra CMAKE_PREFIX_PATH location is missing to ;; correctly locate the imports. -- cgit 1.4.1 From e0d89c37355bc09f6e561917a41ddd971f205cee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 23:28:48 -0500 Subject: gnu: opendht: Do not produce static libraries. * gnu/packages/networking.scm (opendht) [configure-flags]: Add "--disable-static". --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a7d60c674..b33192d8cb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3729,7 +3729,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (guix build gnu-build-system) (guix build utils)) #:configure-flags - #~(list "--enable-tests" + #~(list "--disable-static" ;to reduce size + "--enable-tests" "--enable-proxy-server" "--enable-push-notifications" "--enable-proxy-server-identity" -- cgit 1.4.1 From 57c8ba22cf2fbab742730b3df7531f161af08fcb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 23:32:43 -0500 Subject: gnu: opendht: Add a "python" output. This reduces the size of the main output from 286.1 MiB to 216.6 MiB. * gnu/packages/networking.scm (opendht) [outputs]: Add "python". [phases]: Adjust Python prefix of the fix-python-installation-prefix phase. [inputs]: Add python, used to wrap the tools. --- gnu/packages/networking.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b33192d8cb..75ffe00b44 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3719,7 +3719,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (sha256 (base32 "1kcc9vmi4swvahq2gikflgba9xfmix80dr9wa3v6xcj1ba2fjd6s")))) - (outputs '("out" "tools" "debug")) + (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments (list @@ -3754,7 +3754,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (substitute* "python/Makefile.am" (("--root=\\$\\(DESTDIR)/") (string-append "--root=/ --single-version-externally-managed " - "--prefix=" #$output))))) + "--prefix=" #$output:python))))) (add-after 'unpack 'specify-runpath-for-python-module (lambda _ (substitute* "python/setup.py.in" @@ -3792,7 +3792,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.") gnutls jsoncpp nettle - openssl)) ;required for the DHT proxy + openssl ;required for the DHT proxy + python)) (native-inputs (list autoconf automake -- cgit 1.4.1 From d09b1805aa2ea6350c9bc96c5393fc5bd043ae37 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 16:46:49 -0500 Subject: gnu: ffmpeg-jami: Really honor custom configuration flags. Because the substitute-keyword-arguments pattern was (#:configure-flags '()) rather than (#:configure-flags _ '()), the replacement was not triggered. * gnu/packages/jami.scm (%ffmpeg-default-configure-flags): Comment that the fnnvcodec-related options are left out. (%ffmpeg-linux-x86-configure-flags): Delete variable. (ffmpeg-compose-configure-flags): Streamline and use gexps. (ffmpeg-jami) [arguments]: Fix configure-flags pattern, and adjust to use gexps. Add the "--disable-static" and "--enable-shared" flags to produce shared objects with the correct RUNPATH. --- gnu/packages/jami.scm | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e425a6547a..a98e64bb86 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -147,7 +147,9 @@ ;; from the jami/daemon/contrib/src/ffmpeg/rules.mak file. We try to keep it ;; as close to the official Jami package as possible, to provide all the ;; codecs and extra features that are expected (see: -;; https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak) +;; https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak). +;; An exception are the ffnvcodec-related switches, which is not packaged in +;; Guix and would not work with Mesa. (define %ffmpeg-default-configure-flags '("--disable-everything" "--enable-zlib" @@ -339,34 +341,12 @@ "--enable-encoder=mjpeg_vaapi" "--enable-encoder=hevc_vaapi")) -;; ffnvcodec is not supported on ARM; enable it only for the i386 and x86_64 -;; architectures. -(define %ffmpeg-linux-x86-configure-flags - '("--arch=x86" - "--enable-cuvid" - "--enable-ffnvcodec" - "--enable-nvdec" - "--enable-nvenc" - "--enable-hwaccel=h264_nvdec" - "--enable-hwaccel=hevc_nvdec" - "--enable-hwaccel=vp8_nvdec" - "--enable-hwaccel=mjpeg_nvdec" - "--enable-encoder=h264_nvenc" - "--enable-encoder=hevc_nvenc")) - -;; This procedure composes the configure flags list for ffmpeg-jami. (define (ffmpeg-compose-configure-flags) - (define (system=? s) - (string-prefix? s (%current-system))) - - `(,@%ffmpeg-default-configure-flags - ,@(if (string-contains (%current-system) "linux") - (if (or (system=? "i686") - (system=? "x86_64")) - (append %ffmpeg-linux-configure-flags - %ffmpeg-linux-x86-configure-flags) - %ffmpeg-linux-configure-flags) - '()))) + "Compose the configure flag lists of ffmpeg-jami." + #~(append '#$%ffmpeg-default-configure-flags + (if (string-contains #$(%current-system) "linux") + '#$%ffmpeg-linux-configure-flags + '()))) (define-public ffmpeg-jami (package @@ -384,8 +364,10 @@ "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) - ((#:configure-flags '()) - (ffmpeg-compose-configure-flags)) + ((#:configure-flags _ '()) + #~(cons* "--disable-static" + "--enable-shared" + #$(ffmpeg-compose-configure-flags))) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-patches -- cgit 1.4.1 From c0106ea5c9f783da0b982bbf18ae81ad8065d7b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 16:52:54 -0500 Subject: gnu: ffmpeg-jami: Add a debug output. * gnu/packages/jami.scm (ffmpeg-jami) [outputs]: New field. [configure-flags]: Add "--disable-stripping". --- gnu/packages/jami.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index a98e64bb86..b5b939c21c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -362,11 +362,13 @@ (sha256 (base32 "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) + (outputs '("out" "debug")) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) ((#:configure-flags _ '()) #~(cons* "--disable-static" "--enable-shared" + "--disable-stripping" #$(ffmpeg-compose-configure-flags))) ((#:phases phases) #~(modify-phases #$phases -- cgit 1.4.1 From aef75942fc24fdb753978848b5471c5da21f23b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 20:45:59 -0500 Subject: gnu: libjami: Move jamid daemon to a "bin" output. * gnu/packages/jami.scm (libjami) [outputs]: Add a "bin" output. [arguments]: Add a move-jamid phase. * gnu/services/telephony.scm (jami-configuration->command-line-arguments): Refer to the "bin" output of libjami. (jami-shepherd-services): Likewise. --- gnu/packages/jami.scm | 21 ++++++++++++++++++--- gnu/services/telephony.scm | 8 +++++--- 2 files changed, 23 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b5b939c21c..64a4c53c9c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -402,7 +402,7 @@ (name "libjami") (version %jami-version) (source %jami-sources) - (outputs '("out" "debug")) + (outputs '("out" "bin" "debug")) ;"bin' contains jamid (build-system gnu-build-system) (arguments (list @@ -425,7 +425,20 @@ (lambda _ (for-each delete-file (find-files (string-append #$output "/lib") - "\\.a$"))))))) + "\\.a$")))) + (add-after 'install 'move-jamid + ;; This nearly halves the size of the main output (from 1566.2 MiB + ;; to 833.6 MiB), due to not depending on dbus-c++ and its large + ;; dependencies. + (lambda* (#:key outputs #:allow-other-keys) + (let ((libexec (string-append #$output:bin "/libexec")) + (share (string-append #$output:bin "/share"))) + (mkdir-p libexec) + (rename-file (search-input-file outputs "libexec/jamid") + (string-append libexec "/jamid")) + (mkdir-p share) + (rename-file (search-input-directory outputs "share/dbus-1") + (string-append share "/dbus-1")))))))) (inputs (list alsa-lib asio @@ -461,7 +474,9 @@ Jami core functionality. Jami is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user. It supports the SIP and IAX -protocols, as well as decentralized calling using P2P-DHT.") +protocols, as well as decentralized calling using P2P-DHT. The @samp{\"bin\"} +output contains the D-Bus daemon (@command{jamid}) as well as the Jami D-Bus +service definitions.") (home-page "https://jami.net/") (license license:gpl3+))) diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index b66c7a8563..23ccb8d403 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -267,7 +267,7 @@ consistent state.")) CONFIG, a object." (match-record config (libjami dbus enable-logging? debug? auto-answer?) - `(,(file-append libjami "/libexec/jamid") + `(,#~(string-append #$libjami:bin "/libexec/jamid") "--persistent" ;stay alive after client quits ,@(if enable-logging? '() ;logs go to syslog by default @@ -524,7 +524,8 @@ argument, either a registered username or the fingerprint of the account.") #:environment-variables ;; This is so that the cx.ring.Ring service D-Bus ;; definition is found by dbus-daemon. - (list (string-append "XDG_DATA_DIRS=" #$libjami "/share")))) + (list (string-append "XDG_DATA_DIRS=" + #$libjami:bin "/share")))) (stop #~(make-kill-destructor))) (shepherd-service @@ -595,7 +596,8 @@ argument, either a registered username or the fingerprint of the account.") ;; Start the daemon. (define daemon-pid ((make-forkexec-constructor/container - '#$(jami-configuration->command-line-arguments config) + (list #$@(jami-configuration->command-line-arguments + config)) #:mappings (list (file-system-mapping (source "/dev/log") ;for syslog -- cgit 1.4.1 From 20059f92a97726b40d4d74e67463a64c98d1da0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 20:13:10 -0500 Subject: gnu: jami: Remove unused native inputs. * gnu/packages/jami.scm (jami) [native-inputs]: Remove doxygen, graphviz and gsettings-desktop-schemas. --- gnu/packages/jami.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 64a4c53c9c..92a4e55606 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -543,9 +543,6 @@ service definitions.") pkg-config python qttools - doxygen - graphviz - gsettings-desktop-schemas ;for tests vulkan-headers)) (inputs (list ffmpeg-jami -- cgit 1.4.1 From 572d01e085709586c4e95863a2302f5c8136dd44 Mon Sep 17 00:00:00 2001 From: Artyom Bologov Date: Wed, 8 Feb 2023 13:38:34 +0100 Subject: gnu: cl-webkit: Update to 3.5.7. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 3.5.7. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 21642034b5..7ece7e3e6c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4530,7 +4530,7 @@ is a library for creating graphical user interfaces.") (define-public sbcl-cl-webkit (package (name "sbcl-cl-webkit") - (version "3.5.6") + (version "3.5.7") (source (origin (method git-fetch) @@ -4540,7 +4540,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "13f6s7zwnx0nvllizij4vziph8pz28xkqzfyyis1dzz7cxksf6fy")))) + "0aqkqcs0n5wkgjx3lb513fvm7f2jw3d5daisc9mw1bmbbcqh2sba")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From d6e2b467b88d0f663a941b796b2933ed009fca3f Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Wed, 1 Feb 2023 22:39:40 -0800 Subject: gnu: wxwidgets: Remove configure option. * gnu/packages/wxwidgets.scm (wxwidgets)[arguments]: Remove webviewwebkit configure option that prevented webview option from being in build and wxconfig feature list. Remove 'use-newer-webkit' phase. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/wxwidgets.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 0183e07c31..0a93c30f26 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -120,20 +120,12 @@ "--with-sdl" "--enable-gui" "--enable-mediactrl" - "--enable-webview" - "--enable-webviewwebkit") + "--enable-webview") #:make-flags #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) #:tests? #f ;TODO #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'use-newer-webkit - (lambda _ - ;; XXX: The configure script tests only for an ancient - ;; WebKitGTK version. - (substitute* "configure" - (("webkit2gtk-4\\.0") - "webkit2gtk-4.1")))) (add-after 'unpack 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) (let ((catch (search-input-file inputs "include/catch.hpp")) -- cgit 1.4.1 From 417269da945b5d203f6ea87cfc86fdd7397d167b Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Wed, 1 Feb 2023 22:39:56 -0800 Subject: gnu: wxmaxima: Update to 22.12.0. * gnu/packages/maths.scm (wxmaxima): Update to 22.12.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/maths.scm | 57 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4640237968..321a90e651 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4551,28 +4551,27 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "22.05.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wxMaxima-developers/wxmaxima") - (commit (string-append "Version-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1va56v9dys97yln4m1z3fz3k90lpy8i3kvcq0v1cbg36689aghm5")))) + (version "22.12.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wxMaxima-developers/wxmaxima") + (commit (string-append "Version-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12bjadmy2mf7d8v4iszmzckahfcwjzaba8wpbigksh4brvhb4gj5")))) (build-system cmake-build-system) - (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs - (list wxwidgets - maxima - ;; Runtime support. - adwaita-icon-theme - gtk+ - shared-mime-info)) + (native-inputs (list gettext-minimal)) + (inputs (list bash-minimal + wxwidgets + maxima + ;; Runtime support. + adwaita-icon-theme + gtk+ + shared-mime-info)) (arguments - `(#:tests? #f ; tests fail non-deterministically + `(#:tests? #f ; tests fail non-deterministically #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-doc-path @@ -4581,8 +4580,8 @@ point numbers.") ;; documentation. Only licensing information is placed there by ;; Guix. (substitute* "src/Dirstructure.cpp" - (("/doc/wxmaxima-\\%s") "/doc/wxmaxima")) - #t)) + (("/doc/wxmaxima-\\%s") + "/doc/wxmaxima")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -4595,15 +4594,15 @@ point numbers.") (,(string-append (assoc-ref inputs "gtk+") "/share/glib-2.0/schemas"))) `("XDG_DATA_DIRS" ":" prefix - (;; Needed by gdk-pixbuf to know supported icon formats. - ,(string-append - (assoc-ref inputs "shared-mime-info") "/share") + ( ;; Needed by gdk-pixbuf to know supported icon formats. + ,(string-append (assoc-ref inputs "shared-mime-info") + "/share") ;; The default icon theme of GTK+. - ,(string-append - (assoc-ref inputs "adwaita-icon-theme") "/share")))) - #t))))) + ,(string-append (assoc-ref inputs "adwaita-icon-theme") + "/share"))))))))) (home-page "https://wxmaxima-developers.github.io/wxmaxima/") - (synopsis "Graphical user interface for the Maxima computer algebra system") + (synopsis + "Graphical user interface for the Maxima computer algebra system") (description "wxMaxima is a graphical user interface for the Maxima computer algebra system. It eases the use of Maxima by making most of its commands available -- cgit 1.4.1 From b52d12ff0419d9cc58456b0972a4e1d0a5298006 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 8 Feb 2023 15:04:44 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-37.3ba8418. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-37.3ba8418. [propagated-inputs]: Switch to guile-fibers-next. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c527ff80df..a2c4709855 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4762,8 +4762,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") license:freebsd-doc)))) ; documentation (define-public guix-data-service - (let ((commit "7b69611755ac3b9132710d83a1139b4c5606578d") - (revision "36")) + (let ((commit "3ba841865663429392f869aedcd8f1fb63f278db") + (revision "37")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4775,7 +4775,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0lmvmalgfbc6q80f8dwqikdd5kna2vl4jlmf2li206hmcq2hzh6p")))) + "0dlnak09asf4w3nb6rv57721y0hqqlymzj28zs2y45b5fnxq2fqr")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -4841,7 +4841,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") bash-minimal)) (propagated-inputs (list guix - guile-fibers-1.1 + guile-fibers-next guile-json-4 guile-email guile-prometheus -- cgit 1.4.1 From 3729172728a349e631178e8628313a956e16c7f1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 8 Feb 2023 15:06:35 +0000 Subject: gnu: nar-herder: Update to 0-15.39cf228. * gnu/packages/package-management.scm (nar-herder): Update to 0-15.39cf228. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d152442659..2c5bc34d30 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1666,8 +1666,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "8f7b2b24e36b306d543670b6a4d3310e5be2f944") - (revision "14")) + (let ((commit "39cf2280bb87a2f177b4cb8334c5eb7ad95a0d17") + (revision "15")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1678,7 +1678,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "1bgcsldrihsv357kyfcgv2brvdai03d7lrqs7sfgm7zfb75xvbl1")) + "0g94ld46cdd3qq95w4bxyp537kmjxbsmda089sgyyva6173glkml")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 535c61ccc31ff5910649225311f545e042b66c63 Mon Sep 17 00:00:00 2001 From: Simon South Date: Sun, 8 Jan 2023 13:31:27 -0500 Subject: gnu: yosys: Update source and home-page URLs. * gnu/packages/fpga.scm (yosys)[source]: Update source-repository URL. [home-page]: Update URL. Signed-off-by: Christopher Baines --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index a516e4dc7e..066c56401a 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -141,7 +141,7 @@ For synthesis, the compiler generates netlists in the desired format.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cliffordwolf/yosys") + (url "https://github.com/YosysHQ/yosys") (commit (string-append "yosys-" version)) (recursive? #t))) ; for the ‘iverilog’ submodule (sha256 @@ -223,7 +223,7 @@ For synthesis, the compiler generates netlists in the desired format.") abc)) (propagated-inputs (list z3)) ; should be in path for yosys-smtbmc - (home-page "http://www.clifford.at/yosys/") + (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") (description "Yosys synthesizes Verilog-2005.") (license license:isc))) -- cgit 1.4.1 From 8b0024f8dacd5198a952c45f5b95b09206a63992 Mon Sep 17 00:00:00 2001 From: Simon South Date: Sun, 8 Jan 2023 13:31:28 -0500 Subject: gnu: yosys: Use new package style. * gnu/packages/fpga.scm (yosys)[source]: Use gexp in snippet and don't explicitly return #t. [arguments]: Use gexps; use search-input-file to locate executables; simplify parameters to "configure" phase; don't explicitly return #t from phases. [native-inputs]: Sort alphabetically. [inputs]: Sort alphabetically. Signed-off-by: Christopher Baines --- gnu/packages/fpga.scm | 122 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 62 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 066c56401a..bee9125c12 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -150,77 +150,75 @@ For synthesis, the compiler generates netlists in the desired format.") (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Makefile" - (("ABCREV = .*") "ABCREV = default\n")) - #t)))) + #~(begin + (substitute* "Makefile" + (("ABCREV = .*") "ABCREV = default\n")))))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:make-flags (list "CC=gcc" - "CXX=g++" - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-paths - (lambda _ - (substitute* "./passes/cmds/show.cc" - (("exec xdot") (string-append "exec " (which "xdot"))) - (("dot -") (string-append (which "dot") " -")) - (("fuser") (which "fuser"))) - #t)) - (replace 'configure - (lambda* (#:key inputs (make-flags '()) #:allow-other-keys) - (apply invoke "make" "config-gcc" make-flags))) - (add-after 'configure 'prepare-abc - (lambda* (#:key inputs #:allow-other-keys) - (let* ((sourceabc (assoc-ref inputs "abc")) - (sourcebin (string-append sourceabc "/bin")) - (source (string-append sourcebin "/abc"))) - (mkdir-p "abc") - (call-with-output-file "abc/Makefile" - (lambda (port) - (format port ".PHONY: all\nall:\n\tcp -f abc abc-default\n"))) - (copy-file source "abc/abc") - (invoke "chmod" "+w" "abc/abc")))) + (list + #:test-target "test" + #:make-flags #~(list "CC=gcc" + "CXX=g++" + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "./passes/cmds/show.cc" + (("exec xdot") + (string-append "exec " (search-input-file inputs + "/bin/xdot"))) + (("dot -") + (string-append (search-input-file inputs "/bin/dot") " -")) + (("fuser") + (search-input-file inputs "/bin/fuser"))))) + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "config-gcc" make-flags))) + (add-after 'configure 'prepare-abc + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "abc") + (call-with-output-file "abc/Makefile" + (lambda (port) + (format port ".PHONY: all\nall:\n\tcp -f abc abc-default\n"))) + (copy-file (search-input-file inputs "/bin/abc") "abc/abc") + (invoke "chmod" "+w" "abc/abc"))) (add-before 'check 'fix-iverilog-references - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let* ((xinputs (or native-inputs inputs)) - (xdirname (assoc-ref xinputs "iverilog")) - (iverilog (string-append xdirname "/bin/iverilog"))) - (substitute* '("./manual/CHAPTER_StateOfTheArt/synth.sh" - "./manual/CHAPTER_StateOfTheArt/validate_tb.sh" - "./techlibs/ice40/tests/test_bram.sh" - "./techlibs/ice40/tests/test_ffs.sh" - "./techlibs/xilinx/tests/bram1.sh" - "./techlibs/xilinx/tests/bram2.sh" - "./tests/bram/run-single.sh" - "./tests/realmath/run-test.sh" - "./tests/simple/run-test.sh" - "./tests/techmap/mem_simple_4x1_runtest.sh" - "./tests/tools/autotest.sh" - "./tests/vloghtb/common.sh") - (("if ! which iverilog") "if ! true") - (("iverilog ") (string-append iverilog " ")) - (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\"" - iverilog "\""))) - #t)))))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((iverilog (search-input-file (or native-inputs inputs) + "/bin/iverilog"))) + (substitute* '("./manual/CHAPTER_StateOfTheArt/synth.sh" + "./manual/CHAPTER_StateOfTheArt/validate_tb.sh" + "./techlibs/ice40/tests/test_bram.sh" + "./techlibs/ice40/tests/test_ffs.sh" + "./techlibs/xilinx/tests/bram1.sh" + "./techlibs/xilinx/tests/bram2.sh" + "./tests/bram/run-single.sh" + "./tests/realmath/run-test.sh" + "./tests/simple/run-test.sh" + "./tests/techmap/mem_simple_4x1_runtest.sh" + "./tests/tools/autotest.sh" + "./tests/vloghtb/common.sh") + (("if ! which iverilog") "if ! true") + (("iverilog ") (string-append iverilog " ")) + (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\"" + iverilog "\""))))))))) (native-inputs - (list pkg-config - python - bison + (list bison flex gawk ; for the tests and "make" progress pretty-printing - tcl ; tclsh for the tests - iverilog)) ; for the tests + iverilog ; for the tests + pkg-config + python + tcl)) ; tclsh for the tests (inputs - (list tcl - readline - libffi + (list abc graphviz + libffi psmisc - xdot - abc)) + readline + tcl + xdot)) (propagated-inputs (list z3)) ; should be in path for yosys-smtbmc (home-page "https://yosyshq.net/yosys/") -- cgit 1.4.1 From 277fb704420396201e8fa77ace1228313521a614 Mon Sep 17 00:00:00 2001 From: Simon South Date: Sun, 8 Jan 2023 13:31:29 -0500 Subject: gnu: yosys: Use external abc. * gnu/packages/fpga.scm (yosys)[source]: Remove snippet and associated "modules" field. [arguments]: Replace "prepare-abc" phase with "use-external-abc", which configures the package's build system to use the system's "abc" executable instead of creating a duplicate; add "add-symbolic-link" phase to preserve availability of "yosys-abc" command. [inputs]: Move abc from here... [propagated-inputs]: ...to here, to ensure its availability at runtime. Signed-off-by: Christopher Baines --- gnu/packages/fpga.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index bee9125c12..7b3c522bf7 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -147,12 +147,7 @@ For synthesis, the compiler generates netlists in the desired format.") (sha256 (base32 "0lb9r055h8y1vj2z8gm4ip0v06j5mk7f9zx9gi67kkqb7g4rhjli")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - #~(begin - (substitute* "Makefile" - (("ABCREV = .*") "ABCREV = default\n")))))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments (list @@ -175,14 +170,10 @@ For synthesis, the compiler generates netlists in the desired format.") (replace 'configure (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "config-gcc" make-flags))) - (add-after 'configure 'prepare-abc - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "abc") - (call-with-output-file "abc/Makefile" - (lambda (port) - (format port ".PHONY: all\nall:\n\tcp -f abc abc-default\n"))) - (copy-file (search-input-file inputs "/bin/abc") "abc/abc") - (invoke "chmod" "+w" "abc/abc"))) + (add-after 'configure 'use-external-abc + (lambda _ + (substitute* '("./Makefile") + (("ABCEXTERNAL \\?=") "ABCEXTERNAL = abc")))) (add-before 'check 'fix-iverilog-references (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((iverilog (search-input-file (or native-inputs inputs) @@ -202,7 +193,15 @@ For synthesis, the compiler generates netlists in the desired format.") (("if ! which iverilog") "if ! true") (("iverilog ") (string-append iverilog " ")) (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\"" - iverilog "\""))))))))) + iverilog "\"")))))) + (add-after 'install 'add-symbolic-link + (lambda* (#:key inputs #:allow-other-keys) + ;; Previously this package provided a copy of the "abc" + ;; executable in its output, named "yosys-abc". Create a + ;; symbolic link so any external uses of that name continue to + ;; work. + (symlink (search-input-file inputs "/bin/abc") + (string-append #$output "/bin/yosys-abc"))))))) (native-inputs (list bison flex @@ -212,15 +211,15 @@ For synthesis, the compiler generates netlists in the desired format.") python tcl)) ; tclsh for the tests (inputs - (list abc - graphviz + (list graphviz libffi psmisc readline tcl xdot)) (propagated-inputs - (list z3)) ; should be in path for yosys-smtbmc + (list abc + z3)) ; should be in path for yosys-smtbmc (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") (description "Yosys synthesizes Verilog-2005.") -- cgit 1.4.1 From 07e74b63d4969de0b51c48edb586f0d7d8c08db7 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 4 Feb 2023 23:28:10 -0800 Subject: gnu: gpaint: Update to 0.3.4 * gnu/packages/graphics.scm (gpaint): Update to 0.3.4 [arguments]: Remove. Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7c4456d034..d9359d0b85 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2509,7 +2509,7 @@ options.") (define-public gpaint (package (name "gpaint") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (string-append "http://alpha.gnu.org/gnu/" @@ -2517,22 +2517,11 @@ options.") name "-2-" version ".tar.gz")) (sha256 (base32 - "1syh5l5fnzk7cw77iykafn73fvmnc83kg815fa8vvj0h0r30c5sl")))) + "13jv0zqbnyxjw7fa9x0yl08rrkqq0mdvki0yzbj6vqifvs393v5h")))) (build-system gnu-build-system) (inputs (list gtk+-2 libglade)) (native-inputs (list gettext-minimal `(,glib "bin") pkg-config)) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-undefined-references - (lambda _ - (substitute* "src/drawing.c" - (("GTK_STOCK_DISCARD,GTK_RESPONSE_DISCARD") - "GTK_STOCK_DISCARD,GTK_RESPONSE_NO")) - (substitute* "src/menu.c" - (("\\#include \"menu.h\"") - ""))))))) - (synopsis "Simple paint program for GNOME") (description "GNU Paint is a simple, easy-to-use paint program for the GNOME -- cgit 1.4.1 From 7432b922efa0e9b633a05bd52644ee00ebd58d9f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:45:46 +0100 Subject: gnu: linux-libre: Update to 6.1.10. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.10. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3dbec107f..332683d6ef 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.9") +(define-public linux-libre-6.1-version "6.1.10") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -491,7 +491,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"))) + (hash (base32 "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From fa2404ff1ffcf4f522c7400f3b10dad17f157378 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:46:05 +0100 Subject: gnu: linux-libre 5.15: Update to 5.15.92. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.92. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 332683d6ef..8e1b30c3d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.91") +(define-public linux-libre-5.15-version "5.15.92") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"))) + (hash (base32 "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 502fe053704cce7398dbc5abbeb14426f9477dc3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:46:22 +0100 Subject: gnu: linux-libre 5.10: Update to 5.10.167. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.167. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8e1b30c3d3..3eb429dc5f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.166") +(define-public linux-libre-5.10-version "5.10.167") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"))) + (hash (base32 "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 3b7849f258ac94f433823622b188a320cfefbd5f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:47:23 +0100 Subject: gnu: linux-libre 5.4: Update to 5.4.231. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.231. (linux-libre-5.4-pristine-source, deblob-scripts-5.4): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3eb429dc5f..f496139e26 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -529,17 +529,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.230") +(define-public linux-libre-5.4-version "5.4.231") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") - (base32 "1bgblfkcnrabnr9hpdl07qgps57h6bq4v5pjrxs798vq43db66va"))) + (base32 "19yydaws3vfiz9qilg665q3lysf1hy9pzx0414dis01ikyd27qr2"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"))) + (hash (base32 "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 64747b42269a1435f52570b706025d670f4439a0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:47:52 +0100 Subject: gnu: linux-libre 4.19: Update to 4.19.272. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.272. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f496139e26..249383e598 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -544,7 +544,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.271") +(define-public linux-libre-4.19-version "4.19.272") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -554,7 +554,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"))) + (hash (base32 "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 035339b70349735c95c482cb475454455b7bbc83 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 18:48:09 +0100 Subject: gnu: linux-libre 4.14: Update to 4.14.305. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.305. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 249383e598..639ae5b558 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -559,7 +559,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.304") +(define-public linux-libre-4.14-version "4.14.305") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -569,7 +569,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"))) + (hash (base32 "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From a8974597cc94b4c4e80b67ac8660c81362a50ae2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Feb 2023 18:42:18 +0100 Subject: gnu: libchop: Fix build and test. * gnu/packages/backup.scm (libchop)[source]: Adjust snippet to work around build error in Gnulib's . [arguments]: Remove 'skip-test' phase and add 'adjust-test' phase. --- gnu/packages/backup.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 10512cc1cd..6815b0e337 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -564,6 +564,13 @@ rsnapshot uses hard links to deduplicate identical files.") (modules '((guix build utils))) (snippet '(begin + ;; Gnulib's refers to 'gets' for the purposes of + ;; warning against its use, but 'gets' is no longer declared + ;; in glibc's . Remove that warning. + (substitute* "lib/stdio.in.h" + (("_GL_WARN_ON_USE \\(gets,.*") + "\n/* 'gets' is gone, rejoice! */\n")) + ;; Include all the libtirpc headers necessary to get the ;; definitions of 'u_int', etc. (substitute* '("src/block-server.c" @@ -572,8 +579,7 @@ rsnapshot uses hard links to deduplicate identical files.") (("#include " _ header) (string-append "#include \n" "#include \n" - "#include \n"))) - #t)))) + "#include \n"))))))) (build-system gnu-build-system) (arguments '(;; Link against libtirpc. @@ -598,12 +604,16 @@ rsnapshot uses hard links to deduplicate identical files.") (string-append (getenv "CPATH") ":" tirpc)) (setenv "CPATH" tirpc))))) - (add-before 'check 'skip-test + (add-before 'check 'adjust-test (lambda _ - ;; XXX: This test fails (1) because current GnuTLS no - ;; longer supports OpenPGP authentication, and (2) for - ;; some obscure reason. Better skip it. - (setenv "XFAIL_TESTS" "utils/block-server")))))) + ;; This test uses a weird construct to spawn + ;; 'chop-block-server' in the background. Replace it + ;; with something that actually works. + (substitute* "tests/utils/block-server" + (("chop_fail_if ! chop-block-server") + "chop-block-server") + (("'&'") + "&"))))))) (native-inputs (list guile-2.0 gperf-3.0 ;see pkg-config rpcsvc-proto)) ;for 'rpcgen' -- cgit 1.4.1 From 7ad98c571e1bd19b36b1cde7a49868b589fdb3ca Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Tue, 31 Jan 2023 11:32:29 +0100 Subject: gnu: Remove valgrind-3.20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/valgrind.scm (valgrind-3.20): Delete variable. (valgrind/interactive): Update to 3.20.0. Signed-off-by: Ludovic Courtès --- gnu/packages/valgrind.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 422e542918..bd08dffc83 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2022 Denis Carikli +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,7 +97,7 @@ also use Valgrind to build new tools.") (define-public valgrind/interactive (package/inherit valgrind - (version "3.17.0") + (version "3.20.0") (source (origin (method url-fetch) (uri (list (string-append "https://sourceware.org/pub/valgrind" @@ -105,9 +106,8 @@ also use Valgrind to build new tools.") "/valgrind-" version ".tar.bz2"))) (sha256 (base32 - "18l5jbk301j3462gipqn9bkfx44mdmwn0pwr73r40gl1irkfqfmd")) + "1ipkp6yi202pml2r0qwflysmq86dkqd8iyi1y51d6y70vcqw0dl5")) (patches (search-patches - "valgrind-enable-arm.patch" "valgrind-fix-default-debuginfo-path.patch")))) (inputs ;; GDB is needed to provide a sane default for `--db-command'. @@ -148,19 +148,3 @@ also use Valgrind to build new tools.") (string-length "/usr/lib/debug") 1)))))))))) (properties '()))) - -(define-public valgrind-3.20 - (package - (inherit valgrind/interactive) - (version "3.20.0") - (source (origin - (inherit (package-source valgrind/interactive)) - (uri (list (string-append "https://sourceware.org/pub/valgrind" - "/valgrind-" version ".tar.bz2") - (string-append "ftp://sourceware.org/pub/valgrind" - "/valgrind-" version ".tar.bz2"))) - (sha256 - (base32 - "1ipkp6yi202pml2r0qwflysmq86dkqd8iyi1y51d6y70vcqw0dl5")) - (patches (search-patches - "valgrind-fix-default-debuginfo-path.patch")))))) -- cgit 1.4.1 From 640d27c2d68cfc621c5b49a8b26aa2c15f3208ea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 20:31:11 -0500 Subject: gnu: qtdeclarative: Disable tst_qquickfolderdialogimpl test. * gnu/packages/qt.scm (qtdeclarative) [phases]: Mark the tst_qquickfolderdialogimpl test as skipped in the check phase. --- gnu/packages/qt.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 54688a63bb..da18395efc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1291,6 +1291,9 @@ with JavaScript and C++."))) ;; load (see: ;; https://bugreports.qt.io/browse/QTBUG-111008). "tst_qqmlprofilerservice" + ;; This one also causes non-determinstic failures (see: + ;; https://bugreports.qt.io/browse/QTBUG-101488). + "tst_qquickfolderdialogimpl" ;; These test fail when running qmlimportscanner; perhaps ;; an extra CMAKE_PREFIX_PATH location is missing to ;; correctly locate the imports. -- cgit 1.4.1 From 43ee3e1da226ff23849cc33f9d0903c593897c9a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2023 11:01:24 +0200 Subject: gnu: efl: Choose lua implementation based on system architecture. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Use luajit or lua based on the system's luajit support. [arguments]: Adjust configure-flags to use the correct lua. --- gnu/packages/enlightenment.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4ad8d57868..a08ad05143 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Daniel Pimentel -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann @@ -119,27 +119,31 @@ (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. - (list dbus - elogind - eudev - fontconfig - freetype - fribidi - glib - harfbuzz - libinput-minimal - libjpeg-turbo - libsndfile - libpng - libunwind - libx11 - libxkbcommon - luajit - lz4 - openssl - pulseaudio - wayland - zlib)) + (append + (list dbus + elogind + eudev + fontconfig + freetype + fribidi + glib + harfbuzz + libinput-minimal + libjpeg-turbo + libsndfile + libpng + libunwind + libx11 + libxkbcommon) + (if (member (%current-system) + (package-transitive-supported-systems luajit)) + (list luajit) + (list lua-5.2)) + (list lz4 + openssl + pulseaudio + wayland + zlib))) (arguments `(#:configure-flags `("-Dembedded-lz4=false" @@ -149,6 +153,10 @@ "-Dmount-path=/run/setuid-programs/mount" "-Dunmount-path=/run/setuid-programs/umount" "-Dnetwork-backend=connman" + ,,@(if (member (%current-system) + (package-transitive-supported-systems luajit)) + `("-Dlua-interpreter=luajit") + `("-Dlua-interpreter=lua")) ;; For Wayland. "-Dwl=true" "-Ddrm=true") -- cgit 1.4.1 From 4d35a5e2b6486e24bb74665ab6a65ca0cfd0b475 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 9 Feb 2023 09:12:34 +0100 Subject: gnu: Add python-scrublet. * gnu/packages/bioinformatics.scm (python-scrublet): New variable. --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 055c8ca47b..fdf52c5851 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3459,6 +3459,35 @@ and record oriented data modeling and the Semantic Web.") resources for bioinformatics.") (license license:bsd-3))) +(define-public python-scrublet + (package + (name "python-scrublet") + (version "0.2.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "scrublet" version)) + (sha256 + (base32 + "0fk5pwk12yz9wpvwkl6j2l2g28f3x35b9r9n5bw6f0i9f0qgd191")))) + (build-system pyproject-build-system) + (arguments '(#:tests? #false)) ;there are none + (propagated-inputs + (list python-annoy + python-cython + python-matplotlib + python-numba + python-numpy + python-pandas + python-scikit-image + python-scikit-learn + python-scipy + python-umap-learn)) + (home-page "https://github.com/swolock/scrublet") + (synopsis "Tool to indentify and remove doublets in single-cell data") + (description "This package provides a tool for identifying and removing +doublets in single-cell RNA-seq data.") + (license license:expat))) + (define-public cwltool (package (name "cwltool") -- cgit 1.4.1 From 85f37886c94b36509501cb4ba30b71e61068e74c Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Tue, 17 Jan 2023 10:19:30 -0800 Subject: gnu: rust-nix-0.26: New variable. * gnu/packages/crates-io.scm (rust-nix-0.26): New variable. (rust-nix-0.24): Inherit from above. Signed-off-by: Jelle Licht --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bae25a7136..661411b2c5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35384,17 +35384,17 @@ nitrokey crate and others using it.") nitrokey-test crate.") (license license:gpl3+))) -(define-public rust-nix-0.24 +(define-public rust-nix-0.26 (package (name "rust-nix") - (version "0.24.2") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r")))) + (base32 "155610n6bp37sqg7p0qihzi0jnvqkpqc40nyik89frbc6lfqv9a6")))) (build-system cargo-build-system) (arguments (list #:skip-build? #t @@ -35402,7 +35402,7 @@ nitrokey-test crate.") `(("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))) + ("rust-memoffset" ,rust-memoffset-0.7)))) (home-page "https://github.com/nix-rust/nix") (synopsis "Rust friendly bindings to *nix APIs") (description @@ -35411,6 +35411,26 @@ The goal is to not provide a 100% unified interface, but to unify what can be while still providing platform specific APIs.") (license license:expat))) +(define-public rust-nix-0.24 + (package + (inherit rust-nix-0.26) + (name "rust-nix") + (version "0.24.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r")))) + (arguments + (list #:skip-build? #t + #:cargo-inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.6)))))) + (define-public rust-nix-0.23 (package (inherit rust-nix-0.24) -- cgit 1.4.1 From 7422ad33742f2e158a41c7fee8828e97e46b60f1 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Tue, 17 Jan 2023 10:19:31 -0800 Subject: gnu: greetd: Update to 0.9.0. * gnu/packages/admin.scm (greetd): Update to 0.9.0. Signed-off-by: Jelle Licht --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 46b38ef053..cfa8fc43f6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5242,7 +5242,7 @@ it won't take longer to install 15 machines than it would to install just 2.") (define-public greetd (package (name "greetd") - (version "0.8.0") + (version "0.9.0") (home-page "https://git.sr.ht/~kennylevinsen/greetd") (source (origin (method git-fetch) @@ -5251,11 +5251,11 @@ it won't take longer to install 15 machines than it would to install just 2.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x5c3jkw09kvj2grcxm899y2n6ws8p990cyp9cs0fy6lm4fzlh6v")))) + (base32 "1b79lb0vikh5vwpdlyga6zwzm11gpsd7ghp8zb0q2m6mlqlj5by3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-nix" ,rust-nix-0.19) + (("rust-nix" ,rust-nix-0.26) ("rust-pam-sys" ,rust-pam-sys-0.5) ("rust-rpassword" ,rust-rpassword-5) ("rust-users" ,rust-users-0.11) -- cgit 1.4.1 From 9c3a2abc9a27482bcbebd67fc2b468fbc2c81234 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Tue, 17 Jan 2023 10:19:32 -0800 Subject: gnu: greetd: Use new-style inputs. * gnu/packages/admin.scm (greetd)[inputs]: Use new-style inputs. Signed-off-by: Jelle Licht --- gnu/packages/admin.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cfa8fc43f6..9a82740eb6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5302,8 +5302,7 @@ it won't take longer to install 15 machines than it would to install just 2.") (install-file "greetd-ipc.7" man7) (install-file "agreety.1" man1)))))))) (native-inputs - `(("linux-pam" ,linux-pam) - ("scdoc" ,scdoc))) + (list linux-pam scdoc)) (synopsis "Minimal and flexible login manager daemon") (description "greetd is a minimal and flexible login manager daemon -- cgit 1.4.1 From 1cc0f0efd4d5bbe2e7ec429acaab892a618e8a66 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 2 Feb 2023 11:49:37 +0800 Subject: gnu: Add Go 1.20. * gnu/packages/golang.scm (go-1.20): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cf15b81fe7..d4f79eb50b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Dhruvin Gandhi ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2022 ( +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -887,6 +888,27 @@ in the style of communicating sequential processes (@dfn{CSP}).") '("CONTRIBUTING.md" "PATENTS" "README.md" "SECURITY.md")))))))))) +(define-public go-1.20 + (package + (inherit go-1.19) + (name "go") + (version "1.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a7wjzv14kaqg5l7ambv5zj4rj7sgah9yhcg6k6da6ygm6bs4dv3")))) + (native-inputs + ;; Go 1.20 and later requires Go 1.17 as the bootstrap toolchain. + ;; See 'src/cmd/dist/notgo117.go' in the source code distribution, + ;; as well as the upstream discussion of this topic: + ;; https://go.dev/issue/44505 + (alist-replace "go" (list go-1.17) (package-native-inputs go-1.17))))) + (define-public go go-1.17) (define make-go-std -- cgit 1.4.1 From 1a5f5694a7cd4bb19e9de27266e06b80d33d95cd Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 2 Feb 2023 11:50:09 +0800 Subject: gnu: Add the Go standard library 1.20. * gnu/packages/golang.scm (go-std-1.20): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d4f79eb50b..1f89ce0609 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -950,6 +950,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (define-public go-std-1.17 (make-go-std go-1.17)) (define-public go-std-1.18 (make-go-std go-1.18)) (define-public go-std-1.19 (make-go-std go-1.19)) +(define-public go-std-1.20 (make-go-std go-1.20)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") -- cgit 1.4.1 From ce7d0d689c07a7a6fd11d5d00f0e6c990cb4ee07 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:11 +0000 Subject: gnu: tree-sitter: Move to its own module. * gnu/packages/text-editors.scm (tree-sitter): Move to ... * gnu/packages/tree-sitter.scm: ... here, a new module. * gnu/packages/vim.scm: Use (gnu packages tree-sitter). * gnu/packages/emacs.scm: Use (gnu packages tree-sitter). * gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module. Signed-off-by: Andrew Tropin --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 2 +- gnu/packages/engineering.scm | 1 + gnu/packages/text-editors.scm | 52 ----------------------------- gnu/packages/tree-sitter.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ gnu/packages/vim.scm | 1 + 6 files changed, 82 insertions(+), 53 deletions(-) create mode 100644 gnu/packages/tree-sitter.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index a5f4b83961..f1fed73987 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -606,6 +606,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tmux.scm \ %D%/packages/toolkits.scm \ %D%/packages/tor.scm \ + %D%/packages/tree-sitter.scm \ %D%/packages/tv.scm \ %D%/packages/uglifyjs.scm \ %D%/packages/uml.scm \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 00f8a0f086..4ce41deb88 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -76,7 +76,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) - #:use-module (gnu packages text-editors) ; for tree-sitter + #:use-module (gnu packages tree-sitter) ; for tree-sitter #:use-module (gnu packages web) ; for jansson #:use-module (gnu packages webkit) #:use-module (gnu packages xml) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 78059ceb7e..9db6e26a02 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -148,6 +148,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages text-editors) + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages tls) #:use-module (gnu packages tex) #:use-module (gnu packages version-control) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f9330008e7..9c70b5c758 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -73,7 +73,6 @@ #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages hunspell) - #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) #:use-module (gnu packages llvm) @@ -1256,57 +1255,6 @@ similar to vi/ex.") FreeDOS as a functional clone of the old MS-DOS program edlin.") (license license:gpl2+))) -(define-public tree-sitter - (package - (name "tree-sitter") - (version "0.20.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tree-sitter/tree-sitter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) - (modules '((guix build utils))) - (snippet '(begin - ;; Remove bundled ICU parts - (delete-file-recursively "lib/src/unicode") - #t)))) - (build-system gnu-build-system) - (inputs (list icu4c)) - (arguments - (list #:phases - '(modify-phases %standard-phases - (delete 'configure)) - #:tests? #f ; there are no tests for the runtime library - #:make-flags - #~(list (string-append "PREFIX=" - #$output) - (string-append "CC=" - #$(cc-for-target))))) - (home-page "https://tree-sitter.github.io/tree-sitter/") - (synopsis "Incremental parsing system for programming tools") - (description - "Tree-sitter is a parser generator tool and an incremental parsing -library. It can build a concrete syntax tree for a source file and efficiently -update the syntax tree as the source file is edited. - -Tree-sitter aims to be: - -@itemize -@item General enough to parse any programming language -@item Fast enough to parse on every keystroke in a text editor -@item Robust enough to provide useful results even in the presence of syntax errors -@item Dependency-free so that the runtime library (which is written in pure C) -can be embedded in any application -@end itemize - -This package includes the @code{libtree-sitter} runtime library. -") - (license license:expat))) - (define-public mle (package (name "mle") diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm new file mode 100644 index 0000000000..a841ded429 --- /dev/null +++ b/gnu/packages/tree-sitter.scm @@ -0,0 +1,78 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Pierre Langlois +;;; +;;; 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 tree-sitter) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages icu4c) + #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public tree-sitter + (package + (name "tree-sitter") + (version "0.20.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tree-sitter/tree-sitter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove bundled ICU parts + (delete-file-recursively "lib/src/unicode") + #t)))) + (build-system gnu-build-system) + (inputs (list icu4c)) + (arguments + (list #:phases + '(modify-phases %standard-phases + (delete 'configure)) + #:tests? #f ; there are no tests for the runtime library + #:make-flags + #~(list (string-append "PREFIX=" + #$output) + (string-append "CC=" + #$(cc-for-target))))) + (home-page "https://tree-sitter.github.io/tree-sitter/") + (synopsis "Incremental parsing system for programming tools") + (description + "Tree-sitter is a parser generator tool and an incremental parsing +library. It can build a concrete syntax tree for a source file and efficiently +update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@itemize +@item General enough to parse any programming language +@item Fast enough to parse on every keystroke in a text editor +@item Robust enough to provide useful results even in the presence of syntax errors +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application +@end itemize + +This package includes the @code{libtree-sitter} runtime library. +") + (license license:expat))) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 0593986d87..eda25dc909 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -72,6 +72,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages text-editors) #:use-module (gnu packages terminals) + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) -- cgit 1.4.1 From 8f9edc9ebca69fb2ee64e68f3854848338aaba3d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:12 +0000 Subject: gnu: tree-sitter: Update to 0.20.7. * gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.7. Signed-off-by: Andrew Tropin --- gnu/packages/tree-sitter.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a841ded429..e6f0b5c71d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -29,7 +29,7 @@ (define-public tree-sitter (package (name "tree-sitter") - (version "0.20.6") + (version "0.20.7") (source (origin (method git-fetch) (uri (git-reference @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d")) + "1nv2a2hr22w8ix71b6rkkxv9rfvhvwlmyql0g6lva9qzj4vy50p4")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled ICU parts -- cgit 1.4.1 From 1378bb5348cc0f4bec796ccf1a2632f08e42cb09 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 9 Feb 2023 12:33:28 +0400 Subject: gnu: tree-sitter: Update package style. * gnu/packages/tree-sitter.scm (tree-sitter): Add gexps, remove trailing #t, reformat code. --- gnu/packages/tree-sitter.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e6f0b5c71d..b0d4bb1c38 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -40,22 +40,19 @@ (base32 "1nv2a2hr22w8ix71b6rkkxv9rfvhvwlmyql0g6lva9qzj4vy50p4")) (modules '((guix build utils))) - (snippet '(begin - ;; Remove bundled ICU parts - (delete-file-recursively "lib/src/unicode") - #t)))) + (snippet #~(begin + ;; Remove bundled ICU parts + (delete-file-recursively "lib/src/unicode"))))) (build-system gnu-build-system) (inputs (list icu4c)) (arguments (list #:phases - '(modify-phases %standard-phases - (delete 'configure)) + #~(modify-phases %standard-phases + (delete 'configure)) #:tests? #f ; there are no tests for the runtime library #:make-flags - #~(list (string-append "PREFIX=" - #$output) - (string-append "CC=" - #$(cc-for-target))))) + #~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target))))) (home-page "https://tree-sitter.github.io/tree-sitter/") (synopsis "Incremental parsing system for programming tools") (description @@ -73,6 +70,5 @@ Tree-sitter aims to be: can be embedded in any application @end itemize -This package includes the @code{libtree-sitter} runtime library. -") +This package includes the @code{libtree-sitter} runtime library.") (license license:expat))) -- cgit 1.4.1 From 8686933c1e5852300844bcce54401229caf99919 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:13 +0000 Subject: gnu: Add rust-html-escape. * gnu/packages/crates-io.scm (rust-html-escape): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 661411b2c5..370fb96438 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26033,6 +26033,30 @@ Hash-based Message Authentication Code algorithm} for SHA1.") "This package provides a library for HTML entity encoding and decoding.") (license (list license:asl2.0 license:expat license:mpl2.0)))) +(define-public rust-html-escape-0.2 + (package + (name "rust-html-escape") + (version "0.2.12") + (source (origin + (method url-fetch) + (uri (crate-uri "html-escape" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01f2v3c6j2rk5h2lhdbh62j07cm1fvzqw4vplj2sms83jpx5qc8m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-utf8-width" ,rust-utf8-width-0.1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://magiclen.org/html-escape") + (synopsis "Library for encoding and escaping special characters in HTML") + (description + "This package provides a library for encoding and escaping special +characters in HTML, decoding and unescaping HTML entities as well.") + (license license:expat))) + (define-public rust-hts-sys-2 (package (name "rust-hts-sys") -- cgit 1.4.1 From 0028204e2610ae399d29c41e0a61863a58fab647 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:14 +0000 Subject: gnu: Add rust-smallbitvec-2. * gnu/packages/crates-io.scm (rust-smallbitvec-2): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 370fb96438..80f7e619bb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53953,6 +53953,28 @@ Unicode strings.") I/O programming.") (license license:expat))) +(define-public rust-smallbitvec-2 + (package + (name "rust-smallbitvec") + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (crate-uri "smallbitvec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0plrbldsjpwip3afbzd8fgrnvdhizcg5z4ncfqs4q6x4qjflzkkm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-bit-vec" ,rust-bit-vec-0.4) + ("rust-rand" ,rust-rand-0.4)))) + (home-page "https://github.com/servo/smallbitvec") + (synopsis "Bit vector optimized for size and inline storage") + (description "This package provides a bit vector optimized for size and +inline storage.") + (license (list license:expat license:asl2.0)))) + (define-public rust-smallvec-1 (package (name "rust-smallvec") -- cgit 1.4.1 From 0cd9bd5dce2b51a6d79a1a1a6fc70bfd787acbc7 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:15 +0000 Subject: gnu: Add tree-sitter-cli. * gnu/packages/tree-sitter.scm (tree-sitter-cli): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/tree-sitter.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index b0d4bb1c38..4a5e082e5b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -19,7 +19,10 @@ (define-module (gnu packages tree-sitter) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-io) #:use-module (gnu packages icu4c) + #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix gexp) #:use-module (guix git-download) @@ -72,3 +75,79 @@ can be embedded in any application This package includes the @code{libtree-sitter} runtime library.") (license license:expat))) + +(define-public tree-sitter-cli + (package (inherit tree-sitter) + (name "tree-sitter-cli") + (source (origin + (inherit (package-source tree-sitter)) + (snippet + #~(begin + ;; Remove the runtime library code and dynamically link to + ;; it instead. + (delete-file-recursively "lib/src") + (delete-file "lib/binding_rust/build.rs") + (with-output-to-file "lib/binding_rust/build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=tree-sitter\");~@ + }~%"))))))) + (build-system cargo-build-system) + (inputs (list tree-sitter)) + (arguments + (list + ;; Running test requires downloading fixtures, see the + ;; script/fetch-fixtures script, which fetches grammars. Maybe it make + ;; sence to run tests in the grammar's packages? + #:tests? #f + ;; We're only packaging the CLI program so we do not need to install + ;; sources. + #:install-source? #f + #:cargo-inputs + `(("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-difference" ,rust-difference-2) + ("rust-dirs" ,rust-dirs-3) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-semver" ,rust-semver-1) + ("rust-smallbitvec" ,rust-smallbitvec-2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tiny-http" ,rust-tiny-http-0.8) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-webbrowser" ,rust-webbrowser-0.5) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs + `(("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-cargo-lock + (lambda _ + (delete-file "Cargo.lock"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (install-file "target/release/tree-sitter" bin))))))) + (description "Tree-sitter is a parser generator tool and an incremental +parsing library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. + +Tree-sitter aims to be: + +@enumerate +@item General enough to parse any programming language. +@item Fast enough to parse on every keystroke in a text editor. +@item Robust enough to provide useful results even in the presence of syntax +errors. +@item Dependency-free so that the runtime library (which is written in pure C) +can be embedded in any application. +@end enumerate + +This package includes the @command{tree-sitter} command-line tool.") + (license license:expat))) -- cgit 1.4.1 From 53b00b91b73bd60412d5bd057e22e6d63194a7f7 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 9 Feb 2023 17:34:05 +0400 Subject: gnu: Add tree-sitter-grammar-html. * gnu/packages/crates-io.scm (tree-sitter-grammar): New variable. (tree-sitter-grammar-html): New variable. --- gnu/packages/tree-sitter.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4a5e082e5b..2e44339ca2 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -1,6 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2022 muradm +;;; Copyright © 2022 Aleksandr Vityazev +;;; Copyright © 2023 Andrew Tropin ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,3 +154,61 @@ can be embedded in any application. This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) + +(define* (tree-sitter-grammar + language language-for-synopsis version commit hash + #:key + (repository-url + (format #f "https://github.com/tree-sitter/tree-sitter-~a" language)) + (source-directory "")) + (let ((synopsis (string-append language-for-synopsis + " grammar for tree-sitter")) + (name (string-append "tree-sitter-grammar-" language)) + (src-dir source-directory) + (lib (format #f "libtree-sitter-~a.so" language))) + (package + (name name) + (version version) + (home-page repository-url) + (source (origin + (method git-fetch) + (uri (git-reference + (url repository-url) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 hash)))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (with-directory-excursion (string-append #$src-dir "src") + (let* ((scanner? (or (file-exists? "scanner.c") + (file-exists? "scanner.cc"))) + (CC (if (file-exists? "scanner.cc") "g++" "gcc")) + (compile (lambda (f) (invoke CC "-fPIC" "-c" "-I." f))) + (link-args `("-fPIC" "-shared" "parser.o" + ,@(if scanner? '("scanner.o") '()) + "-o" ,#$lib))) + (invoke "gcc" "-fPIC" "-c" "-I." "parser.c") + (for-each + (lambda (f) (when (file-exists? f) (compile f))) + '("scanner.c" "scanner.cc")) + (apply invoke CC link-args))))) + (delete 'check) + (replace 'install + (lambda _ + (install-file (string-append #$src-dir "src/" #$lib) + (string-append #$output "/lib/tree-sitter"))))))) + (synopsis synopsis) + (description (string-append synopsis ".")) + (license license:expat)))) + +(define-public tree-sitter-grammar-html + (tree-sitter-grammar + "html" "HTML" + "0.19.0" "v0.19.0" + "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy")) -- cgit 1.4.1 From b123a814bfae358b452a414a25740449b52979f1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 22:56:54 -0500 Subject: gnu: kio: Disable flaky kiowidgets-kdirlistertest test. * gnu/packages/kde-frameworks.scm (kio) [phases]: Skip the kiowidgets-kdirlistertest test in the check phase. --- gnu/packages/kde-frameworks.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index fb578ee7e1..ae0e7f894d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2722,9 +2722,12 @@ consumption.") (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "ctest" - "-E" ; FIXME: 17/69 tests fail. + "-E" + ;; The following tests fail or are flaky (see: + ;; https://bugs.kde.org/show_bug.cgi?id=440721). (string-append "(kiocore-jobtest" "|kiocore-kmountpointtest" + "|kiowidgets-kdirlistertest" "|kiocore-kfileitemtest" "|kiocore-ktcpsockettest" "|kiocore-mimetypefinderjobtest" -- cgit 1.4.1 From 1ab68deba643c38ee7bf4cdb8a2d251a01fb03d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 22:58:24 -0500 Subject: gnu: kio: Fix indentation. * gnu/packages/kde-frameworks.scm (kio): Fix indentation. --- gnu/packages/kde-frameworks.scm | 94 +++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 46 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ae0e7f894d..71ee9ea895 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2703,54 +2703,56 @@ consumption.") qtscript qtx11extras sonnet - `(,util-linux "lib") ; libmount + `(,util-linux "lib") ; libmount zlib)) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - ;; Better error message (taken from NixOS) - (substitute* "src/kiod/kiod_main.cpp" - (("(^\\s*qCWarning(KIOD_CATEGORY) << \"Error loading plugin:\")( << loader.errorString();)" _ a b) - (string-append a "<< name" b))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" - "-E" - ;; The following tests fail or are flaky (see: - ;; https://bugs.kde.org/show_bug.cgi?id=440721). - (string-append "(kiocore-jobtest" - "|kiocore-kmountpointtest" - "|kiowidgets-kdirlistertest" - "|kiocore-kfileitemtest" - "|kiocore-ktcpsockettest" - "|kiocore-mimetypefinderjobtest" - "|kiocore-krecentdocumenttest" - "|kiocore-http_jobtest" - "|kiogui-openurljobtest" - "|applicationlauncherjob_forkingtest" - "|applicationlauncherjob_scopetest" - "|applicationlauncherjob_servicetest" - "|commandlauncherjob_forkingtest" - "|commandlauncherjob_scopetest" - "|commandlauncherjob_servicetest" - "|kiowidgets-kdirmodeltest" - "|kiowidgets-kurifiltertest-colon-separator" - "|kiowidgets-kurifiltertest-space-separator)"))))) - (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. bluedevil) refer to these service types by - ;; the wrong name. I would prefer to patch those packages, but I - ;; cannot find the files! - (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append #$output "/share/kservicetypes5/"))) - (symlink (string-append kst5 "kfileitemactionplugin.desktop") - (string-append kst5 "kfileitemaction-plugin.desktop")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + ;; Better error message (taken from NixOS) + (substitute* "src/kiod/kiod_main.cpp" + (("(^\\s*qCWarning(KIOD_CATEGORY) << \ +\"Error loading plugin:\")( << loader.errorString();)" _ a b) + (string-append a "<< name" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" + "-E" + ;; The following tests fail or are flaky (see: + ;; https://bugs.kde.org/show_bug.cgi?id=440721). + (string-append "(kiocore-jobtest" + "|kiocore-kmountpointtest" + "|kiowidgets-kdirlistertest" + "|kiocore-kfileitemtest" + "|kiocore-ktcpsockettest" + "|kiocore-mimetypefinderjobtest" + "|kiocore-krecentdocumenttest" + "|kiocore-http_jobtest" + "|kiogui-openurljobtest" + "|applicationlauncherjob_forkingtest" + "|applicationlauncherjob_scopetest" + "|applicationlauncherjob_servicetest" + "|commandlauncherjob_forkingtest" + "|commandlauncherjob_scopetest" + "|commandlauncherjob_servicetest" + "|kiowidgets-kdirmodeltest" + "|kiowidgets-kurifiltertest-colon-separator" + "|kiowidgets-kurifiltertest-space-separator)"))))) + (add-after 'install 'add-symlinks + ;; Some package(s) (e.g. bluedevil) refer to these service types by + ;; the wrong name. I would prefer to patch those packages, but I + ;; cannot find the files! + (lambda* (#:key outputs #:allow-other-keys) + (let ((kst5 (string-append #$output "/share/kservicetypes5/"))) + (symlink (string-append kst5 "kfileitemactionplugin.desktop") + (string-append kst5 "kfileitemaction-plugin.desktop")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Network transparent access to files and data") (description "This framework implements a lot of file management functions. -- cgit 1.4.1 From d934f36096142257e192e3029895b3a054bf3537 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Feb 2023 08:47:21 -0500 Subject: gnu: rpm: Enable zstd support. * gnu/packages/package-management.scm (rpm) [inputs]: Add zstd. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2c5bc34d30..19c3b363ba 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -869,7 +869,8 @@ features of Stow with some extensions.") lua sqlite xz - zlib)) + zlib + zstd)) (propagated-inputs ;; popt is listed in the 'Requires' of rpm.pc. (list popt)) -- cgit 1.4.1 From 6d505fffb43c712d15edd9a635e998dda9788cad Mon Sep 17 00:00:00 2001 From: Josselin Poiret via Guix-patches via Date: Wed, 1 Feb 2023 17:56:51 +0100 Subject: gnu: basu: Propagate libcap. * gnu/packages/freedesktop.scm (basu): Propagate libcap so that pkg-config can find basu's dependency. Signed-off-by: Jelle Licht --- gnu/packages/freedesktop.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 90398f0e70..8fc030a493 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -827,7 +827,8 @@ of a the system to know what users are logged in, and where.") (build-system meson-build-system) (native-inputs (list pkg-config python gperf)) - (inputs + (propagated-inputs + ;; Propagated because of pkg-config (list libcap)) (synopsis "The sd-bus library, extracted from systemd") (description "Some projects rely on the sd-bus library for DBus support. -- cgit 1.4.1 From 1750d68309e26293c2da5aad953a061867f2cb14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2023 12:29:20 +0200 Subject: gnu: julia: Use SSL_CERT_FILE for SSL certificates. Fixes . * gnu/packages/julia.scm (julia)[arguments]: Add a phase to have Julia use the SSL_CERT_FILE search path. [native-search-paths]: Add SSL_CERT_FILE. --- gnu/packages/julia.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index d35901eadb..12ff63905b 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -31,6 +31,7 @@ #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module ((guix search-paths) #:select ($SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages base) @@ -292,6 +293,15 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (substitute* (jlpath "libblastrampoline") (("libblastrampoline\\.so") (search-input-file inputs "/lib/libblastrampoline.so")))))) + (add-before 'build 'use-ssl-cert-file + (lambda _ + ;; We must adapt MozillaCACerts to use SSL_CERT_FILE. + (substitute* "stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl" + (("global cacert = .*") + (string-append + "global cacert = get(ENV, \"SSL_CERT_FILE\"," + ;; our fallback location. + "\"/etc/ssl/certs/ca-certificates.crt\")\n"))))) (add-after 'unpack 'enable-parallel-tests (lambda* (#:key parallel-tests? #:allow-other-keys) (when parallel-tests? @@ -525,7 +535,8 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) (files (list "share/julia/loadpath/"))) (search-path-specification (variable "JULIA_DEPOT_PATH") - (files (list "share/julia/"))))) + (files (list "share/julia/"))) + $SSL_CERT_FILE)) ;; Julia only officially supports some of our platforms: ;; https://julialang.org/downloads/#supported_platforms (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) -- cgit 1.4.1 From 10234981178a6a92295137590dc8879d4f27c19a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 9 Feb 2023 11:32:31 +0100 Subject: gnu: qdmr: Update to 0.11.2. * gnu/packages/radio.scm (qdmr): Update to 0.11.2. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5a7c9f26f9..970232182b 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2816,7 +2816,7 @@ Navigation Satellite System.") (define-public qdmr (package (name "qdmr") - (version "0.11.1") + (version "0.11.2") (source (origin (method git-fetch) (uri (git-reference @@ -2825,7 +2825,7 @@ Navigation Satellite System.") (file-name (git-file-name name version)) (sha256 (base32 - "1xbp4ica6bgsiwc57wzm8744dqik2fw77kh1gb8s3sa1q9my2vlx")))) + "1r40shli0c66f559m25hd1xagyblh8qhzz7wyqyy7r167fvzagfd")))) (build-system cmake-build-system) (arguments (list #:tests? #f ;no tests -- cgit 1.4.1 From 4e318cc747f10ea54af03264e2d445b3630941b6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 9 Feb 2023 11:37:10 +0100 Subject: gnu: urh: Update to 2.9.4. * gnu/packages/radio.scm (urh): Update to 2.9.4. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 970232182b..c42eb3cd4e 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2689,7 +2689,7 @@ of devices than RTL-SDR.") (define-public urh (package (name "urh") - (version "2.9.3") + (version "2.9.4") (source (origin (method git-fetch) @@ -2698,7 +2698,7 @@ of devices than RTL-SDR.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17r9fkw0icph7fayibp6qbdh4nxi8wy3mmd3djmh0c2jr8yz5fsf")))) + (base32 "1sx70mp4bjbymy1lp6p96ydpqlyq7rwnrw96nb6aaya63fl1ab8y")))) (build-system python-build-system) (native-inputs (list python-cython -- cgit 1.4.1 From e9f2c58155547a42d9571eaae0234fac389a4c45 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 9 Feb 2023 13:45:47 +0100 Subject: gnu: sdrangel: Update to 7.8.6. * gnu/packages/radio.scm (sdrangel): Update to 7.8.6. [inputs]: Add hidapi. --- gnu/packages/radio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c42eb3cd4e..ae0da298f7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2358,7 +2358,7 @@ voice formats.") (define-public sdrangel (package (name "sdrangel") - (version "7.8.5") + (version "7.8.6") (source (origin (method git-fetch) @@ -2367,7 +2367,7 @@ voice formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kfzmxbhfpvs8csfbhnl5nij6nlbr00s43392wfq35vnnkbgk5lv")))) + (base32 "0znri1sssc9hw4j6s3bmp8hfza88jv2xqvdx8v6z7m2zf4w3dddl")))) (build-system qt-build-system) (native-inputs (list doxygen graphviz pkg-config)) @@ -2383,6 +2383,7 @@ voice formats.") ffmpeg fftwf hackrf + hidapi libdab libusb mbelib -- cgit 1.4.1 From 58a95d599ee5d0dc6419d038b7317e1b77b11519 Mon Sep 17 00:00:00 2001 From: "André A. Gomes" Date: Tue, 7 Feb 2023 11:43:05 +0200 Subject: gnu: cl-nfiles: Update to 1.1.0. * gnu/packages/lisp-xyz.scm (sbcl-nfiles): Update to 1.1.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7ece7e3e6c..489763bc97 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23760,7 +23760,7 @@ access lexicographic data from WordNet.") (define-public sbcl-nfiles (package (name "sbcl-nfiles") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -23770,7 +23770,7 @@ access lexicographic data from WordNet.") (file-name (git-file-name "cl-nfiles" version)) (sha256 (base32 - "1215h4xzc7vxidr7lhxyr5a7giyd08678ibz5qp4d4nvg14q94y2")))) + "03rc990kzh7d33642r28ms4d3i1qf8nng6ph2bv9b9ykm1h4pjg6")))) (build-system asdf-build-system/sbcl) (inputs (list gnupg -- cgit 1.4.1 From 315359a4f3ae4b2ef5431ed2850decff60f7aa9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2023 19:56:22 +0200 Subject: gnu: Add gccgo-12. * gnu/packages/gcc.scm (gccgo-12): New variable. (make-gccgo)[arguments]: Adapt custom 'remove-tool-reference-from-libgo to changes in the source. --- gnu/packages/gcc.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bb154cac62..bf3c753b2d 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Marius Bakke @@ -1062,8 +1062,11 @@ provides the GNU compiler for the Go programming language.") (substitute* "libgo/Makefile.in" (("(GccgoToolDir = \\\")[^\\\"]+" _ start) (string-append start "/nonexistent")) - (("(DefaultGoroot = \\\")[^\\\"]+" _ start) - (string-append start "/nonexistent")) + ,@(if (version>=? (package-version gccgo) "12.0") + '((("(defaultGOROOT = `)[^`]+" _ start) + (string-append start "/nonexistent"))) + '((("(DefaultGoroot = \\\")[^\\\"]+" _ start) + (string-append start "/nonexistent")))) (("(defaultGOROOTValue.*?return `)[^`]+" _ start) (string-append start "/nonexistent")))))))))))) @@ -1087,6 +1090,9 @@ provides the GNU compiler for the Go programming language.")) (define-public gccgo-11 (make-gccgo gcc-11)) +(define-public gccgo-12 + (make-gccgo gcc-12)) + (define %objc-search-paths (list (search-path-specification (variable "OBJC_INCLUDE_PATH") -- cgit 1.4.1 From 85b065c6fce7c1e9a6c2cd24392b8113a4a66903 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Jan 2023 18:39:05 +0200 Subject: gnu: zig: Update to 0.10.1. * gnu/packages/zig.scm (zig-0.10): New variable. (zig-0.9): Rename from zig. Inherit from zig-0.10. (zig): Define as zig-0.10. * gnu/packages/ncdu.scm (ncdu)[native-inputs]: Use zig-0.9. * gnu/packages/zig-xyz.scm (zig-zls)[inputs]: Use zig-0.9. --- gnu/packages/ncdu.scm | 2 +- gnu/packages/zig-xyz.scm | 2 +- gnu/packages/zig.scm | 95 +++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 80 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index feea8f8819..7e47314351 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -97,7 +97,7 @@ ncurses installed.") (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig)))) + (list perl zig-0.9)))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 3812aa0125..fd42c21638 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -41,7 +41,7 @@ (base32 "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii")))) (build-system gnu-build-system) - (inputs (list zig python)) + (inputs (list zig-0.9 python)) (arguments (list #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index cda93bed2e..5414b5ba6e 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Calum Irwin -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,12 +25,13 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig +(define-public zig-0.10 (package (name "zig") - (version "0.9.1") + (version "0.10.1") (source (origin (method git-fetch) @@ -39,21 +40,25 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-use-system-paths.patch")))) + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")))) (build-system cmake-build-system) (inputs - (list clang-13 ; Clang propagates llvm. - lld-13)) + (list clang-15 ; Clang propagates llvm. + lld-15 + zlib + (list zstd "lib"))) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs - (list llvm-13)) + (list llvm-15)) (arguments `(#:configure-flags (list ,@(if (%current-target-system) - (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '())) + '(string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system)) + '()) + (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") + "/lib/zig")) + #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. #:out-of-source? #f ; for tests #:phases (modify-phases %standard-phases @@ -62,17 +67,20 @@ ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. (setenv "ZIG_GLOBAL_CACHE_DIR" (string-append (getcwd) "/zig-cache")))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) (delete 'check) (add-after 'install 'check (lambda* (#:key outputs tests? #:allow-other-keys) (when tests? (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - ;; and stage 2 tests require a lot of RAM. + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" "-Dskip-stage2-tests" ;; Non-native tests try to link and execute non-native ;; binaries. @@ -104,3 +112,56 @@ toolchain. Among other features it provides ;; https://github.com/ziglang/zig/issues/6485 (supported-systems %64bit-supported-systems) (license license:expat))) + +(define-public zig-0.9 + (package + (inherit zig-0.10) + (name "zig") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglang/zig.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) + (patches (search-patches "zig-use-system-paths.patch")))) + (inputs + (list clang-13 ; Clang propagates llvm. + lld-13)) + ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (native-inputs + (list llvm-13)) + (arguments + `(#:configure-flags + (list ,@(if (%current-target-system) + (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system)) + '())) + #:out-of-source? #f ; for tests + #:phases + (modify-phases %standard-phases + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (invoke (string-append (assoc-ref outputs "out") "/bin/zig") + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + ;; and stage 2 tests require a lot of RAM. + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))))) + +(define-public zig zig-0.10) -- cgit 1.4.1 From 66a6c516e2b774805c2c583766d8231f6b58e028 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Jan 2023 15:03:10 +0200 Subject: gnu: ncdu: Update to 2.2.2. * gnu/packages/ncdu.scm (ncdu): Update to 2.2.2. [native-inputs]: Switch from zig-0.9 to zig-0.10. --- gnu/packages/ncdu.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 7e47314351..716eef43dd 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,14 +62,14 @@ ncurses installed.") (package (inherit ncdu-1) (name "ncdu") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0hfimrr7z9zrfkiyj09i8nh4a1rjn7d00y9xzpc7mkyqpkvghjjy")) + "14zrmcxnrczamqjrib99jga05ixk0dzfav3pd6s1h8vm9q121nch")) (modules '((guix build utils))) (snippet #~(begin @@ -97,7 +97,7 @@ ncurses installed.") (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig-0.9)))) + (list perl zig-0.10)))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) -- cgit 1.4.1 From 3584cff93d5fd78faf9e41db629351bf570a63f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2023 21:43:14 +0200 Subject: gnu: go-github-com-spf13-pflag: Fix building with newer go. * gnu/packages/golang.scm (go-github-com-spf13-pflag)[source]: Add snippet to fix test suite with newer versions of go. --- gnu/packages/golang.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1f89ce0609..22f6ec5e8c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016-2023 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019, 2021 Ludovic Courtès @@ -4134,7 +4134,16 @@ applications as well as a program to generate applications and command files.") (file-name (git-file-name name version)) (sha256 (base32 - "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) + "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Fix compatibility with go-1.19+ + ;; https://github.com/spf13/pflag/issues/368 + (substitute* "flag_test.go" + (("fmt\\.Println") "fmt.Print") + (("\\+ got\\)") "+ got + \"\\n\")") + (("\\+ defaultOutput\\)") "+ defaultOutput + \"\\n\")")))))) (build-system go-build-system) (arguments '(#:import-path "github.com/spf13/pflag")) -- cgit 1.4.1 From bf667efe910f740282aee1ebe1891b452224d31e Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 9 Feb 2023 20:50:10 +0100 Subject: gnu: Add perl-net-bonjour. * gnu/packages/networking.scm (perl-net-bonjour): New variable. --- gnu/packages/networking.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 75ffe00b44..a9ea07d7b1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2022 Manolis Fragkiskos Ragkousis ;;; Copyright © 2022 Reza Alizadeh Majd ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -2304,6 +2305,28 @@ private (reserved).") (description "Net::DNS is the Perl Interface to the Domain Name System.") (license license:x11))) +(define-public perl-net-bonjour + (package + (name "perl-net-bonjour") + (version "0.96") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/C/CH/CHLIGE/Net-Bonjour-" + version ".tar.gz")) + (sha256 + (base32 + "15qzkfk0isn6c4js3ih95k3dylq6scijp863s0485c00n8x1z2n3")))) + (build-system perl-build-system) + (propagated-inputs (list perl-net-dns)) + (home-page "https://metacpan.org/release/Net-Bonjour") + (synopsis "Module for DNS service discovery (Apple's Bonjour)") + (description "Net::Bonjour is a set of modules that allow one to +discover local services via multicast DNS (mDNS) or enterprise services +via traditional DNS. This method of service discovery has been branded +as Bonjour by Apple Computer.") + (license license:perl-license))) + (define-public perl-socket6 (package (name "perl-socket6") -- cgit 1.4.1 From 8dbc9aa05ee142fd14c708158ac9cde53bd0c858 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 9 Feb 2023 21:02:05 +0100 Subject: gnu: Add perl-growl-gntp. * gnu/packages/perl.scm (perl-growl-gntp): New variable. --- gnu/packages/perl.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 14e4934918..295f8dd141 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Evgeny Pisemsky ;;; Copyright © 2022 gemmaro ;;; Copyright © 2023 Mădălin Ionel Patrașcu +;;; Copyright © 2023 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -12378,6 +12379,27 @@ regexp patterns in modules.") structures.") (license license:perl-license))) +(define-public perl-growl-gntp + (package + (name "perl-growl-gntp") + (version "0.21") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-" version + ".tar.gz")) + (sha256 + (base32 + "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98")))) + (build-system perl-build-system) + (native-inputs (list perl-module-build-tiny)) + (propagated-inputs (list perl-crypt-cbc perl-data-uuid)) + (home-page "https://metacpan.org/release/Growl-GNTP") + (synopsis "Perl implementation of the GNTP Protocol (client part)") + (description "Growl::GNTP is a Perl implementation of the client part +of the Growl Notification Transport Protocol (GNTP).") + (license license:perl-license))) + (define-public perl-socket-msghdr (package (name "perl-socket-msghdr") -- cgit 1.4.1 From 07f19ef04b5a8f4d7a12a8940333e67db8da81c0 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 9 Feb 2023 21:21:53 +0100 Subject: gnu: Add perl-alien-wxwidgets. * gnu/packages/wxwidgets.scm (perl-alien-wxwidgets): New variable. Co-authored-by: Malte Frank Gerdes --- gnu/packages/wxwidgets.scm | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 0a93c30f26..c62fc20fec 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 2023 Malte Frank Gerdes ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) @@ -45,13 +47,16 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages photo) - #:use-module (gnu packages video) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sdl) + #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -338,3 +343,31 @@ provide a 100% native look and feel for the application.") ;; wxSVG is licenced under the "wxWindows library licence", which is ;; the LGPL2.0+, with a few extra permissions. (license (list l:lgpl2.0+ (l:fsf-free "file://COPYING"))))) + +(define-public perl-alien-wxwidgets + (package + (name "perl-alien-wxwidgets") + (version "0.69") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-" + version + ".tar.gz")) + (sha256 + (base32 + "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk")))) + (build-system perl-build-system) + (native-inputs + (list perl-lwp-protocol-https + perl-module-build + perl-test-pod + perl-test-pod-coverage + wxwidgets)) + (propagated-inputs (list perl-module-pluggable)) + (home-page "https://metacpan.org/release/Alien-wxWidgets") + (synopsis "Perl module for wxWidgets binaries") + (description "Alien::wxWidgets is a Perl module for detecting and +getting configuration settings from an installed wxWidgets package.") + (license l:perl-license))) -- cgit 1.4.1 From 4d80d7571ec498fadfa51d9c1caf63fdfa96af03 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 28 Jan 2023 00:22:21 -0800 Subject: gnu: Add icewm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (icewm): New variable. Signed-off-by: 宋文武 --- gnu/packages/wm.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2fd70af07f..3ab0457044 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) + #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) @@ -734,6 +735,72 @@ This screen locker can be used with any window manager or desktop environment.") (license license:expat))) +(define-public icewm + (package + (name "icewm") + (version "3.3.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ice-wm/icewm/releases/download/" + version "/icewm-" version ".tar.lz")) + (sha256 + (base32 + "1m0jl9d2ikwb1s2cpm3q7f73h84mai9y31k8bhsq8y47jbkc6slk")))) + (build-system gnu-build-system) + (native-inputs (list pkg-config)) + (inputs (list fontconfig + fribidi + imlib2 + libice + libjpeg-turbo + libsm + libxcomposite + libxdamage + libxext + libxfixes + libxft + libxinerama + libxpm + libxrandr + libxrender + libx11 + lzip + perl)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-gmo-files + ;; gmo files are generated from .po files + ;; so remove them before build to make sure + ;; they are re-generated if needed + (lambda _ + (for-each delete-file + (find-files "po" "\\.gmo$")))) + (add-after 'unpack 'skip-failing-test + ;; strtest.cc tests failing due to $HOME and /etc setup + ;; difference under guix + (lambda _ + (substitute* "src/Makefile.in" + (("TESTS = strtest\\$\\(EXEEXT\\)") + "TESTS = "))))))) + (home-page "https://ice-wm.org/") + (synopsis "Window manager for the X Window System") + (description + "IceWM is a window manager for the X Window System. The goal of IceWM is +speed, simplicity, and not getting in the user’s way. It comes with a taskbar +with pager, global and per-window keybindings and a dynamic menu system. +Application windows can be managed by keyboard and mouse. Windows can be +iconified to the taskbar, to the tray, to the desktop or be made hidden. They +are controllable by a quick switch window (Alt+Tab) and in a window list. A +handful of configurable focus models are menu-selectable. Setups with +multiple monitors are supported by RandR and Xinerama. IceWM is very +configurable, themeable and well documented. It includes an optional external +background wallpaper manager with transparency support, a simple session +manager and a system tray.") + (license license:lgpl2.0))) + + (define-public xmonad-next (package (name "xmonad-next") -- cgit 1.4.1 From f5bb96700c44c8c56934f8837e66b03b9db87730 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Fri, 10 Feb 2023 13:39:02 +0800 Subject: gnu: icewm: Enable icewm-menu-fdo. * gnu/packages/wm.scm (icewm)[inputs]: Add glib. --- gnu/packages/wm.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3ab0457044..f2149b5be5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -751,6 +751,7 @@ desktop environment.") (native-inputs (list pkg-config)) (inputs (list fontconfig fribidi + glib ;for icewm-menu-fdo imlib2 libice libjpeg-turbo -- cgit 1.4.1 From 0ac85f3caa56bfdeffae295e174d1cae9bbdbfef Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 28 Jan 2023 20:24:25 -0800 Subject: gnu: Add motif. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lesstif.scm (motif): New variable. Signed-off-by: 宋文武 --- gnu/packages/lesstif.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 8f017f41be..5d902ba92f 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2022 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,12 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (gnu packages autotools) + #:use-module (gnu packages c) + #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg)) @@ -46,3 +53,36 @@ (synopsis "Clone of the Motif toolkit for the X window system") (description "Clone of the Motif toolkit for the X window system.") (license license:gpl2+))) ; some files are lgpl2.1+ or x11 + +(define-public motif + ;; This commit is from September 2021 and v2.3.8 from 2017. + (let ((commit "59858b0811e8d9dfaeb142f2b5a96f55482be1ed") + (revision "0")) + (package + (name "motif") + (version (git-version "2.3.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/motif/code") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yycq0vzga9qmgbfzn2d02ilpwxixwdv2j1d8sddl4dripcrg21m")))) + (build-system gnu-build-system) + (inputs + (list libx11 xorgproto)) + (propagated-inputs + (list fontconfig freetype libxext libxft libxpm libxt xbitmaps)) + (native-inputs + (list autoconf automake byacc flex libtool pkg-config)) + (home-page "https://motif.ics.com/motif") + (synopsis "Motif toolkit for the X window system") + (description "Motif is a standard graphical user interface, (as defined +by the IEEE 1295 specification), used on more than 200 hardware and software +platforms. It provides application developers, end users, and system vendors +with a widely used environment for standardizing application presentation on a +wide range of platforms.") + (license license:lgpl2.1+)))) -- cgit 1.4.1 From b8f6ead5faac3c1b9a8fa6e060c00cf0917e884e Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 28 Jan 2023 20:20:01 -0800 Subject: gnu: Add xnedit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (xnedit): New variable. Signed-off-by: 宋文武 --- gnu/packages/text-editors.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 9c70b5c758..16400481b0 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2022 Foo Chuan Wei ;;; Copyright © 2022 zamfofex ;;; Copyright © 2022 jgart +;;; Copyright © 2022 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) + #:use-module (gnu packages lesstif) #:use-module (gnu packages libbsd) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) @@ -1379,3 +1381,35 @@ for configuration and extensibility. It provides emulation modes for the key bindings of many editors (including Emacs and WordStar), and has syntax highlighting for dozens of languages. Jed is very small and fast.") (license license:gpl2+))) + +(define-public xnedit + (package + (name "xnedit") + (version "1.4.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/xnedit/" name "-" + version ".tar.gz")) + (sha256 + (base32 + "0fw3li7hr47hckm9pl1njx30lfr6cx2p094ir8zmgr91hyxidgld")))) + + (build-system gnu-build-system) + (arguments + (list + #:make-flags #~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target))) + #:tests? #f ;no tests + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "linux" make-flags)))))) + (inputs (list motif pcre)) + (native-inputs (list pkg-config)) + (home-page "https://sourceforge.net/projects/xnedit/") + (synopsis "Fast and classic X11 text editor") + (description + "XNEdit is a fast and classic X11 text editor, based on NEdit, +with full unicode support and antialiased text rendering.") + (license license:gpl2+))) -- cgit 1.4.1 From 3b9892ad07a943ff17f72377f6ca344041237979 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Feb 2023 16:24:19 +0100 Subject: gnu: python-hmmlearn: Update to 0.2.8. * gnu/packages/machine-learning.scm (python-hmmlearn): Update to 0.2.8. [arguments]: Use gexp; simplify 'check phase. [propagated-inputs]: Remove python-cython. --- gnu/packages/machine-learning.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1cd430de5f..9aae8d8243 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus +;;; Copyright © 2015-2023 Ricardo Wurmus ;;; Copyright © 2016, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel @@ -3371,27 +3371,26 @@ Python.") (define-public python-hmmlearn (package (name "python-hmmlearn") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) (uri (pypi-uri "hmmlearn" version)) (sha256 (base32 - "1qgnf1kdxicygy8nvpv866iqvwq0rc6xkd3s6slmvxvsy8h2fjvb")))) + "1yd5l9ra37mks41mn5bigav7xpb161a9yqlcnz4ir076vkik2sb9")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (with-directory-excursion (string-append (assoc-ref outputs "out") "/lib") - (invoke "python" "-m" "pytest")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append #$output "/lib") + (invoke "python" "-m" "pytest")))))))) (propagated-inputs (list pybind11 - python-cython python-numpy python-scikit-learn python-scipy -- cgit 1.4.1 From 769346eef7e4d712cabb84179a62e877b9a69292 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Feb 2023 12:10:42 +0100 Subject: gnu: Add louvain. * gnu/packages/bioinformatics.scm (louvain): New variable. --- gnu/packages/bioinformatics.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fdf52c5851..7ea856c157 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16839,6 +16839,40 @@ sequencing (e.g. mapping or base/indel alignment uncertainty), which are usually ignored by other methods or only used for filtering.") (license license:expat))) +(define-public louvain + (package + (name "louvain") + (version "0.2") + (source (origin + (method url-fetch) + (uri "mirror://sourceforge/louvain/louvain_latest.tar.gz") + (sha256 + (base32 + "0hqlv5jqc889nbv7j1bchrx4zhh69hgr2mqvfdygc7kwrywn22lb")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #false ;there are none + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-includes + (lambda _ + (substitute* "main_community.cpp" + (("using namespace std;" m) + (string-append "#include /* for getpid */\n" m))))) + (replace 'install + (lambda _ + (for-each + (lambda (exe) + (install-file exe (string-append #$output "/bin"))) + '("convert" "community" "hierarchy"))))))) + (home-page "https://sourceforge.net/projects/louvain/") + (synopsis "Multi-criteria community detection") + (description "This package offers a set of functions to use in order to +compute communities on graphs weighted or unweighted.") + (license license:gpl3+))) + (define-public ivar (package (name "ivar") -- cgit 1.4.1 From 8340acfa5a22495cd17e37c01388010f93103adc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Feb 2023 15:15:17 +0100 Subject: gnu: Add python-phenograph. * gnu/packages/bioinformatics.scm (python-phenograph): New variable. --- gnu/packages/bioinformatics.scm | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7ea856c157..c70dcdf93b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1255,6 +1255,66 @@ servers supporting the protocol.") genomics data.") (license license:bsd-3))) +(define-public python-phenograph + (package + (name "python-phenograph") + (version "1.5.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "PhenoGraph" version)) + (sha256 + (base32 + "0nji449mzwgp1f87iknl5fmnjdkrhkfkapxvafxdw01s0jg8zcj6")) + (modules '((guix build utils))) + ;; Remove bundled binaries + (snippet + '(delete-file-recursively "phenograph/louvain")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; This test can never succeed because Q_leiden is never set to + ;; anything other than None. + (add-after 'unpack 'disable-leiden-test + (lambda _ + (substitute* "tests/test_cluster.py" + (("def test_run_leiden") "def _test_run_leiden")))) + (add-after 'unpack 'patch-louvain + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "phenograph/core.py" + (("lpath = os.path.*") + (string-append "lpath = \"" + (dirname (search-input-file inputs "/bin/community")) + "\"\n")) + (("linux-(community|hierarchy|convert)" _ thing) thing) + ;; Do not write binaries, because the unmodified "convert" + ;; from louvain only knows how to process plain text files. + (("with open\\(filename \\+ \".bin\", \"w\\+b\"\\) as f:") + "with open(filename + \".bin\", \"w+\") as f:") + (("f.writelines\\(\\[e for t in zip\\(ij, s\\) for e in t\\]\\)") + "for [src, dest], weight in zip(ij, s): \ +f.write(src.astype(\"str\") + ' ' + \ +dest.astype(\"str\") + ' ' + \ +weight.astype(\"str\") + '\\n')"))))))) + (inputs + (list louvain)) + (propagated-inputs + (list python-leidenalg + python-numpy + python-psutil + python-scikit-learn + python-scipy)) + (native-inputs + (list python-pytest)) + (home-page "https://github.com/dpeerlab/PhenoGraph.git") + (synopsis "Graph-based clustering for high-dimensional single-cell data") + (description + "PhenoGraph is a clustering method designed for high-dimensional +single-cell data. It works by creating a graph representing phenotypic +similarities between cells and then identifying communities in this graph.") + (license license:expat))) + (define-public python-phylophlan (package (name "python-phylophlan") -- cgit 1.4.1 From cf981657a1d4c6ba64bf7e9a015d2be239ca85c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Feb 2023 15:48:02 +0100 Subject: gnu: Add python-vtraag-louvain. * gnu/packages/graph.scm (python-vtraag-louvain): New variable. --- gnu/packages/graph.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 560764bb33..cb2723afcd 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020, 2022 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019, 2020, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021, 2022 Efraim Flashner @@ -311,6 +311,41 @@ subplots, multiple-axes, polar charts, and bubble charts.") algorithm for community detection in large networks.") (license license:bsd-3))) +(define-public python-vtraag-louvain + (package + (name "python-vtraag-louvain") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "louvain" version)) + (sha256 + (base32 + "16l2zi4jwc3vpvpnz32jv7xy0g5087dp9y57wxplj1xa9r312x0i")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'do-not-use-bundled-igraph + (lambda _ + (substitute* "setup.py" + (("self.external = False") + "self.external = True") + (("self.use_pkgconfig = False") + "self.use_pkgconfig = True"))))))) + (inputs (list igraph)) + (propagated-inputs (list python-igraph)) + (native-inputs + (list pkg-config + python-ddt + python-setuptools-scm)) + (home-page "https://github.com/vtraag/louvain") + (synopsis "Community detection in large networks") + (description + "Louvain is a general algorithm for methods of community detection in +large networks.") + (license license:gpl3+))) + (define-public faiss (package (name "faiss") -- cgit 1.4.1 From fea66096a291f5eaf762da430e339feacac391b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Feb 2023 15:48:21 +0100 Subject: gnu: Add python-doubletdetection. * gnu/packages/bioinformatics.scm (python-doubletdetection): New variable. Co-authored-by: Navid Afkhami --- gnu/packages/bioinformatics.scm | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c70dcdf93b..ad8754f106 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1178,6 +1178,54 @@ It is the demultiplexing module of Pegasus, which is used by Cumulus in the demultiplexing step.") (license license:bsd-3))) +(define-public python-doubletdetection + (package + (name "python-doubletdetection") + (version "4.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "doubletdetection" version)) + (sha256 + (base32 + "0v0a19014h4p6x8pyz1s78xn3q5w5166cysvg574z6vw79a3s9vp")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #false ;there are none + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api"))))))) + (propagated-inputs + (list python-anndata + python-ipywidgets + python-leidenalg + python-vtraag-louvain + python-matplotlib + python-numpy + python-pandas + python-phenograph + python-scanpy + python-scipy + python-tqdm)) + (native-inputs + (list python-black + python-flake8 + python-poetry-core + python-pytest + python-pre-commit)) + (home-page "https://github.com/JonathanShor/DoubletDetection") + (synopsis + "This is a package to detect doublets in single-cell RNA-seq count matrices") + (description + "This package provides a method to detect and enable removal of doublets +from single-cell RNA-sequencing.") + (license license:expat))) + (define-public python-hclust2 (package (name "python-hclust2") -- cgit 1.4.1 From 8a0b625a2d0006621cc90ce85cd1396ac2919b79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Feb 2023 19:41:54 +0100 Subject: gnu: scregseg: Update to 0.1.3. * gnu/packages/bioinformatics.scm (scregseg): Update to 0.1.3. [source]: Simplify snippet. [build-system]: Use pyproject-build-system. [arguments]: Add phases 'set-numba-cache-dir and 'build-extensions; enable tests. --- gnu/packages/bioinformatics.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ad8754f106..5717b4844e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -17787,7 +17787,7 @@ populations.") (define-public scregseg (package (name "scregseg") - (version "0.1.1") + (version "0.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -17796,16 +17796,22 @@ populations.") (file-name (git-file-name name version)) (sha256 (base32 - "1k8hllr5if6k2mm2zj391fv40sfc008cjm04l9vgfsdppb80i112")) + "07g2barywa1wi8mggbxkbxqjw1fzd0a0l9cjdbkx4s40imb1dbxb")) (snippet - #~(begin - (use-modules ((guix build utils))) - (delete-file "src/scregseg/_utils.c"))))) - (build-system python-build-system) + '(delete-file "src/scregseg/_utils.c")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #false ; tests require network access - #:phases - (modify-phases %standard-phases + (list + #:phases + '(modify-phases %standard-phases + ;; Numba needs a writable dir to cache functions. + (add-before 'check 'set-numba-cache-dir + (lambda _ + (setenv "NUMBA_CACHE_DIR" "/tmp"))) + ;; Cython extensions have to be built before running the tests. + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace"))) (add-after 'unpack 'do-not-fail-to-find-sklearn (lambda _ ;; XXX: I have no idea why it cannot seem to find sklearn. -- cgit 1.4.1 From a7e174a45894b34d154b8106a9ac55dd3e9413ef Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 6 Feb 2023 23:47:08 +0000 Subject: gnu: Remove opencascade-oce. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package is unmaintained by upstream, has no dependents and was replaced by opencascade-occt. * gnu/packages/maths.scm (opencascade-oce): Remove variable. * gnu/packages/patches/opencascade-oce-glibc-2.26.patch: Remove file. * gnu/local.mk: Unregister it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 3 +- gnu/packages/maths.scm | 55 ------------------- .../patches/opencascade-oce-glibc-2.26.patch | 62 ---------------------- 3 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 gnu/packages/patches/opencascade-oce-glibc-2.26.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f1fed73987..51dea859a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -38,7 +38,7 @@ # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes -# Copyright © 2020 Vinicius Monego +# Copyright © 2020, 2023 Vinicius Monego # Copyright © 2021 Björn Höfling # Copyright © 2021 Greg Hogan # Copyright © 2021, 2022 Philip McGrath @@ -1601,7 +1601,6 @@ dist_patch_DATA = \ %D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openbox-python3.patch \ - %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 321a90e651..0da47943fd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2968,61 +2968,6 @@ script files.") #t)))))) (synopsis "High-level language for numerical computation (with GUI)"))) -(define-public opencascade-oce - (package - (name "opencascade-oce") - (version "0.17.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tpaviot/oce") - (commit (string-append "OCE-" version)))) - (file-name (git-file-name name version)) - (patches (search-patches "opencascade-oce-glibc-2.26.patch")) - (sha256 - (base32 "0rg5wzkvfmzfl6v2amyryb8dnjad0nn9kyr607wy2gch6rciah69")))) - (build-system cmake-build-system) - (arguments - '(#:configure-flags - (list "-DOCE_TESTING:BOOL=ON" - "-DOCE_USE_TCL_TEST_FRAMEWORK:BOOL=ON" - "-DOCE_DRAW:BOOL=ON" - (string-append "-DOCE_INSTALL_PREFIX:PATH=" - (assoc-ref %outputs "out")) - "-UCMAKE_INSTALL_RPATH"))) - (inputs - (list freetype - glu - libxmu - mesa - tcl - tk)) - (native-inputs - `(("python" ,python-wrapper))) - (home-page "https://github.com/tpaviot/oce") - (synopsis "Libraries for 3D modeling and numerical simulation") - (description - "Open CASCADE is a set of libraries for the development of applications -dealing with 3D CAD data or requiring industrial 3D capabilities. It includes -C++ class libraries providing services for 3D surface and solid modeling, CAD -data exchange, and visualization. It is used for development of specialized -software dealing with 3D models in design (CAD), manufacturing (CAM), -numerical simulation (CAE), measurement equipment (CMM), and quality -control (CAQ) domains. - -This is the ``Community Edition'' (OCE) of Open CASCADE, which gathers -patches, improvements, and experiments contributed by users over the official -Open CASCADE library.") - (license (list license:lgpl2.1; OCE libraries, with an exception for the - ; use of header files; see - ; OCCT_LGPL_EXCEPTION.txt - license:public-domain; files - ; src/Standard/Standard_StdAllocator.hxx and - ; src/NCollection/NCollection_StdAllocator.hxx - license:expat; file src/OpenGl/OpenGl_glext.h - license:bsd-3)))); test framework gtest - (define-public opencascade-occt (package (name "opencascade-occt") diff --git a/gnu/packages/patches/opencascade-oce-glibc-2.26.patch b/gnu/packages/patches/opencascade-oce-glibc-2.26.patch deleted file mode 100644 index ee5ed572c8..0000000000 --- a/gnu/packages/patches/opencascade-oce-glibc-2.26.patch +++ /dev/null @@ -1,62 +0,0 @@ -Fix build with glibc 2.26: - -https://github.com/tpaviot/oce/issues/675 - -Patch copied from upstream source repository: - -https://github.com/tpaviot/oce/commit/aa1321e68cc004e3debe38d79ae74581a617c767 - -From aa1321e68cc004e3debe38d79ae74581a617c767 Mon Sep 17 00:00:00 2001 -From: Janus Weil -Date: Mon, 18 Dec 2017 11:27:55 +0100 -Subject: [PATCH] fix build errors with glibc 2.26+ due to missing xlocale.h - (issue #675) - -* check for the presence of xlocale.h via cmake -* remove related logic from Standard_CLocaleSentry.hxx ---- - CMakeLists.txt | 1 + - src/Standard/Standard_CLocaleSentry.hxx | 15 --------------- - 2 files changed, 1 insertion(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b782b4101..50e9500b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -616,6 +616,7 @@ if (NOT WIN32) - # compilation anywhere in OCE - include(CheckIncludeFile) - check_include_file(strings.h HAVE_STRINGS_H) -+ check_include_file(xlocale.h HAVE_XLOCALE_H) - include(CheckIncludeFileCXX) - check_include_file_cxx(mm_malloc.h HAVE_MM_MALLOC_H) - check_include_file_cxx(atomic.h OCE_HAVE_ATOMIC_H) -diff --git a/src/Standard/Standard_CLocaleSentry.hxx b/src/Standard/Standard_CLocaleSentry.hxx -index 2b226e7f3..1a4c1dadc 100644 ---- a/src/Standard/Standard_CLocaleSentry.hxx -+++ b/src/Standard/Standard_CLocaleSentry.hxx -@@ -20,21 +20,6 @@ - - #include - --#ifndef HAVE_XLOCALE_H -- //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension -- //! and become part of POSIX since '2008. -- //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L) -- //! since POSIX didn't declared such identifier. -- #if defined(__APPLE__) -- #define HAVE_XLOCALE_H -- #endif -- -- //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. -- #if defined(_GNU_SOURCE) && !defined(__ANDROID__) -- #define HAVE_XLOCALE_H -- #endif --#endif // ifndef HAVE_LOCALE_H -- - #ifdef HAVE_XLOCALE_H - #include - #endif --- -2.15.1 - -- cgit 1.4.1 From fb2bf136f0e27b2b6fd48fb3bb38c121f81af7f9 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 6 Feb 2023 17:21:52 +0000 Subject: gnu: ddclient: Update to 3.10.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3.10.0 switched to autotools based build system. * gnu/packages/dns.scm (ddclient): Update to 3.10.0. [source]: Patch test-suite to skip tests that require networking. [build-system]: Switch to gnu-build-system. [native-inputs]: Remove bash. Move perl to inputs. [inputs]: Add perl, perl-io-socket-inet6, perl-json. Remove perl-data-validate-ip. [native-search-paths]: Add $SSL_CERT_DIR, $SSL_CERT_FILE. Required for SSL support. * gnu/packages/patches/ddclient-skip-test.patch: New file. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/dns.scm | 89 ++++++++++++--------------- gnu/packages/patches/ddclient-skip-test.patch | 43 +++++++++++++ 3 files changed, 82 insertions(+), 51 deletions(-) create mode 100644 gnu/packages/patches/ddclient-skip-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 51dea859a3..b432a95026 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1033,6 +1033,7 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ + %D%/packages/patches/ddclient-skip-test.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/dee-vapi.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 6eac4fa542..aa44de2d65 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Simon South ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,7 @@ #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -81,6 +83,7 @@ #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) @@ -1098,7 +1101,7 @@ LuaJIT, both a resolver library and a daemon.") (define-public ddclient (package (name "ddclient") - (version "3.9.1") + (version "3.10.0") (source (origin (method git-fetch) @@ -1107,62 +1110,46 @@ LuaJIT, both a resolver library and a daemon.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w")))) - (build-system trivial-build-system) ; no Makefile.PL + (base32 "0l87d72apwrg6ipc9gix5gv64d4hr1ykxmss8x4r8d8mgj6j8rf1")) + (modules '((guix build utils))) + (snippet + ;; XXX: erroneous version value, this is fixed in master + #~(begin + (substitute* "configure.ac" + (("3.10.0_2") #$version)))) + (patches (search-patches "ddclient-skip-test.patch")))) + (build-system gnu-build-system) (native-inputs - (list bash perl)) + (list autoconf automake libtool + perl-test-warnings perl-test-mockmodule)) (inputs (list inetutils ; logger net-tools - perl-data-validate-ip + bash-minimal ;for 'wrap-program' + perl perl-digest-sha1 - perl-io-socket-ssl)) + perl-io-socket-ssl + perl-io-socket-inet6 ;; XXX: this is likely to be removed in a future ddclient release + ;; https://github.com/ddclient/ddclient/issues/461 + perl-json)) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match) - (srfi srfi-26)) - (setenv "PATH" (string-append - (assoc-ref %build-inputs "bash") "/bin" ":" - (assoc-ref %build-inputs "perl") "/bin")) - - ;; Copy the (read-only) source into the (writable) build directory. - (copy-recursively (assoc-ref %build-inputs "source") ".") - - ;; Install. - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (let ((file "ddclient")) - (substitute* file - (("/usr/bin/perl") (which "perl")) - ;; Strictly use ‘/etc/ddclient/ddclient.conf’. - (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf") - (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf") - ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’ - (("\\$cachedir\\$program\\.cache") - "/var/cache/ddclient/ddclient.cache")) - (install-file file bin) - (wrap-program (string-append bin "/" file) - `("PATH" ":" = - ("$PATH" - ,@(map (lambda (input) - (match input - ((name . store) - (string-append store "/bin")))) - %build-inputs))) - `("PERL5LIB" ":" = - ,(delete - "" - (map (match-lambda - (((? (cut string-prefix? "perl-" <>) name) . dir) - (string-append dir "/lib/perl5/site_perl")) - (_ "")) - %build-inputs))))) - (for-each (cut install-file <> (string-append out - "/share/ddclient")) - (find-files "." "sample.*$")))))) + (list + #:configure-flags #~(list "--localstatedir=/var") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + ;; XXX: Do not create /var + (invoke "make" "localstatedir=/tmp/discard" "install"))) + (add-after 'wrap 'wrap-ddclient + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/ddclient") + `("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:)) + `("PATH" prefix ,(map (lambda (x) + (string-append (assoc-ref inputs x) "/bin")) + '("inetutils" "net-tools"))))))))) + (native-search-paths + (list $SSL_CERT_DIR $SSL_CERT_FILE)) (home-page "https://ddclient.net/") (synopsis "Address updating utility for dynamic DNS services") (description "This package provides a client to update dynamic IP diff --git a/gnu/packages/patches/ddclient-skip-test.patch b/gnu/packages/patches/ddclient-skip-test.patch new file mode 100644 index 0000000000..28d748997b --- /dev/null +++ b/gnu/packages/patches/ddclient-skip-test.patch @@ -0,0 +1,43 @@ +From e5657802025f238b39581534f3b4d408565c8943 Mon Sep 17 00:00:00 2001 +From: Bruno Victal +Date: Sun, 5 Feb 2023 21:05:00 +0000 +Subject: [PATCH] Disable sandbox incompatible tests. + +See: https://github.com/ddclient/ddclient/issues/465 +--- + t/get_ip_from_if.pl | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/t/get_ip_from_if.pl b/t/get_ip_from_if.pl +index 6f08e5d..d78c3d0 100644 +--- a/t/get_ip_from_if.pl ++++ b/t/get_ip_from_if.pl +@@ -39,25 +39,4 @@ subtest "get_ip_from_interface tests" => sub { + } + }; + +-subtest "Get default interface and IP for test system" => sub { +- my $interface = ddclient::get_default_interface(4); +- if ($interface) { +- isnt($interface, "lo", "Check for loopback 'lo'"); +- isnt($interface, "lo0", "Check for loopback 'lo0'"); +- my $ip1 = ddclient::get_ip_from_interface("default", 4); +- my $ip2 = ddclient::get_ip_from_interface($interface, 4); +- is($ip1, $ip2, "Check IPv4 from default interface"); +- ok(ddclient::is_ipv4($ip1), "Valid IPv4 from get_ip_from_interface($interface)"); +- } +- $interface = ddclient::get_default_interface(6); +- if ($interface) { +- isnt($interface, "lo", "Check for loopback 'lo'"); +- isnt($interface, "lo0", "Check for loopback 'lo0'"); +- my $ip1 = ddclient::get_ip_from_interface("default", 6); +- my $ip2 = ddclient::get_ip_from_interface($interface, 6); +- is($ip1, $ip2, "Check IPv6 from default interface"); +- ok(ddclient::is_ipv6($ip1), "Valid IPv6 from get_ip_from_interface($interface)"); +- } +-}; +- + done_testing(); +-- +2.38.1 + -- cgit 1.4.1 From a89aa4523befd8c30d9f13800b4833abbc911ba1 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 3 Feb 2023 20:14:12 -0500 Subject: utils: Add target-little-endian?. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/utils.scm (target-little-endian?): New function. * guix/build-system/meson.scm (make-machine-alist): Use it. * gnu/packages/chez.scm (nix-system->pbarch-machine-type): Likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/chez.scm | 9 ++++----- guix/build-system/meson.scm | 13 +++---------- guix/utils.scm | 8 ++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 0d22e2e20f..1f178d2c72 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Brendan Tildesley -;;; Copyright © 2021, 2022 Philip McGrath +;;; Copyright © 2021, 2022, 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -251,10 +251,9 @@ provided and is #f." (if (target-64bit? system) "64" "32") - ;; missing (guix utils) predicate target-little-endian? - (if (target-ppc32? system) - "b" - "l"))) + (if (target-little-endian? system) + "l" + "b"))) (define* (racket-cs-native-supported-system? #:optional (system diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index b0bf8cb6e6..7d413a991d 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -74,16 +74,9 @@ for TRIPLET." ;; for selecting optimisations, so set it to something ;; arbitrary. (#t "strawberries"))) - (endian . ,(cond ((string-prefix? "powerpc64le-" triplet) "little") - ((string-prefix? "mips64el-" triplet) "little") - ((target-x86-32? triplet) "little") - ((target-x86-64? triplet) "little") - ;; At least in Guix. Aarch64 and 32-bit arm - ;; have a big-endian mode as well. - ((target-arm? triplet) "little") - ((target-ppc32? triplet) "big") - ((target-riscv64? triplet) "little") - (#t (error "meson: unknown architecture")))))) + (endian . ,(if (target-little-endian? triplet) + "little" + "big")))) (define (make-binaries-alist triplet) "Make an associatoin list describing what should go into diff --git a/guix/utils.scm b/guix/utils.scm index aca0af4e4b..774b80cd25 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Taiju HIGASHI ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Antero Mejr +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,7 @@ target-riscv64? target-mips64el? target-64bit? + target-little-endian? ar-for-target as-for-target cc-for-target @@ -744,6 +746,12 @@ architecture (x86_64)?" (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "powerpc64" "riscv64"))) +(define* (target-little-endian? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET little-endian?" + ;; At least in Guix. Aarch64 and 32-bit arm have a big-endian mode as well. + (not (target-ppc32? target))) + (define* (ar-for-target #:optional (target (%current-target-system))) (if target (string-append target "-ar") -- cgit 1.4.1 From a404f5b64067d175410714a9a6819c8de3b4cd4a Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 2 Feb 2023 12:08:13 +0100 Subject: gnu: Add mcpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (mcpp): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6fa4c0f7a0..ed6ae69198 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1428,6 +1428,27 @@ queues header library based on circular buffer with @code{std::atomic}.") conversions to and from strings, iteration and related functionality.") (license license:expat))) +(define-public mcpp + (package + (name "mcpp") + (version "2.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mcpp/mcpp/" + "V." version "/mcpp-" version ".tar.gz")) + (sha256 + (base32 + "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags #~(list "--enable-mcpplib" "--disable-static"))) + (home-page "https://mcpp.sourceforge.net/") + (synopsis "C/C++ preprocessor") + (description + "@code{mcpp} is Matsui's CPP implementation precisely conformed to +standards.") + (license license:bsd-2))) + (define-public cli11 (package (name "cli11") -- cgit 1.4.1 From daad1dedd74105674fd0c4692b1f2061a767c40f Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 2 Feb 2023 12:08:56 +0100 Subject: gnu: Add libopenglrecorder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm (libopenglrecorder): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gl.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01ab6135a4..09aafcc1c3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -796,6 +796,32 @@ Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.") license:x11 license:expat)))) +(define-public libopenglrecorder + (package + (name "libopenglrecorder") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Benau/libopenglrecorder") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sfx2kdw2mca3mx4fnk1yy74pilp2i9npcpyj894qkngz5aaz2wl")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f)) ;no test suite + (native-inputs (list pkg-config)) + (inputs (list libjpeg-turbo)) + (home-page "https://github.com/Benau/libopenglrecorder") + (synopsis "Async readback OpenGL frame buffer with audio recording") + (description + "libopenglrecorder is a library allowing optional async readback OpenGL +frame buffer with optional audio recording. It will do video and audio +encoding together.") + (license license:bsd-3))) + (define-public soil (package (name "soil") -- cgit 1.4.1 From f944fa718dbfbfafecf30a71d9d4c31dc861996b Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 2 Feb 2023 12:13:28 +0100 Subject: gnu: supertuxkart: Update to 1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (supertuxkart): Update to 1.4. [snippet]: Unbundle mcpp. [arguments]: Enable recorder. [inputs]: Add libopenglrecorder. [native-inputs]: Add mcpp and python. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 87ef1c8233..9057910c7d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4082,7 +4082,7 @@ This package expects the game(s) to be placed in subdirectories of (define-public supertuxkart (package (name "supertuxkart") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) @@ -4091,7 +4091,7 @@ This package expects the game(s) to be placed in subdirectories of version "/SuperTuxKart-" version "-src.tar.xz")) (sha256 (base32 - "1z9z13zarv28h4jrmjna5hr6m9266pm7c2kgiwhqls01k06ypazf")) + "00qg5i9y4i5gdiiq1dbfsgp7dwj60zb5lkgi2d9p3x5s34j3k44q")) (modules '((guix build utils))) (snippet ;; Delete bundled library sources @@ -4099,10 +4099,11 @@ This package expects the game(s) to be placed in subdirectories of ;; Supertuxkart uses modified versions of the Irrlicht engine ;; and the bullet library. The developers gave an explanation ;; here: http://forum.freegamedev.net/viewtopic.php?f=17&t=3906 - ;; FIXME: try to unbundle angelscript, libmcpp and libraqm + ;; FIXME: try to unbundle angelscript and libraqm (for-each delete-file-recursively '("lib/dnsc" "lib/enet" + "lib/mcpp" "lib/mojoal" "lib/wiiuse")) #t)))) @@ -4115,15 +4116,14 @@ This package expects the game(s) to be placed in subdirectories of "-DUSE_CRYPTO_OPENSSL=TRUE" ;; In order to use the system ENet library, IPv6 support (added in ;; SuperTuxKart version 1.1) must be disabled. - "-DUSE_IPV6=FALSE" - ;; FIXME: needs libopenglrecorder - "-DBUILD_RECORDER=0"))) + "-DUSE_IPV6=FALSE"))) (inputs `(("curl" ,curl) ("freetype" ,freetype) ("fribidi" ,fribidi) ("glew" ,glew) ("harfbuzz" ,harfbuzz) + ("libopenglrecorder" ,libopenglrecorder) ("libvorbis" ,libvorbis) ("libx11" ,libx11) ("libxrandr" ,libxrandr) @@ -4137,8 +4137,7 @@ This package expects the game(s) to be placed in subdirectories of ("enet" ,enet) ("libjpeg" ,libjpeg-turbo) ("openssl" ,openssl))) - (native-inputs - (list pkg-config)) + (native-inputs (list mcpp pkg-config python)) (home-page "https://supertuxkart.net/Main_Page") (synopsis "3D kart racing game") (description "SuperTuxKart is a 3D kart racing game, with a focus on -- cgit 1.4.1 From c77a3d4554175ee5320ccc713aa21b1ba3e6b8a3 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 10 Feb 2023 12:32:12 +0400 Subject: gnu: emacs: Add TREE_SITTER_GRAMMAR_PATH support. gnu/packages/emacs.scm (emacs)[native-search-paths]: Add a search-path for tree-sitter grammars. gnu/packages/aux-files/emacs/guix-emacs.el: Add directories from TREE_SITTER_GRAMMAR_PATH to treesit-extra-load-path. --- gnu/packages/aux-files/emacs/guix-emacs.el | 7 +++++++ gnu/packages/emacs.scm | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 56dbcb8d67..708093267d 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -76,6 +76,13 @@ The files in the list do not have extensions (.el, .elc)." (when (file-directory-p pkg-dir) (package-load-descriptor pkg-dir))))))))))) +;; If emacs built with tree-sitter, read the value of the environment variable +;; to make tree-sitter grammars available in emacs out-of-the-box. +(with-eval-after-load 'treesit + (when-let ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH"))) + (mapcar (lambda (x) (add-to-list 'treesit-extra-load-path x)) + (split-string grammar-path ":")))) + (provide 'guix-emacs) ;;; guix-emacs.el ends here diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4ce41deb88..b6a66bafac 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -367,7 +367,15 @@ (files '("lib/emacs/native-site-lisp"))) (search-path-specification (variable "INFOPATH") - (files '("share/info"))))) + (files '("share/info"))) + ;; tree-sitter support is not yet available in emacs 28, but this + ;; search path won't harm and also will be beneficial for + ;; emacs-next and other emacs-* packages, which have tree-sitter + ;; support enabled. Please, remove this comment, when emacs + ;; package is updated to 29. + (search-path-specification + (variable "TREE_SITTER_GRAMMAR_PATH") + (files '("lib/tree-sitter"))))) (home-page "https://www.gnu.org/software/emacs/") (synopsis "The extensible, customizable, self-documenting text editor") -- cgit 1.4.1 From 63bf5ba1d82939eab6f2147b964fcd2c60182e24 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Tue, 7 Feb 2023 22:00:00 +0100 Subject: gnu: Add emacs-discover. * gnu/packages/emacs-xyz.scm (emacs-discover): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bbaafcc730..8c51d06059 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34723,6 +34723,29 @@ line. This minor mode provides an easy way to run it from Emacs on the current region or entire buffer.") (license license:gpl3+)))) +(define-public emacs-discover + (package + (name "emacs-discover") + (version "0.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/mickeynp/discover.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-makey)) + (home-page "https://github.com/mickeynp/discover.el") + (synopsis "Discover more of Emacs using context menus") + (description + "Discover adds context menus to commonly-used features in Emacs.") + (license license:gpl3+))) + (define-public emacs-nasm-mode (package (name "emacs-nasm-mode") -- cgit 1.4.1 From 0cd6746a66494264e883748131181bd4a9904788 Mon Sep 17 00:00:00 2001 From: Jake Leporte Date: Fri, 10 Feb 2023 14:14:27 -0600 Subject: gnu: Add emacs-ligature. * gnu/packages/emacs-xyz.scm (emacs-ligature): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8c51d06059..92b466d1de 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4879,6 +4879,32 @@ them whenever another command is invoked.") a command.") (license license:gpl3+))) +(define-public emacs-ligature + (let ((commit "3d1460470736777fd8329e4bb4ac359bf4f1460a") + (revision "1")) + (package + (name "emacs-ligature") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mickeynp/ligature.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rnx2mp8y1phnvfirmf4a6lza38dg2554r9igyijl9rgqpjax94d")))) + (build-system emacs-build-system) + (home-page "https://github.com/mickeynp/ligature.el") + (synopsis "Typographic ligatures in Emacs") + (description + "This package maps ordinary graphemes (characters) to fancy +ligatures, if both your version of Emacs and the font supports it. With this +package you can control where Emacs must display ligatures. That is useful if +you only want a subset of the ligatures in certain major modes, for instance, +or if you want to ensure that some modes have no ligatures at all.") + (license license:gpl3+)))) + (define-public emacs-olivetti (package (name "emacs-olivetti") -- cgit 1.4.1 From f46f058539eedd1c0fb82605ee74c160ce993a16 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 09:20:49 +0100 Subject: gnu: emacs-csv-mode: Update to 1.22. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.22. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 92b466d1de..0ed5758e8a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19308,14 +19308,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.21") + (version "1.22") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "csv-mode-" version ".tar")) (sha256 - (base32 "11f01lyz6i133njigg53r890cic8y13kz7dswc8mj7m60a316dmv")))) + (base32 "1f9pny1hkhdfmkmfpsk6ayjmb9p5hdpxpnmcprf51nfbvmi7ssig")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit 1.4.1 From 019f4116ea0b112d468973ea1d1c1badf5bea559 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 09:20:54 +0100 Subject: gnu: emacs-compat: Update to 29.1.3.3. * gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ed5758e8a..729c190969 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7920,14 +7920,14 @@ variables, and so on. The mode also allows you to execute Tup commands.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.3.2") + (version "29.1.3.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "0lzfqiimfpd22bv0pw3j6lgbd7ni1mah24jddwx96sf65s39f9hz")))) + "0jzdax1pi068bd9ly2svwyigk6x46gwj27lgdipjkx6jnx4323nw")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") -- cgit 1.4.1 From 222eef1999d60f33053e6069ecd4ea86a030834f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:30:21 +0100 Subject: gnu: open-adventure: Update to 1.12. * gnu/packages/games.scm (open-adventure): Update to 1.12. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9057910c7d..b6b52adc67 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6926,7 +6926,7 @@ at their peak of economic growth and military prowess. (define-public open-adventure (package (name "open-adventure") - (version "1.11") + (version "1.12") (source (origin (method git-fetch) @@ -6935,7 +6935,7 @@ at their peak of economic growth and military prowess. (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1n0fzrdlbc6px88qr574ww2q85xk43bv09jpmsskzv1l2cncwm37")))) + (base32 "07mg7cp12g27dw8sya17jqz6qp93q7c8zadsvym3w602z87g40in")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 8490327e53efc0317cea5f68be2c8d91ebb82330 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 11 Feb 2023 18:42:07 +0200 Subject: gnu: go-github-com-rakyll-statik: Fix building with go-1.18+. * gnu/packages/golang.scm (go-github-com-rakyll-statik)[source]: Add snippet to allow building with a newer go. --- gnu/packages/golang.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 22f6ec5e8c..10b8eea84b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2070,7 +2070,14 @@ for speed on short messages.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y0kbzma55vmyqhyrw9ssgvxn6nw7d0zg72a7nz8vp1zly4hs6va")))) + (base32 "0y0kbzma55vmyqhyrw9ssgvxn6nw7d0zg72a7nz8vp1zly4hs6va")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Fix compatibility with go-1.18+ + (substitute* "statik.go" + (("fmt\\.Println\\(helpText\\)") + "fmt.Print(helpText + \"\\n\")")))))) (build-system go-build-system) (arguments `(#:import-path "github.com/rakyll/statik")) -- cgit 1.4.1 From 48903df6cb979e8355e78716316c3ea576650e4a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 11 Feb 2023 19:05:02 +0200 Subject: gnu: go-github-com-biogo-hts-bam: Update to 1.4.4. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-bam): Update to 1.4.4. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5717b4844e..1e7ce7eb60 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2020, 2021 Roel Janssen -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016-2023 Efraim Flashner ;;; Copyright © 2016, 2020, 2022 Marius Bakke ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -18729,7 +18729,7 @@ useful for bioinformatic analysis.") (define-public go-github-com-biogo-hts-bam (package (name "go-github-com-biogo-hts-bam") - (version "1.4.3") + (version "1.4.4") (source (origin (method git-fetch) (uri (git-reference @@ -18738,7 +18738,7 @@ useful for bioinformatic analysis.") (file-name (git-file-name name version)) (sha256 (base32 - "013ga6ilc4m3hyfr3yyiva9g4vs81afhj73v2sy7r75b5zxw7lx1")))) + "1vkcqxyajghx5p5j7g2i376nbsxh8q2smk0smlv8mi34yr7hlw5b")))) (build-system go-build-system) (arguments '(#:import-path "github.com/biogo/hts/bam" -- cgit 1.4.1 From c8423a5457a846e42634a9a644916abfeceab5f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 11 Feb 2023 19:11:38 +0200 Subject: gnu: go-github-com-gatherstars-com-jwz: Update to 1.3.1. * gnu/packages/golang.scm (go-github-com-gatherstars-com-jwz): Update to 1.3.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 10b8eea84b..829b216cf3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11676,7 +11676,7 @@ library geared towards parsing MIME encoded emails.") (define-public go-github-com-gatherstars-com-jwz (package (name "go-github-com-gatherstars-com-jwz") - (version "1.3.0") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -11685,7 +11685,7 @@ library geared towards parsing MIME encoded emails.") (file-name (git-file-name name version)) (sha256 (base32 - "1h37h5w139d3rhvp1n7kz2jm5zhk4pjzf3sip04v48nphkika60c")))) + "1zxg2vmka80m1vnlb1v1gdlrwnkpakcmwi1hxpl8jjjiyd4z2j2i")))) (build-system go-build-system) (arguments (list #:import-path "github.com/gatherstars-com/jwz")) -- cgit 1.4.1 From 4d4fad681983a1a44da3a7a5c032cb26febd3ef2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 28 Jan 2023 14:21:12 +0100 Subject: gnu: php: Update to 8.2.2. * gnu/packages/php.scm (php): Update to 8.2.2. * gnu/packages/patches/php-curl-compat.patch: Remove file. * gnu/packages/patches/php-bug-74093-test.patch: Remove file. * gnu/packages/patches/php-fix-streams-copy-length.patch: New file. * gnu/local.mk (dist_patch_DATA): Remove them. Add it. --- gnu/local.mk | 3 +- gnu/packages/patches/php-bug-74093-test.patch | 48 -------------------- gnu/packages/patches/php-curl-compat.patch | 17 ------- .../patches/php-fix-streams-copy-length.patch | 52 ++++++++++++++++++++++ gnu/packages/php.scm | 46 ++++++++++++++----- 5 files changed, 88 insertions(+), 78 deletions(-) delete mode 100644 gnu/packages/patches/php-bug-74093-test.patch delete mode 100644 gnu/packages/patches/php-curl-compat.patch create mode 100644 gnu/packages/patches/php-fix-streams-copy-length.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index b432a95026..15cf5f74a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1627,6 +1627,7 @@ dist_patch_DATA = \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/pciutils-hurd-fix.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ + %D%/packages/patches/php-fix-streams-copy-length.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ %D%/packages/patches/pokerth-boost.patch \ @@ -1668,8 +1669,6 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ - %D%/packages/patches/php-bug-74093-test.patch \ - %D%/packages/patches/php-curl-compat.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ diff --git a/gnu/packages/patches/php-bug-74093-test.patch b/gnu/packages/patches/php-bug-74093-test.patch deleted file mode 100644 index 07b1949cef..0000000000 --- a/gnu/packages/patches/php-bug-74093-test.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c641825c64e42627a2c9cac969b371ed532e0b57 Mon Sep 17 00:00:00 2001 -From: Ryan Sundberg -Date: Mon, 4 Oct 2021 20:12:25 -0700 -Subject: [PATCH] Zend/tests/bug74093.phpt: Fix failing test case - -This test case fails (on non-Windows hosts, where it is enabled) due -to mismatching output in the error log language. This fixes the -expectation, and also rewrites the test procedure in a more stable -fashion. - -The objective of the test case is to run a program that exceeds -the max_execution_time and verify that the process was aborted. The -previous implementation tested this using a loop on array_intersect with -large enough inputs to "probably" take enough time to trigger -max_execution_time to abort it. With faster CPUs, over time this test -can become flaky. Instead we simply spin a loop until enough -wall clock time has passed to check our assertion. ---- - Zend/tests/bug74093.phpt | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt -index 7f20285805..32eb445ddc 100644 ---- a/Zend/tests/bug74093.phpt -+++ b/Zend/tests/bug74093.phpt -@@ -1,5 +1,5 @@ - --TEST-- --Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log) -+Bug #74093 (Maximum execution time exceeded not written in error_log) - --SKIPIF-- - - --EXPECTF-- --Fatal error: Maximum execution time of 1+1 seconds exceeded %s -+Fatal error: Maximum execution time of 1 second exceeded in %s --- -2.31.1 diff --git a/gnu/packages/patches/php-curl-compat.patch b/gnu/packages/patches/php-curl-compat.patch deleted file mode 100644 index 0617251194..0000000000 --- a/gnu/packages/patches/php-curl-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix test result with cURL 7.83 and later. - -Taken from upstream: - - https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af - -diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt -index 3b53658d6a7e..3834e4674f82 100644 ---- a/ext/curl/tests/curl_basic_007.phpt -+++ b/ext/curl/tests/curl_basic_007.phpt -@@ -20,5 +20,5 @@ curl_close($ch); - - ?> - --EXPECTF-- --string(%d) "No URL set!%w" -+string(%d) "No URL set%A" - int(3) diff --git a/gnu/packages/patches/php-fix-streams-copy-length.patch b/gnu/packages/patches/php-fix-streams-copy-length.patch new file mode 100644 index 0000000000..d68f658071 --- /dev/null +++ b/gnu/packages/patches/php-fix-streams-copy-length.patch @@ -0,0 +1,52 @@ +From cddcc10becb013ae498ea9c2836792f407b61678 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Tue, 7 Feb 2023 22:55:59 +0100 +Subject: [PATCH] Fix file corruption when using copy_file_range. + +This patch is adapted from https://github.com/php/php-src/pull/10440. +--- + main/streams/streams.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/main/streams/streams.c b/main/streams/streams.c +index 20029fc7..68dc76c5 100644 +--- a/main/streams/streams.c ++++ b/main/streams/streams.c +@@ -1634,8 +1634,21 @@ PHPAPI zend_result _php_stream_copy_to_stream_ex(php_stream *src, php_stream *de + char *p; + + do { +- size_t chunk_size = (maxlen == 0 || maxlen > PHP_STREAM_MMAP_MAX) ? PHP_STREAM_MMAP_MAX : maxlen; +- size_t mapped; ++ /* We must not modify maxlen here, because otherwise the file copy fallback below can fail */ ++ size_t chunk_size, must_read, mapped; ++ if (maxlen == 0) { ++ /* Unlimited read */ ++ must_read = chunk_size = PHP_STREAM_MMAP_MAX; ++ } else { ++ must_read = maxlen - haveread; ++ if (must_read >= PHP_STREAM_MMAP_MAX) { ++ chunk_size = PHP_STREAM_MMAP_MAX; ++ } else { ++ /* In case the length we still have to read from the file could be smaller than the file size, ++ * chunk_size must not get bigger the size we're trying to read. */ ++ chunk_size = must_read; ++ } ++ } + + p = php_stream_mmap_range(src, php_stream_tell(src), chunk_size, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped); + +@@ -1667,8 +1680,8 @@ PHPAPI zend_result _php_stream_copy_to_stream_ex(php_stream *src, php_stream *de + return SUCCESS; + } + if (maxlen != 0) { +- maxlen -= mapped; +- if (maxlen == 0) { ++ must_read -= mapped; ++ if (must_read == 0) { + return SUCCESS; + } + } +-- +2.38.1 + diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 645a8edee1..e0cd47b846 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -61,17 +61,17 @@ (define-public php (package (name "php") - (version "7.4.30") - (home-page "https://secure.php.net/") + (version "8.2.2") + (home-page "https://www.php.net/") (source (origin (method url-fetch) (uri (string-append home-page "distributions/" "php-" version ".tar.xz")) (sha256 (base32 - "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa")) - (patches (search-patches "php-bug-74093-test.patch" - "php-curl-compat.patch")) + "0czflx9ikxymjfgnzaifjx9kc30ww2x4063075hcifjjwqwami5x")) + (patches + (search-patches "php-fix-streams-copy-length.patch")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -83,8 +83,7 @@ ;;"bcmath/libbcmath" ;;"fileinfo/libmagic" ; a patched version of libmagic '("gd/libgd" - "pcre/pcre2lib" - "xmlrpc/libxmlrpc")))))) + "pcre/pcre2lib")))))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -176,12 +175,13 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) - ,@(if (string-prefix? "arm" (or (%current-system) - (%current-target-system))) + ,@(if (target-arm32?) ;; Drop tests known to fail on armhf. '((for-each delete-file (list "ext/calendar/tests/unixtojd_error1.phpt" + "ext/opcache/tests/preload_006.phpt" + "ext/opcache/tests/preload_011.phpt" ;; arm can be a lot slower, so a time-related test fails "ext/fileinfo/tests/cve-2014-3538-nojit.phpt" "ext/pcntl/tests/pcntl_unshare_01.phpt" @@ -199,6 +199,13 @@ "Zend/tests/concat_003.phpt"))) '()) + ,@(if (target-x86-32?) + ;; Drop tests known to fail on i686. + '((for-each delete-file + (list + "ext/dba/tests/dba_gdbm.phpt"))) + '()) + ,@(if (target-ppc64le?) ;; Drop tests known to fail on powerpc64le. '((for-each delete-file @@ -272,8 +279,6 @@ ;; Some WebP related tests fail. "ext/gd/tests/webp_basic.phpt" "ext/gd/tests/imagecreatefromstring_webp.phpt" - ;; Expected error message, but from the wrong function - "ext/gd/tests/bug77269.phpt" ;; TODO: Enable these when libgd is built with xpm support. "ext/gd/tests/xpm2gd.phpt" "ext/gd/tests/xpm2jpg.phpt" @@ -291,6 +296,14 @@ ;; The following test fails with "The image size ;; differs: expected 114x115, got 117x117". "ext/gd/tests/bug79068.phpt" + ;; AVIF support disabled + "ext/gd/tests/avif_decode_encode.phpt" + ;; Typo in expected outputs + "ext/gd/tests/bug72339.phpt" + "ext/gd/tests/bug77272.phpt" + "ext/gd/tests/bug66356.phpt" + ;; AVIF support disabled + "ext/gd/tests/imagecreatefromstring_avif.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. @@ -310,6 +323,17 @@ ;; XXX: These test failures appear legitimate, needs investigation. ;; open_basedir() restriction failure. "ext/curl/tests/bug61948-unix.phpt" + ;; Same error reason but error code slightly different + "ext/curl/tests/curl_setopt_ssl.phpt" + + ;; Fail because there is no "root" in the build container's + ;; /etc/passwd + "sapi/fpm/tests/bug68591-conf-test-group.phpt" + "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt" + "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt" + + ;; Wrong error name + "ext/dba/tests/dba_gdbm_creation_matrix.phpt" ;; Expects a false boolean, gets empty array from glob(). "ext/standard/tests/file/bug41655_1.phpt" "ext/standard/tests/file/glob_variation5.phpt" -- cgit 1.4.1 From 12e2d5d3e13a22ee55dbd6d6cc55e9164ecba287 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:10:17 +0100 Subject: gnu: asymptote: Update to 2.85. * gnu/packages/plotutils.scm (asymptote): Update to 2.85. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index d98f7fce2f..fd40f79c73 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -272,14 +272,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.84") + (version "2.85") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "1nycdmlhs3r1qj5miww19683qqjf4hihsjwzwjj1q4mq0hnp0rb7")) + (base32 "11zcfnc80sbh10w53j4rwnmz0g5xj78b8i7hzfslgya15jv5j1ac")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. -- cgit 1.4.1 From 3b0c792fa3f2305fbec3bca518844b91d7b102c0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:27:06 +0100 Subject: gnu: naev: Update to 0.10.4. * gnu/packages/games.scm (naev): Update to 0.10.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b6b52adc67..be2b158f40 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7930,7 +7930,7 @@ ncurses for text display.") (define-public naev (package (name "naev") - (version "0.10.3") + (version "0.10.4") (source (origin (method git-fetch) @@ -7940,7 +7940,7 @@ ncurses for text display.") (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0hqc2j7lf5ay461l164c63jncmjdvnkm2nf90246njimhz2in056")))) + (base32 "0lg8cmzdzzpmqgmh9a1v190vv4d15hwa0inyzdwsq5x8lyc13hyr")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. -- cgit 1.4.1 From 1105c95e448cc807214a5414c27c33458dc35d9e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:33:09 +0100 Subject: gnu: pyzo: Update to 4.12.7. * gnu/packages/python-xyz.scm (pyzo): Update to 4.12.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15f1a80fed..445f5a787d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27011,7 +27011,7 @@ accessor layer.") (define-public pyzo (package (name "pyzo") - (version "4.12.5") + (version "4.12.7") (source (origin (method git-fetch) @@ -27021,7 +27021,7 @@ accessor layer.") (file-name (git-file-name name version)) (sha256 (base32 - "0938dk9z1l248756h4z08si4n1i2rj02lbwgd04x49p97iclgwrn")))) + "15c92l0g3fziyn6cmjrbr57bz70cz8w282yjb370r36x2bpykbii")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 29f04bbe4e6651f972f88658af95706f4e03987e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:36:06 +0100 Subject: gnu: lagrange: Update to 1.15.2. * gnu/packages/web-browsers.scm (lagrange): Update to 1.15.2. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d69b237071..b898311c51 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -706,7 +706,7 @@ is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.15.1") + (version "1.15.2") (source (origin (method url-fetch) @@ -714,7 +714,7 @@ is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "04596gbi6fpz555dclhd2z1q60myk3ypc37v3g9brfm1kmbpssac")) + (base32 "1xgdarwc8cpwb4rcbasdbc2nn5mcvwl7fz7v70x974wpf5xjmd3k")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 0d60bbd104fb1e8efe1637f0cc130e3e668a1100 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 10 Feb 2023 17:01:59 +0000 Subject: gnu: mympd: Update to 10.2.2. * gnu/packages/mpd.scm (mympd): Update to 10.2.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 4df2dfd655..0e8f5e616b 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -597,7 +597,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "10.2.1") + (version "10.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -606,7 +606,7 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "1zici4sfpd2hra14dy7vp2x0w3i46a2d422inkixkp4cpm14rj9s")))) + "04nq2gwqs99iivb7xkqh6bi8rwfx9krgxfn8xiwyfwmzcbq7hyp0")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no test target -- cgit 1.4.1 From f31691efb1b711a4e9159e9210798f2af5c666b5 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Fri, 10 Feb 2023 07:01:11 -0800 Subject: gnu: doctl: Update to 1.92.1. * gnu/packages/admin.scm (doctl): Update to 1.92.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9a82740eb6..3d0886aba8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Andreas Rammhold ;;; Copyright © 2022 ( -;;; Copyright © 2022 Matthew James Kraai +;;; Copyright © 2022, 2023 Matthew James Kraai ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Juliana Sims ;;; @@ -5717,7 +5717,7 @@ file or files to several hosts.") (define-public doctl (package (name "doctl") - (version "1.92.0") + (version "1.92.1") (source (origin (method git-fetch) (uri (git-reference @@ -5726,7 +5726,7 @@ file or files to several hosts.") (file-name (git-file-name name version)) (sha256 (base32 - "0n8xajr9s0y7a43is24q0f9nznmr2sjhlhgg9fpyx4s4nr3s5yqw")))) + "1zb7vx7nqg8q9vdgb90cwmrr1cijv8gfryni8yrd99bb9vgg6pyv")))) (build-system go-build-system) (arguments (list #:import-path "github.com/digitalocean/doctl/cmd/doctl" -- cgit 1.4.1 From 55839e35374ee4cbda375362f569af8f553d4892 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 9 Feb 2023 09:35:55 -0600 Subject: gnu: qbe: Update to 1.1. * gnu/packages/c.scm (qbe): Update to 1.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 9a2b6cdaef..d6bd8c194a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -255,7 +255,7 @@ compiler while still keeping it small, simple, fast and understandable.") (define-public qbe (package (name "qbe") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) (uri (git-reference @@ -264,7 +264,7 @@ compiler while still keeping it small, simple, fast and understandable.") (file-name (git-file-name name version)) (sha256 (base32 - "0qx4a3fjjrp2m4dsn19rpbjf89k9w7w7l09s96jx8vv15vzsdgis")))) + "07nl1kdgpz7hwfkng0yy4xihk0fmv1a2hq9bxzgvhy3vk9r7fmn8")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 50fe202916ef039fd2d9f810c2f248219ca484a6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 11 Feb 2023 19:36:26 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-38.6be113f. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-38.6be113f. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a2c4709855..7e49f798ea 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4762,8 +4762,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") license:freebsd-doc)))) ; documentation (define-public guix-data-service - (let ((commit "3ba841865663429392f869aedcd8f1fb63f278db") - (revision "37")) + (let ((commit "6be113f99d52cc284ecd0ed07fc88df5ea7bf718") + (revision "38")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4775,7 +4775,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0dlnak09asf4w3nb6rv57721y0hqqlymzj28zs2y45b5fnxq2fqr")))) + "0y2dp83v0180vh33v56rbcqkl2qx8n8by3z2j6fx9ghv7dx5skbp")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 9b1d051e6f62a10539b893f44746124edd708ee0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 11 Feb 2023 19:37:21 +0000 Subject: gnu: nar-herder: Update to 0-16.f62a2b3. * gnu/packages/package-management.scm (nar-herder): Update to 0-16.f62a2b3. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 19c3b363ba..b492e37541 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1667,8 +1667,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "39cf2280bb87a2f177b4cb8334c5eb7ad95a0d17") - (revision "15")) + (let ((commit "f62a2b3b48ecebf01b0cbd8ddd11e1a45cb27804") + (revision "16")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1679,7 +1679,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "0g94ld46cdd3qq95w4bxyp537kmjxbsmda089sgyyva6173glkml")) + "1j6cpvnq48kywx90y8r24pwhz3bmyzjiwyilbqzz36z2yhjxpq7z")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From ade3bfd0361bfd62ef8faef6eb1ae9f776f6148b Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 10 Feb 2023 08:16:54 -0500 Subject: gnu: yosys: Do not propagate any inputs. * gnu/packages/fpga.scm (yosys)[arguments]<#:phases>: Patch reference to z3 in "fix-paths" phase; in "use-external-abc" phase, use complete path to "abc" executable in store. [propagated-inputs]: Remove, moving abc and z3 from here... [inputs]: ...to here. Signed-off-by: Christopher Baines --- gnu/packages/fpga.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 7b3c522bf7..4a01714e81 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -159,6 +159,9 @@ For synthesis, the compiler generates netlists in the desired format.") #~(modify-phases %standard-phases (add-before 'configure 'fix-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "./backends/smt2/smtio.py" + (("\\['z3") + (string-append "['" (search-input-file inputs "/bin/z3")))) (substitute* "./passes/cmds/show.cc" (("exec xdot") (string-append "exec " (search-input-file inputs @@ -171,9 +174,11 @@ For synthesis, the compiler generates netlists in the desired format.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "config-gcc" make-flags))) (add-after 'configure 'use-external-abc - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("./Makefile") - (("ABCEXTERNAL \\?=") "ABCEXTERNAL = abc")))) + (("ABCEXTERNAL \\?=") + (string-append "ABCEXTERNAL = " + (search-input-file inputs "/bin/abc")))))) (add-before 'check 'fix-iverilog-references (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((iverilog (search-input-file (or native-inputs inputs) @@ -211,15 +216,14 @@ For synthesis, the compiler generates netlists in the desired format.") python tcl)) ; tclsh for the tests (inputs - (list graphviz + (list abc + graphviz libffi psmisc readline tcl - xdot)) - (propagated-inputs - (list abc - z3)) ; should be in path for yosys-smtbmc + xdot + z3)) (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") (description "Yosys synthesizes Verilog-2005.") -- cgit 1.4.1 From 8553148dfb91a9957b95c7bc6bc108cc0a973f9e Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 10 Feb 2023 08:16:55 -0500 Subject: gnu: yosys: Update to 0.26. * gnu/packages/fpga.scm (yosys): Update to 0.26. [source]: Disable unnecessary recursive checkout. [arguments]<#:phases>: Expand "fix-paths" phase to match new version; remove obsolete "fix-iverilog-references" phase; add wrap phase. [inputs]: Add gtkwave, zlib, python, python-click. Signed-off-by: Christopher Baines --- gnu/packages/fpga.scm | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 4a01714e81..cc7420f37f 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -137,16 +137,15 @@ For synthesis, the compiler generates netlists in the desired format.") (define-public yosys (package (name "yosys") - (version "0.9") + (version "0.26") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/YosysHQ/yosys") - (commit (string-append "yosys-" version)) - (recursive? #t))) ; for the ‘iverilog’ submodule + (commit (string-append "yosys-" version)))) (sha256 - (base32 - "0lb9r055h8y1vj2z8gm4ip0v06j5mk7f9zx9gi67kkqb7g4rhjli")) + (base32 + "0s79ljgbcfkm7l9km7dcvlz4mnx38nbyxppscvh5il5lw07n45gx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -162,7 +161,11 @@ For synthesis, the compiler generates netlists in the desired format.") (substitute* "./backends/smt2/smtio.py" (("\\['z3") (string-append "['" (search-input-file inputs "/bin/z3")))) - (substitute* "./passes/cmds/show.cc" + (substitute* "./kernel/fstdata.cc" + (("vcd2fst") + (search-input-file inputs "/bin/vcd2fst"))) + (substitute* '("./passes/cmds/show.cc" + "./passes/cmds/viz.cc") (("exec xdot") (string-append "exec " (search-input-file inputs "/bin/xdot"))) @@ -179,26 +182,6 @@ For synthesis, the compiler generates netlists in the desired format.") (("ABCEXTERNAL \\?=") (string-append "ABCEXTERNAL = " (search-input-file inputs "/bin/abc")))))) - (add-before 'check 'fix-iverilog-references - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((iverilog (search-input-file (or native-inputs inputs) - "/bin/iverilog"))) - (substitute* '("./manual/CHAPTER_StateOfTheArt/synth.sh" - "./manual/CHAPTER_StateOfTheArt/validate_tb.sh" - "./techlibs/ice40/tests/test_bram.sh" - "./techlibs/ice40/tests/test_ffs.sh" - "./techlibs/xilinx/tests/bram1.sh" - "./techlibs/xilinx/tests/bram2.sh" - "./tests/bram/run-single.sh" - "./tests/realmath/run-test.sh" - "./tests/simple/run-test.sh" - "./tests/techmap/mem_simple_4x1_runtest.sh" - "./tests/tools/autotest.sh" - "./tests/vloghtb/common.sh") - (("if ! which iverilog") "if ! true") - (("iverilog ") (string-append iverilog " ")) - (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\"" - iverilog "\"")))))) (add-after 'install 'add-symbolic-link (lambda* (#:key inputs #:allow-other-keys) ;; Previously this package provided a copy of the "abc" @@ -206,7 +189,11 @@ For synthesis, the compiler generates netlists in the desired format.") ;; symbolic link so any external uses of that name continue to ;; work. (symlink (search-input-file inputs "/bin/abc") - (string-append #$output "/bin/yosys-abc"))))))) + (string-append #$output "/bin/yosys-abc")))) + (add-after 'install 'wrap + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/yosys-witness") + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))))))) (native-inputs (list bison flex @@ -218,12 +205,16 @@ For synthesis, the compiler generates netlists in the desired format.") (inputs (list abc graphviz + gtkwave libffi psmisc readline tcl xdot - z3)) + z3 + zlib + python + python-click)) (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") (description "Yosys synthesizes Verilog-2005.") -- cgit 1.4.1 From e2deccf6e405e0f01a1a3f612f353a4f5ad09737 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 15 Jan 2023 01:45:43 +0000 Subject: gnu: libavif: Update to 0.11.1. libavif commit 97306bf64266cf9571dd141f3d04492534a9deea removes JSON-based tests along with cJSON. Aditionally, googletest is now required to build libavif. The test target has since changed and can be called directly from cmake, no longer being necessary to replace 'check target. * gnu/packages/image.scm (libavif): Update to 0.11.1. [arguments]: Adjust configure-flags, remove 'check phase replacement. [native-inputs]: Add googletest. [license]: Remove expat. Signed-off-by: Christopher Baines --- gnu/packages/image.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6b25da28ef..09b5a0ad8b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2153,7 +2153,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (define-public libavif (package (name "libavif") - (version "0.9.2") + (version "0.11.1") (source (origin (method git-fetch) (uri (git-reference @@ -2162,7 +2162,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (file-name (git-file-name name version)) (sha256 (base32 - "1yxmgjlxm1srm98zyj79bj8r8vmg67daqnq0ggcvxknq54plkznk")))) + "02zmb62g0yx6rfz4w1isyzfrckv5i7dzyz26rp2mspbx9w6v8j4r")))) (build-system cmake-build-system) (arguments (list @@ -2171,13 +2171,10 @@ This package can be used to create @code{favicon.ico} files for web sites.") #$@(if (this-package-input "rav1e") '("-DAVIF_CODEC_RAV1E=ON") '()) - "-DAVIF_BUILD_TESTS=ON" "-DAVIF_BUILD_APPS=ON") + "-DAVIF_BUILD_TESTS=ON" "-DAVIF_ENABLE_GTEST=ON" + "-DAVIF_BUILD_APPS=ON") #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "./aviftest" "../source/tests/data")))) (add-after 'install 'install-readme (lambda _ (let ((doc (string-append #$output "/share/doc/libavif-" #$version))) @@ -2196,6 +2193,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (chmod new #o555)) (list avifenc avifdec) (list avifenc* avifdec*)))))))) + (native-inputs (list googletest)) (inputs (append (if (member (%current-system) (package-transitive-supported-systems rav1e)) @@ -2208,8 +2206,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") File Format}. It can encode and decode all YUV formats and bit depths supported by AOM, including with alpha.") (home-page "https://github.com/AOMediaCodec/libavif") - (license (list license:bsd-2 ; libavif itself - license:expat)))) ; cJSON in the test suite + (license (list license:bsd-2)))) (define-public libheif (package -- cgit 1.4.1 From d5fb87812005bf277e5b3b068773f4e7c4cc5de2 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 15 Jan 2023 01:51:17 +0000 Subject: gnu: libavif: Add pixbuf-loader output. * gnu/packages/image.scm (libavif)[arguments]: Build gdk-pixbuf loader. [outputs]: Add 'pixbuf-loader' output. [inputs]: Add gdk-pixbuf. [native-inputs]: Add pkg-config. Signed-off-by: Christopher Baines --- gnu/packages/image.scm | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 09b5a0ad8b..42b7ee055e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( -;;; Copyright © 2022 Bruno Victal +;;; Copyright © 2022-2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -2166,15 +2166,23 @@ This package can be used to create @code{favicon.ico} files for web sites.") (build-system cmake-build-system) (arguments (list + #:modules '((guix build cmake-build-system) + (guix build utils) + (srfi srfi-26)) #:configure-flags #~(list "-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON" #$@(if (this-package-input "rav1e") '("-DAVIF_CODEC_RAV1E=ON") '()) "-DAVIF_BUILD_TESTS=ON" "-DAVIF_ENABLE_GTEST=ON" - "-DAVIF_BUILD_APPS=ON") + "-DAVIF_BUILD_APPS=ON" "-DAVIF_BUILD_GDK_PIXBUF=ON") #:phases #~(modify-phases %standard-phases + (add-before 'configure 'patch-thumbnailer + (lambda _ + (substitute* "contrib/gdk-pixbuf/avif.thumbnailer.in" + (("@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer") + (string-append #$gdk-pixbuf "/bin/gdk-pixbuf-thumbnailer"))))) (add-after 'install 'install-readme (lambda _ (let ((doc (string-append #$output "/share/doc/libavif-" #$version))) @@ -2184,23 +2192,46 @@ This package can be used to create @code{favicon.ico} files for web sites.") (let* ((avifenc (string-append #$output "/bin/avifenc")) (avifenc* (string-append #$output:tools "/bin/avifenc")) (avifdec (string-append #$output "/bin/avifdec")) - (avifdec* (string-append #$output:tools "/bin/avifdec"))) + (avifdec* (string-append #$output:tools "/bin/avifdec")) + + (thumbnailer (string-append + #$output + "/share/thumbnailers/avif.thumbnailer")) + (thumbnailer* (string-append + #$output:pixbuf-loader + "/share/thumbnailers/avif.thumbnailer")) + (pixbuf-loader (string-append + #$output + "/lib/gdk-pixbuf-2.0/2.10.0/loaders/" + "libpixbufloader-avif.so")) + (pixbuf-loader* (string-append + #$output:pixbuf-loader + "/lib/gdk-pixbuf-2.0/2.10.0/loaders/" + "libpixbufloader-avif.so"))) (mkdir-p (string-append #$output:tools "/bin")) + (for-each (compose mkdir-p + (cut string-append + #$output:pixbuf-loader <>)) + '("/share/thumbnailers" + "/lib/gdk-pixbuf-2.0/2.10.0/loaders/")) (for-each (lambda (old new) (copy-file old new) (delete-file old) (chmod new #o555)) - (list avifenc avifdec) - (list avifenc* avifdec*)))))))) - (native-inputs (list googletest)) + (list avifenc avifdec + thumbnailer pixbuf-loader) + (list avifenc* avifdec* + thumbnailer* pixbuf-loader*)))))))) + (native-inputs (list googletest pkg-config)) (inputs (append (if (member (%current-system) (package-transitive-supported-systems rav1e)) (list rav1e) '()) - (list dav1d libaom zlib libpng libjpeg-turbo))) + (list dav1d libaom zlib libpng libjpeg-turbo gdk-pixbuf))) (outputs (list "out" - "tools")) ; avifenc & avifdec + "tools" ; avifenc & avifdec + "pixbuf-loader")) (synopsis "Encode and decode AVIF files") (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image File Format}. It can encode and decode all YUV formats and bit depths supported -- cgit 1.4.1 From 940033b685d9e328e254d249bd175ba268829330 Mon Sep 17 00:00:00 2001 From: Martin Marshall Date: Mon, 6 Feb 2023 22:27:34 -0500 Subject: gnu: footswitch: Update to 1.0-0.e455d67. This update adds 3 newly supported devices and an additional command to the package. * gnu/packages/accessibility.scm (footswitch): Update to commit e455d6752221. Signed-off-by: Christopher Baines --- gnu/packages/accessibility.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 63f06f7460..fb9387e324 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -245,11 +245,11 @@ available to help to click.") (license license:gpl2+))) (define-public footswitch - (let ((commit "ca43d53fc2002520cc825d119702afc124303e73") - (revision "2")) + (let ((commit "e455d6752221b9e9c3818cc304c873b9c2792490") + (revision "0")) (package (name "footswitch") - (version (git-version "0.1" revision commit)) + (version (git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -258,7 +258,7 @@ available to help to click.") (file-name (git-file-name name version)) (sha256 (base32 - "14pyzc4ws1mj859xs9n4x83wzxxvd3bh5bdxzr6nv267xwx1mq68")))) + "0xkk60sg3szpgbl3z8djlpagglsldv9viqibsih6wcnbhikzlc6j")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) @@ -278,11 +278,13 @@ available to help to click.") (install-file "scythe" bin) #t)))))) (home-page "https://github.com/rgerganov/footswitch") - (synopsis "Command line utility for PCsensor foot switch") + (synopsis "Command line utilities for PCsensor and Scythe foot switches") (description - "Command line utility for programming foot switches sold by PCsensor. -It works for both single pedal devices and three pedal devices. All supported -devices have vendorId:productId = 0c45:7403 or 0c45:7404.") + "This package provides command line utilities for programming PCsensor +and Scythe foot switches. It works for both single pedal and three pedal +devices. The \"footswitch\" command programs devices with vendorId:productId +combinations matching 0c45:7403, 0c45:7404, 413d:2107, and 1a86:e026. The +\"scythe\" command programs switches matching 0426:3011.") (license license:expat)))) (define-public xmagnify -- cgit 1.4.1 From d455a18fab68b6a7a26c742c2fab55c803d02738 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 6 Feb 2023 22:38:02 -0500 Subject: gnu: ell: Update to 0.56. * gnu/packages/linux.scm (ell): Update to 0.56. Signed-off-by: Christopher Baines --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 639ae5b558..4130cdb4ed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9151,7 +9151,7 @@ tools for managing PipeWire.") (define-public ell (package (name "ell") - (version "0.54") + (version "0.56") (source (origin (method git-fetch) (uri (git-reference @@ -9160,7 +9160,7 @@ tools for managing PipeWire.") (file-name (git-file-name name version)) (sha256 (base32 - "1vsv5ibiyli1cvk32l5avms6ngv6i0jxxqd5vw5kbfcp6ph94brs")))) + "084mc9377k2a61wyqnfnsgfrdvv1rinn9wzw8l8crip0hlikn938")))) (build-system gnu-build-system) (arguments ;; Tests launch dbus-daemon instances that all try to bind to -- cgit 1.4.1 From 7fbdb403d9c0374630da43fffd20cc7df0d734a1 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 6 Feb 2023 22:38:03 -0500 Subject: gnu: iwd: Update to 2.3. * gnu/packages/networking.scm (iwd): Update to 2.3. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a9ea07d7b1..44e2de5f08 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3909,7 +3909,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.") (define-public iwd (package (name "iwd") - (version "2.0") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -3918,7 +3918,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.") (file-name (git-file-name name version)) (sha256 (base32 - "0icrmd0361yy24sa7wdd388ykaknv1va4678h9ksysz1dmykdr7m")))) + "1hp38rh6vpfxkx2f036719b0v9g9yj169l8fd9l9lncqpjbz73y4")))) (build-system gnu-build-system) (inputs (list dbus ell (package-source ell) readline)) -- cgit 1.4.1 From b1cca2126408948e3187f8664711c90892edcb23 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 8 Feb 2023 15:46:10 +0800 Subject: gnu: libtorrent-rasterbar: Update to 1.2.18. * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 1.2.18. Signed-off-by: Christopher Baines --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index db5237c997..c3257cf2bf 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -385,7 +385,7 @@ and will take advantage of multiple processor cores where possible.") (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.15") + (version "1.2.18") (source (origin (method url-fetch) @@ -394,7 +394,7 @@ and will take advantage of multiple processor cores where possible.") "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0jr1c876mvwbbbnav8ldcdm1l6z3g404jc5wp8z902jcd0w8dbf8")))) + (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" @@ -416,7 +416,7 @@ and will take advantage of multiple processor cores where possible.") ;; 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-12-12" + (invoke "faketime" "2022-10-24" "ctest" "--exclude-regex" (string-join disabled-tests "|") "-j" (if parallel-tests? -- cgit 1.4.1 From 5345cf2fbfcfeebfa8413a14fb8dc77bb6ab532f Mon Sep 17 00:00:00 2001 From: Remco van 't Veer Date: Thu, 9 Feb 2023 18:36:23 +0100 Subject: gnu: ruby-3.2: Update to 3.2.1 * gnu/packages/ruby.scm (ruby-3.2): Update to 3.2.1 Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 540aab23af..4750049227 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -240,7 +240,7 @@ a focus on simplicity and productivity.") (define-public ruby-3.2 (package (inherit ruby-3.1) - (version "3.2.0") + (version "3.2.1") (source (origin (method url-fetch) @@ -249,7 +249,7 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "1d18ifvdbf21cncpany948vc2gjw3qa36ck9b4i97pg60rrmgx6j")))) + "0333xln2jkqdfk5zwxas6rpyd4rff2910z99qnyrqi15mrhqcv3l")))) (inputs (modify-inputs (package-inputs ruby-3.1) (prepend libyaml))))) -- cgit 1.4.1 From 582de0d4699de775ba217f46015f6758045935cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 21:44:48 +0100 Subject: gnu: footswitch: Improve package style. * gnu/packages/accessibility.scm (footswitch)[arguments]: Use G-expressions. <#:phases>: Remove trailing #T. [description]: Simplify it. --- gnu/packages/accessibility.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index fb9387e324..21387ff0d4 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -23,6 +23,7 @@ (define-module (gnu packages accessibility) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) @@ -260,32 +261,30 @@ available to help to click.") (base32 "0xkk60sg3szpgbl3z8djlpagglsldv9viqibsih6wcnbhikzlc6j")))) (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + ;; Install target in the Makefile does not work for Guix. + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin"))) + (install-file "footswitch" bin) + (install-file "scythe" bin))))))) (native-inputs (list pkg-config)) (inputs (list hidapi)) - (arguments - `(#:tests? #f ; no tests - #:make-flags (list (string-append "CC=" ,(cc-for-target))) - #:phases (modify-phases %standard-phases - (delete 'configure) - ;; Install target in the Makefile does not work for Guix - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin"))) - (install-file "footswitch" bin) - (install-file "scythe" bin) - #t)))))) (home-page "https://github.com/rgerganov/footswitch") (synopsis "Command line utilities for PCsensor and Scythe foot switches") (description "This package provides command line utilities for programming PCsensor and Scythe foot switches. It works for both single pedal and three pedal -devices. The \"footswitch\" command programs devices with vendorId:productId -combinations matching 0c45:7403, 0c45:7404, 413d:2107, and 1a86:e026. The -\"scythe\" command programs switches matching 0426:3011.") - (license license:expat)))) +devices.") + (license license:expat)))) (define-public xmagnify (package -- cgit 1.4.1 From b98718fc3f33f57fdf69c4f01e74f7d1dd6ddaca Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 31 Jan 2023 10:07:33 +0000 Subject: gnu: jalv: Fix home page and use GTK-3. * gnu/packages/audio.scm (jalv)[home-page]: Fix home-page. [inputs]: Remove gtk and gtkmm and add gtk+. Signed-off-by: Nicolas Goaziou --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e443934e51..6504ec2345 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2577,13 +2577,12 @@ audio signal streaming.") (list lv2 lilv suil - gtk - gtkmm + gtk+ qtbase-5 jack-1)) (native-inputs (list pkg-config)) - (home-page "https://drobilla.net/software/jalv/") + (home-page "https://drobilla.net/software/jalv.html") (synopsis "Simple LV2 host for JACK") (description "Jalv is a simple but fully featured LV2 host for JACK. It runs LV2 -- cgit 1.4.1 From 6bf7144c79fad7a88780a672b96e677d0907bcc9 Mon Sep 17 00:00:00 2001 From: r0man Date: Sun, 22 Jan 2023 13:00:53 +0100 Subject: gnu: Add lzfse. * gnu/packages/compression.scm (lzfse): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/compression.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 653bde38d8..42766a707a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2807,6 +2807,27 @@ serializations such as ASN.1 and MessagePack.") (license license:expat) (home-page "https://github.com/PJK/libcbor"))) +(define-public lzfse + (package + (name "lzfse") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lzfse/lzfse") + (commit (string-append "lzfse-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5")))) + (build-system cmake-build-system) + (home-page "https://github.com/lzfse/lzfse") + (synopsis "LZFSE compression library and command line tool") + (description "LZFSE is a Lempel-Ziv style data compression algorithm using +Finite State Entropy coding. It targets similar compression rates at higher +compression and decompression speed compared to Deflate using Zlib.") + (license license:bsd-3))) + (define-public fcrackzip (package (name "fcrackzip") -- cgit 1.4.1 From b367f28ed2ac8212d3c8b826b9655a0b2e879f18 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 11 Jan 2023 14:03:09 -0500 Subject: gnu: pantalaimon: Install documentation and use gexps. * gnu/packages/matrix.scm (pantalaimon)[arguments]: Turn into gexps. Add install-doc phase. Signed-off-by: Nicolas Goaziou --- gnu/packages/matrix.scm | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index d5e0060c04..2ed7a9a782 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages xml) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages)) @@ -248,20 +249,28 @@ fledged batteries-included asyncio layer using aiohttp.") "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'downgrade-appdirs-requirement - (lambda _ - (substitute* "setup.py" - ;; FIXME: Remove this once appdirs is updated. - ;; Upgrading python-appdirs requires rebuilting 3000+ packages, - ;; when 1.4.4 is a simple maintenance fix from 1.4.3. - (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "tests"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'downgrade-appdirs-requirement + (lambda _ + (substitute* "setup.py" + ;; FIXME: Remove this once appdirs is updated. + ;; Upgrading python-appdirs requires rebuilting 3000+ packages, + ;; when 1.4.4 is a simple maintenance fix from 1.4.3. + (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) + (add-after 'install 'install-doc + (lambda _ + (with-directory-excursion "docs/man" + (let ((man (string-append #$output "/share/man"))) + (install-file "panctl.1" (string-append man "/man1")) + (install-file "pantalaimon.5" (string-append man "/man5")) + (install-file "pantalaimon.8" (string-append man "/man8")))))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "tests"))))))) (native-inputs (list python-aioresponses python-faker -- cgit 1.4.1 From d6ca7f05faa34bce444f54fb5e46399989db067a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 11 Feb 2023 22:14:43 +0100 Subject: gnu: Add smartdns. * gnu/packages/dns.scm (smartdns): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/dns.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index aa44de2d65..3c2762918f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Simon South ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -1376,3 +1377,39 @@ interface. It then calls all the helper scripts it knows about so it can configure the real @file{/etc/resolv.conf} and optionally any local nameservers other than libc.") (license license:bsd-2))) + +(define-public smartdns + (package + (name "smartdns") + (version "40") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pymumu/smartdns") + (commit (string-append "Release" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(substitute* "Makefile" + ((".*SYSTEMDSYSTEMUNITDIR.*") ""))) + (sha256 + (base32 + "0ibbj96s40xgk6q7dsgpx65rjkknl1pn7nca5fcbbhcm2m80nzjj")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no tests + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + "PREFIX=''") + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) + (inputs (list openssl)) + (home-page "https://github.com/pymumu/smartdns") + (synopsis "Local DNS server") + (description + "SmartDNS is a DNS server that accepts DNS query requests from local +clients, obtains DNS query results from multiple upstream DNS servers, and +returns the fastest access results to clients.") + (license license:gpl3+))) + -- cgit 1.4.1 From 389da6694e75374871ba1b25cfbb21cfbf453e3f Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Thu, 9 Feb 2023 10:16:13 +0800 Subject: gnu: Add havoc. * gnu/packages/terminals.scm (havoc): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/terminals.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 02401b712d..cca3210bec 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -872,6 +872,40 @@ desktop environments. It can be used as a standalone terminal and also has a server/client mode.") (license license:expat))) +(define-public havoc + (package + (name "havoc") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ii8/havoc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "052nfli8x4kvly2iwbk0w3i8gk82bz2p8i0ygkwxhy03m5187lnc")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no check target + #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'build 'set-CC + (lambda _ + (setenv "CC" #$(cc-for-target))))))) + (native-inputs + (list pkg-config wayland-protocols)) + (inputs + (list libxkbcommon wayland)) + (home-page "https://github.com/ii8/havoc") + (synopsis "Minimal terminal emulator for Wayland") + (description + "Havoc is a minimal terminal emulator for Wayland.") + (license license:expat))) + (define-public sakura (package (name "sakura") -- cgit 1.4.1 From e223ab48e09613ac0e7dfbbc20674956c04f0c80 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Wed, 8 Feb 2023 17:11:40 +0000 Subject: gnu: zfs: Update to 2.1.9. * gnu/packages/file-systems.scm (zfs): Update to 2.1.9. Signed-off-by: Nicolas Goaziou --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 049ef04ea8..471f943754 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1251,7 +1251,7 @@ with the included @command{xfstests-check} helper.") (define-public zfs (package (name "zfs") - (version "2.1.7") + (version "2.1.9") (outputs '("out" "module" "src")) (source (origin @@ -1260,7 +1260,7 @@ with the included @command{xfstests-check} helper.") "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "06x7mjsgqdl1gqyn0gniklphh6i0fgbnxyjgqq8gzrjx30zfcqk4")))) + (base32 "1xjhzqi4jqc3mdps93w4b5f0qhy16fmhz44gsvy1fkmm5vgjq5vb")))) (build-system linux-module-build-system) (arguments (list -- cgit 1.4.1 From df163df8307ab91b14d67b074bac35464afa6bdb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 21:51:15 +0100 Subject: gnu: OpenSSL: Update to 1.1.1t [security fixes]. Fixes CVE-2023-0215, CVE-2023-0286, CVE-2022-4304, CVE-2022-4450. https://www.openssl.org/news/secadv/20230207.txt * gnu/packages/tls.scm (openssl/fixed): Update to 1.1.1t. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bdac8a6e63..66c111cb56 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -618,7 +618,7 @@ OpenSSL for TARGET." (package (inherit openssl-1.1) (name "openssl") - (version "1.1.1s") + (version "1.1.1t") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -631,7 +631,7 @@ OpenSSL for TARGET." (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1amnwis6z2piqs022cpbcg828rql62yjnsqxnvdg0vzfc3kh3b65")))))) + "0fwxhlv7ary9nzg5mx07x1jj3wkbizxh56qy7l6bzp5iplj9pvld")))))) (define-public openssl-3.0 (package -- cgit 1.4.1 From f844deb7acfb45f3b2f5a18cde5c662fc5ba0f6d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Feb 2023 21:53:55 +0100 Subject: gnu: OpenSSL 3: Update to 3.0.8 [security fixes]. Fixes CVE-2023-0215, CVE-2023-0216, CVE-2023-0217, CVE-2023-0286, CVE-2023-0401, CVE-2022-4203, CVE-2022-4304, and CVE-2022-4450. https://www.openssl.org/news/secadv/20230207.txt gnu/packages/tls.scm (openssl-3.0): Update to 3.0.8. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 66c111cb56..9eaa859a57 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -636,7 +636,7 @@ OpenSSL for TARGET." (define-public openssl-3.0 (package (inherit openssl-1.1) - (version "3.0.7") + (version "3.0.8") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -649,7 +649,7 @@ OpenSSL for TARGET." (patches (search-patches "openssl-3.0-c-rehash-in.patch")) (sha256 (base32 - "0virbkcrw7nn3gr5r51z722gs1ppig0casj0c9pnj3i65829s143")))) + "0gjb7qjl2jnzs1liz3rrccrddxbk6q3lg8z27jn1xwzx72zx44vc")))) (arguments (substitute-keyword-arguments (package-arguments openssl-1.1) ((#:phases phases '%standard-phases) -- cgit 1.4.1 From 57d67d282d9525310be654faa47aff6db49a34cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 00:08:33 +0200 Subject: gnu: libreoffice: Update to 7.4.5.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 7.4.5.1. --- gnu/packages/libreoffice.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b959470d8f..e65f1be4ad 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2016, 2018-2021, 2023 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice @@ -915,7 +915,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (define-public libreoffice (package (name "libreoffice") - (version "7.4.3.2") + (version "7.4.5.1") (source (origin (method url-fetch) @@ -924,7 +924,7 @@ commonly called @code{ftoa} or @code{dtoa}.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "0fyvd4ydh72lmn005h190xa563d4h376pi1fx9lfr5i25qcbpg7z")))) + (base32 "13g1di71jdcish4rxlyi2jglpqfiq9zjf391bwplmf9prc9cy3iq")))) (build-system glib-or-gtk-build-system) (arguments (list -- cgit 1.4.1 From 8acdac4eba408eb6582554c5204827c7cb7c97fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 00:09:14 +0200 Subject: gnu: hunspell-dictionary: Update to 7.4.5.1. * gnu/packages/hunspell.scm (hunspell-dictionary): Update to 7.4.5.1. --- gnu/packages/hunspell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index 8bc8c38176..06035b61db 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -275,7 +275,7 @@ spell-checking library.") (#\_ #\-) (chr chr)) (string-downcase dict-name)))) - (version "7.4.3.2") + (version "7.4.5.1") (source (origin (method git-fetch) -- cgit 1.4.1 From 89c5cb4078f52f103e6221978a2ea75e0c474769 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 00:17:25 +0200 Subject: gnu: Add hunspell-dict-he-il. * gnu/packages/hunspell.scm (hunspell-dict-he-il): New variable. --- gnu/packages/hunspell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index 06035b61db..cb6b3ec422 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Giacomo Leidi +;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -313,6 +314,13 @@ spell-checking library.") (license license) (home-page home-page))) +(define-public hunspell-dict-he-il + (let ((synopsis identity)) + (hunspell-dictionary "he_IL" "Hebrew" + #:synopsis (synopsis "Hunspell dictionary for Hebrew") + #:home-page "http://hspell.ivrix.org.il/" + #:license license:agpl3+))) + (define-public hunspell-dict-it-it (let ((synopsis identity)) (hunspell-dictionary "it_IT" "Italian" -- cgit 1.4.1 From 06cf06aab1fedba0f2e892d1aa2cba75f2fdfb19 Mon Sep 17 00:00:00 2001 From: "Adrien Bourmault (neox)" Date: Mon, 6 Feb 2023 00:24:19 +0100 Subject: gnu: gajim: update to 1.4.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [[PGP Signed Part:No public key for 6EB408FE0ACEC664 created at 2023-02-06T00:24:19+0100 using RSA]] * gnu/packages/messaging.scm (gajim): Update to 1.4.7 Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 404596c553..e7da2e0b8d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1177,7 +1177,7 @@ of xmpppy.") (define-public gajim (package (name "gajim") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) @@ -1186,7 +1186,7 @@ of xmpppy.") (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 - (base32 "0ks25hh7ksx0nfydixpixcli556w7qcylxp2z2xsx8mgzqv7c9la")) + (base32 "1ww46qlxr14nq0ka8wsf8qpn5qfi5dvgyksfh9411crl7azhfj0s")) (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments -- cgit 1.4.1 From 16b47a95a1a8ca4f948422b273d7f21d131bfb0b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 12 Jan 2023 22:22:28 +0800 Subject: gnu: Add mold. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/local.mk (GNU_SYSTEM_MODULES): Add new file. * gnu/packages/mold.scm: New file. * gnu/packages/mold.scm (mold): New variable. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/mold.scm | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 gnu/packages/mold.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 15cf5f74a9..bc0bc37777 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -425,6 +425,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/mingw.scm \ %D%/packages/microcom.scm \ %D%/packages/moe.scm \ + %D%/packages/mold.scm \ %D%/packages/motti.scm \ %D%/packages/monitoring.scm \ %D%/packages/moreutils.scm \ diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm new file mode 100644 index 0000000000..5f2b75625e --- /dev/null +++ b/gnu/packages/mold.scm @@ -0,0 +1,83 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Zhu Zihao +;;; +;;; 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 mold) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (gnu packages c) + #:use-module (gnu packages digest) + #:use-module (gnu packages tbb) + #:use-module (gnu packages tls) + #:use-module (gnu packages compression) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public mold + (package + (name "mold") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rui314/mold") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03qkl9qw5l5kg1awij40hcrfxq6jj70mvq4iscdy9dsn8qw8r3wb")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (x) + (delete-file-recursively (string-append "third-party/" x))) + '("mimalloc" "tbb" "xxhash" "zlib" "zstd")))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DMOLD_USE_SYSTEM_MIMALLOC=ON" + "-DMOLD_USE_SYSTEM_TBB=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'force-system-xxhash + (lambda _ + (substitute* "mold.h" + (("#include \"third-party/xxhash/xxhash.h\"") + "#include ")))) + (add-before 'configure 'fix-compiler-name-in-test + (lambda _ + (substitute* "test/elf/common.inc" + (("CC=\"\\$\\{TEST_CC:-cc\\}\"") "CC=gcc") + (("CXX=\"\\$\\{TEST_CXX:-c\\+\\+\\}\"") + "CXX=g++")))) + (add-before 'configure 'disable-rpath-test + (lambda _ + ;; This test fails because mold expect the RUNPATH as-is, + ;; but compiler in Guix will insert the path of gcc-lib and + ;; glibc into the output binary. + (delete-file "test/elf/rpath.sh")))))) + (inputs (list mimalloc openssl tbb xxhash zlib `(,zstd "lib"))) + (home-page "https://github.com/rui314/mold") + (synopsis "Fast linker") + (description + "Mold is a faster drop-in replacement for existing linkers. +It is designed to increase developer productivity by reducing build time, +especially in rapid debug-edit-rebuild cycles.") + (license license:agpl3))) -- cgit 1.4.1 From 4a6f64ab2afff761eb233e7ca6110d9e8acf8f32 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 12 Jan 2023 22:23:35 +0800 Subject: gnu: Add mold-wrapper. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mold.scm(make-mold-wrapper): New variable. (mold-wrapper): New variable. (mold-as-ld-wrapper): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mold.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index 5f2b75625e..dfc452a329 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -22,6 +22,8 @@ #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system trivial) + #:use-module (gnu packages base) #:use-module (gnu packages c) #:use-module (gnu packages digest) #:use-module (gnu packages tbb) @@ -81,3 +83,41 @@ It is designed to increase developer productivity by reducing build time, especially in rapid debug-edit-rebuild cycles.") (license license:agpl3))) + +(define* (make-mold-wrapper mold #:key mold-as-ld?) + "Return a MOLD wrapper. When MOLD-AS-LD? is true, create a 'ld' symlink that +points to 'mold'." + (package + (inherit mold) + (name (if mold-as-ld? "mold-as-ld-wrapper" "mold-wrapper")) + (source #f) + (native-inputs '()) + (inputs (list (make-ld-wrapper "ld.mold-wrapper" #:binutils mold + #:linker "ld.mold") + (make-ld-wrapper "mold-wrapper" #:binutils mold #:linker + "mold"))) + (propagated-inputs '()) + (build-system trivial-build-system) + (arguments + (list #:builder + #~(let ((ld.mold (string-append #$(this-package-input + "ld.mold-wrapper") + "/bin/ld.mold")) + (mold (string-append #$(this-package-input "mold-wrapper") + "/bin/mold"))) + (mkdir #$output) + (mkdir (string-append #$output "/bin")) + (symlink ld.mold (string-append #$output "/bin/ld.mold")) + (symlink mold (string-append #$output "/bin/mold")) + (when #$mold-as-ld? + (symlink ld.mold (string-append #$output "/bin/ld")))))) + (synopsis "Mold linker wrapper") + (description "This is a linker wrapper for Mold; like @code{ld-wrapper}, it +wraps the linker to add any missing @code{-rpath} flags, and to detect any +misuse of libraries outside of the store."))) + +(define-public mold-wrapper + (make-mold-wrapper mold)) + +(define-public mold-as-ld-wrapper + (make-mold-wrapper mold #:mold-as-ld? #t)) -- cgit 1.4.1 From 18f1a4d38a405cc28942f9a4d5d46c3373aac8a1 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 10 Feb 2023 16:10:25 +0000 Subject: gnu: Remove tree-sitter comment from emacs.scm imports. * gnu/packages/emacs.scm: Remove tree-sitter comment. Signed-off-by: Andrew Tropin --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b6a66bafac..953aad961c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -76,7 +76,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) - #:use-module (gnu packages tree-sitter) ; for tree-sitter + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages web) ; for jansson #:use-module (gnu packages webkit) #:use-module (gnu packages xml) -- cgit 1.4.1 From 5401b5822a91d407d7041aef6625e0fe6a57bbae Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 29 Mar 2022 20:13:11 +0100 Subject: gnu: tree-sitter-cli: Enable some tests and add node and dot. * gnu/packages/tree-sitter.scm (tree-sitter-cli)[inputs]: Add graphviz and node-lts. [arguments]<#:cargo-test-flags>: Skip tests that require downloading grammars. <#:phases>: Add 'patch-node and 'patch-dot phases. Tweak install phase. Signed-off-by: Andrew Tropin --- gnu/packages/tree-sitter.scm | 52 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 2e44339ca2..d70d579762 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Luis Henrique Gomes Higino -;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2022, 2023 Pierre Langlois ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2023 Andrew Tropin @@ -24,7 +24,9 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) + #:use-module (gnu packages graphviz) #:use-module (gnu packages icu4c) + #:use-module (gnu packages node) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) #:use-module (guix gexp) @@ -63,8 +65,8 @@ (synopsis "Incremental parsing system for programming tools") (description "Tree-sitter is a parser generator tool and an incremental parsing -library. It can build a concrete syntax tree for a source file and efficiently -update the syntax tree as the source file is edited. +library. It can build a concrete syntax tree for a source file and +efficiently update the syntax tree as the source file is edited. Tree-sitter aims to be: @@ -80,7 +82,8 @@ This package includes the @code{libtree-sitter} runtime library.") (license license:expat))) (define-public tree-sitter-cli - (package (inherit tree-sitter) + (package + (inherit tree-sitter) (name "tree-sitter-cli") (source (origin (inherit (package-source tree-sitter)) @@ -96,13 +99,30 @@ This package includes the @code{libtree-sitter} runtime library.") println!(\"cargo:rustc-link-lib=tree-sitter\");~@ }~%"))))))) (build-system cargo-build-system) - (inputs (list tree-sitter)) + (inputs + (list tree-sitter graphviz node-lts)) (arguments (list - ;; Running test requires downloading fixtures, see the - ;; script/fetch-fixtures script, which fetches grammars. Maybe it make - ;; sence to run tests in the grammar's packages? - #:tests? #f + #:cargo-test-flags + ''("--release" "--" + ;; Skip tests which rely on downloading grammar fixtures. It is + ;; difficult to support such tests given upstream does not encode + ;; which version of the grammars are expected. + ;; Instead, we do run some tests for each grammar in the tree-sitter + ;; build-system, by running `tree-sitter test'. This isn't as + ;; complete as running all tests from tree-sitter-cli, but it's a + ;; good compromise compared to maintaining two different sets of + ;; grammars (Guix packages vs test fixtures). + "--skip=tests::corpus_test" + "--skip=tests::highlight_test" + "--skip=tests::node_test" + "--skip=tests::parser_test" + "--skip=tests::pathological_test" + "--skip=tests::query_test" + "--skip=tests::tags_test" + "--skip=tests::test_highlight_test" + "--skip=tests::test_tags_test" + "--skip=tests::tree_test") ;; We're only packaging the CLI program so we do not need to install ;; sources. #:install-source? #f @@ -132,8 +152,20 @@ This package includes the @code{libtree-sitter} runtime library.") (add-after 'unpack 'delete-cargo-lock (lambda _ (delete-file "Cargo.lock"))) + (add-after 'unpack 'patch-node + (lambda _ + (substitute* "cli/src/generate/mod.rs" + (("Command::new\\(\"node\"\\)") + (string-append + "Command::new(\"" #$node-lts "/bin/node\")"))))) + (add-after 'unpack 'patch-dot + (lambda _ + (substitute* "cli/src/util.rs" + (("Command::new\\(\"dot\"\\)") + (string-append + "Command::new(\"" #$graphviz "/bin/dot\")"))))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ (let ((bin (string-append #$output "/bin"))) (mkdir-p bin) (install-file "target/release/tree-sitter" bin))))))) -- cgit 1.4.1 From 2419a1636546cf993bafbf5a6ba6b6e48994c246 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sun, 12 Feb 2023 10:14:07 +0400 Subject: gnu: tree-sitter-grammar: Migrate to tree-sitter-build-system. gnu/packages/tree-sitter.scm (tree-sitter-delete-generated-files): New variable. (tree-sitter-grammar): Remove source-directory argument, add inputs argument, change package names, remove custom build code, update build system to tree-sitter-build-system. (tree-sitter-grammar-html): Rename to tree-sitter-html. --- gnu/packages/tree-sitter.scm | 53 +++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index d70d579762..bf6cd55b40 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages node) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) + #:use-module (guix build-system tree-sitter) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) @@ -187,17 +188,26 @@ can be embedded in any application. This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) +(define tree-sitter-delete-generated-files + #~(begin + (use-modules (guix build utils)) + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + (define* (tree-sitter-grammar language language-for-synopsis version commit hash #:key (repository-url - (format #f "https://github.com/tree-sitter/tree-sitter-~a" language)) - (source-directory "")) + (format #f "https://github.com/tree-sitter/tree-sitter-~a" + language)) + (inputs '())) (let ((synopsis (string-append language-for-synopsis " grammar for tree-sitter")) - (name (string-append "tree-sitter-grammar-" language)) - (src-dir source-directory) - (lib (format #f "libtree-sitter-~a.so" language))) + (name (string-append "tree-sitter-" language))) (package (name name) (version version) @@ -208,38 +218,15 @@ This package includes the @command{tree-sitter} command-line tool.") (url repository-url) (commit commit))) (file-name (git-file-name name version)) - (sha256 (base32 hash)))) - (build-system gnu-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (with-directory-excursion (string-append #$src-dir "src") - (let* ((scanner? (or (file-exists? "scanner.c") - (file-exists? "scanner.cc"))) - (CC (if (file-exists? "scanner.cc") "g++" "gcc")) - (compile (lambda (f) (invoke CC "-fPIC" "-c" "-I." f))) - (link-args `("-fPIC" "-shared" "parser.o" - ,@(if scanner? '("scanner.o") '()) - "-o" ,#$lib))) - (invoke "gcc" "-fPIC" "-c" "-I." "parser.c") - (for-each - (lambda (f) (when (file-exists? f) (compile f))) - '("scanner.c" "scanner.cc")) - (apply invoke CC link-args))))) - (delete 'check) - (replace 'install - (lambda _ - (install-file (string-append #$src-dir "src/" #$lib) - (string-append #$output "/lib/tree-sitter"))))))) + (sha256 (base32 hash)) + (snippet tree-sitter-delete-generated-files))) + (build-system tree-sitter-build-system) + (inputs inputs) (synopsis synopsis) (description (string-append synopsis ".")) (license license:expat)))) -(define-public tree-sitter-grammar-html +(define-public tree-sitter-html (tree-sitter-grammar "html" "HTML" "0.19.0" "v0.19.0" -- cgit 1.4.1 From 59e2e0744b7a3893003557e70fc60aec853efa22 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Fri, 10 Feb 2023 13:49:23 -0500 Subject: gnu: ibus-speech-to-text: Fix execution of ibus-engine-stt. Fixes . * gnu/packages/ibus.scm (ibus-speech-to-text)[#:phases] : New phase. : Use getenv to set GUIX_PYTHONPATH and GI_TYPELIB_PATH. Signed-off-by: Liliana Marie Prikler --- gnu/packages/ibus.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 4c45671acc..0371310992 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Songlin Jiang ;;; Copyright © 2021 Taiju HIGASHI ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2023 Luis Felipe López Acevedo ;;; ;;; This file is part of GNU Guix. ;;; @@ -875,6 +876,13 @@ hanja dictionary and small hangul character classification.") (substitute* "meson.build" (("update_desktop_database: true") "update_desktop_database: false")))) + (add-after 'set-paths 'add-install-to-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ibus-stt-dir (string-append out "/share/ibus-stt"))) + (setenv "GUIX_PYTHONPATH" + (string-append ibus-stt-dir ":" + (getenv "GUIX_PYTHONPATH")))))) (add-after 'install 'wrap-with-additional-paths (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'ibus-{setup,engine}-stt' find the gst-vosk plugin @@ -886,17 +894,10 @@ hanja dictionary and small hangul character classification.") (,(string-append (assoc-ref inputs "gst-vosk") "/lib/gstreamer-1.0") ,(getenv "GST_PLUGIN_SYSTEM_PATH"))) - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH") - ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-stt"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-stt"))))) + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))))) (list (string-append out "/libexec/ibus-engine-stt") (string-append out "/libexec/ibus-setup-stt"))))))))) (inputs -- cgit 1.4.1 From e6ff91bfc4fabc92bde87e4db6fd3057a44fca37 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Fri, 10 Feb 2023 13:49:24 -0500 Subject: gnu: ibus-speech-to-text: Fix lint warnings. * gnu/packages/ibus.scm (ibus-speech-to-text)[inputs]: Add bash-minimal. Move desktop-file-utils, glib:bin and gobject-introspection ... [native-inputs] ... here. Signed-off-by: Liliana Marie Prikler --- gnu/packages/ibus.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 0371310992..7d52c5889e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -901,9 +901,7 @@ hanja dictionary and small hangul character classification.") (list (string-append out "/libexec/ibus-engine-stt") (string-append out "/libexec/ibus-setup-stt"))))))))) (inputs - (list desktop-file-utils - (list glib "bin") - gobject-introspection + (list bash-minimal gst-vosk gstreamer gtk @@ -913,7 +911,11 @@ hanja dictionary and small hangul character classification.") python-babel python-pygobject)) (native-inputs - (list gettext-minimal libxml2 pkg-config)) + (list desktop-file-utils + gettext-minimal + (list glib "bin") + gobject-introspection + libxml2 pkg-config)) (home-page "https://github.com/PhilippeRo/IBus-Speech-To-Text") (synopsis "Speech to text IBus engine using VOSK") (description "This Input Method uses VOSK for voice recognition and allows -- cgit 1.4.1 From 629a5936a6dfa0fe2cc2a3092ec51920b216b652 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:12:15 +0100 Subject: gnu: openscenegraph: Use modern package style. * gnu/packages/graphics.scm (openscenegraph)[arguments]: Convert to list of G-Expressions. Signed-off-by: Liliana Marie Prikler --- gnu/packages/graphics.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d9359d0b85..90e9259540 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1354,14 +1354,15 @@ visual effects work for film.") `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test target available - ;; Without this flag, 'rd' will be added to the name of the - ;; library binaries and break linking with other programs. - #:build-type "Release" - #:configure-flags - (list (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib64")))) + (list + #:tests? #f ; no test target available + ;; Without this flag, 'rd' will be added to the name of the + ;; library binaries and break linking with other programs. + #:build-type "Release" + #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_RPATH=" + #$output "/lib:" + #$output "/lib64")))) (native-inputs (list pkg-config unzip)) (inputs -- cgit 1.4.1 From 98b9f3a4bda072c55d8f94fcf17fc3357fce5b15 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:13:50 +0100 Subject: gnu: openscenegraph: Add output for plugins. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it so that other packages can find plugins via pkg-config and link to them in the usual manner. * gnu/packages/graphics.scm (openscenegraph)[outputs]: Add “pluginlib”. [properties]: Add output synopsis for “pluginlib”. [arguments]<#:modules>: Use (ice-9 regex). <#:phases>: Add ‘copy-plugins’. Signed-off-by: Liliana Marie Prikler --- gnu/packages/graphics.scm | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 90e9259540..6f117f69a2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1351,8 +1351,10 @@ visual effects work for film.") (base32 "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1")) (file-name (git-file-name name version)))) (properties - `((upstream-name . "OpenSceneGraph"))) + `((upstream-name . "OpenSceneGraph") + (output-synopsis "pluginlib" "Plugins as shared libraries"))) (build-system cmake-build-system) + (outputs (list "out" "pluginlib")) (arguments (list #:tests? #f ; no test target available @@ -1362,7 +1364,40 @@ visual effects work for film.") #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_RPATH=" #$output "/lib:" - #$output "/lib64")))) + #$output "/lib64")) + #:modules `((guix build cmake-build-system) + (guix build utils) + (ice-9 regex)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'copy-plugins + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (pluginlib (assoc-ref outputs "pluginlib"))) + (mkdir-p (string-append pluginlib "/lib/pkgconfig")) + (with-directory-excursion (string-append out "/lib/osgPlugins-" + #$version) + (for-each + (lambda (lib) + (let ((blib (basename lib)) + (m (string-match "([^/]*)\\.so$" lib))) + (symlink (canonicalize-path lib) + (string-append pluginlib "/lib/lib" blib)) + (call-with-output-file (string-append + pluginlib + "/lib/pkgconfig/" + (match:substring m 1) ".pc") + (lambda (port) + (format port "libdir=~a/lib~%" pluginlib) + (newline port) + (format port "Name: ~a~%" (match:substring m 1)) + (format port "Version: ~a~%" #$version) + (display "Description: A plugin for openscenegraph\n" + port) + (display "Requires: openscenegraph\n" port) + (format port "Libs: -L${libdir} -l~a~%" + (match:substring m 1)))))) + (find-files "." "\\.so"))))))))) (native-inputs (list pkg-config unzip)) (inputs -- cgit 1.4.1 From efee3dd7a175c2e068178cc0b48479a03775c23d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:16:28 +0100 Subject: gnu: Add open-simulation-interface. * gnu/packages/simulation.scm (open-simulation-interface): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/simulation.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index e5e7d2bf60..2e3d4183eb 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -254,6 +254,38 @@ problems for efficient solution on parallel systems.") (license license:gpl3+) (home-page "https://openfoam.org"))) +(define-public open-simulation-interface + (package + (name "open-simulation-interface") + (version "3.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/" + "OpenSimulationInterface/" + "open-simulation-interface")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09vclrvsawx608kk0vnzywr71xn11qzwxzh2j508zjfn0kvhyx7q")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f ; tests are for the python package + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("-targets\\.cmake") "_targets.cmake"))))))) + (native-inputs (list protobuf)) + (home-page + "https://github.com/OpenSimulationInterface/open-simulation-interface") + (synopsis "Generic interface for environmental perception") + (description "The Open Simulation Interface is a generic interface based on +Google's protocol buffers for the environmental perception of automated driving +functions in virtual scenarios.") + (license license:mpl2.0))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- cgit 1.4.1 From 4a42167c3cb39645d07cb1a25b4e4e75247b4322 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:16:38 +0100 Subject: gnu: Add python-open-simulation-interface. * gnu/packages/simulation.scm (python-open-simulation-interface): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/simulation.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 2e3d4183eb..b949b06531 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -286,6 +286,11 @@ Google's protocol buffers for the environmental perception of automated driving functions in virtual scenarios.") (license license:mpl2.0))) +(define-public python-open-simulation-interface + (package/inherit open-simulation-interface + (build-system python-build-system) + (arguments '()))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- cgit 1.4.1 From 015777f4c5094d20c2697c633dfe52ff966052a1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:04:27 +0100 Subject: gnu: Add esmini. * gnu/packages/patches/esmini-no-clutter-log.patch: New file. * gnu/packages/patches/esmini-use-pkgconfig.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them here. * gnu/packages/simulation.scm (esmini): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 2 + gnu/packages/patches/esmini-no-clutter-log.patch | 30 ++ gnu/packages/patches/esmini-use-pkgconfig.patch | 541 +++++++++++++++++++++++ gnu/packages/simulation.scm | 70 +++ 4 files changed, 643 insertions(+) create mode 100644 gnu/packages/patches/esmini-no-clutter-log.patch create mode 100644 gnu/packages/patches/esmini-use-pkgconfig.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bc0bc37777..cdb99813d0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,6 +1082,8 @@ dist_patch_DATA = \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ + %D%/packages/patches/esmini-no-clutter-log.patch \ + %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ diff --git a/gnu/packages/patches/esmini-no-clutter-log.patch b/gnu/packages/patches/esmini-no-clutter-log.patch new file mode 100644 index 0000000000..0920244f78 --- /dev/null +++ b/gnu/packages/patches/esmini-no-clutter-log.patch @@ -0,0 +1,30 @@ +Don't clutter /tmp with logs. + +--- + EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp +index 56c655dc..2750f5a6 100644 +--- a/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp ++++ b/EnvironmentSimulator/Modules/CommonMini/CommonMini.cpp +@@ -1013,14 +1013,8 @@ void Logger::OpenLogfile(std::string filename) + file_.open(filename.c_str()); + if (file_.fail()) + { +- const char* filename_tmp = std::tmpnam(NULL); +- printf("Cannot open log file: %s in working directory. Trying system tmp-file: %s\n", +- SE_Env::Inst().GetLogFilePath().c_str(), filename_tmp); +- file_.open(filename_tmp); +- if (file_.fail()) +- { +- printf("Also failed to open log file: %s. Continue without logfile, still logging to console.\n", filename_tmp); +- } ++ printf("Cannot open log file: %s in working directory. Continuing without logfile, still logging to console.\n", ++ filename.c_str()); + } + } + #endif +-- +2.38.1 + diff --git a/gnu/packages/patches/esmini-use-pkgconfig.patch b/gnu/packages/patches/esmini-use-pkgconfig.patch new file mode 100644 index 0000000000..73e1b50015 --- /dev/null +++ b/gnu/packages/patches/esmini-use-pkgconfig.patch @@ -0,0 +1,541 @@ +Find dependencies via pkg-config. + +--- + CMakeLists.txt | 16 +- + .../Applications/esmini-dyn/CMakeLists.txt | 5 +- + .../Applications/esmini/CMakeLists.txt | 1 + + EnvironmentSimulator/CMakeLists.txt | 296 +----------------- + .../Modules/Controllers/ControllerSumo.cpp | 1 - + .../Modules/RoadManager/CMakeLists.txt | 8 +- + .../Modules/ScenarioEngine/CMakeLists.txt | 15 +- + 7 files changed, 23 insertions(+), 319 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 156d9448..10ec48f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ else() + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + endif() + ++include(FindPkgConfig) + + project (EnvironmentSimulator) + +@@ -33,15 +34,10 @@ else () + set (LINUX false) + endif () + +-if (LINUX OR APPLE OR MINGW OR MSVC) +- set(INSTALL_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin") +-else () +- message(FATAL_ERROR "Unrecognized platform therefore there isn't an installation directory. Stopping the cmake process.") +-endif () +- + set(INSTALL_DIRECTORY_CODE_EXAMPLES "${CMAKE_HOME_DIRECTORY}/code-examples-bin") + +-set(PUGIXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/pugixml") ++find_package(pugixml) ++ + set(EXPR_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/expr") + if(MSVC) + set(DIRENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/externals/dirent/win") +@@ -61,10 +57,14 @@ set(ENABLE_SANITIZERS False CACHE BOOL "Enable sanitizers (Only valid for Linux + + + if (USE_OSG) ++ pkg_check_modules(OSG REQUIRED openscenegraph osgdb_jpeg osgdb_osg ++ osgdb_serializers_osg ++ osgdb_serializers_osgsim) + add_definitions(-D_USE_OSG) + endif (USE_OSG) + + if (USE_OSI) ++ find_package(open_simulation_interface REQUIRED) + add_definitions(-D_USE_OSI) + endif (USE_OSI) + +@@ -73,6 +73,7 @@ if (USE_SUMO) + endif (USE_SUMO) + + if (USE_GTEST) ++ find_package(GTest REQUIRED) + add_definitions(-D_USE_GTEST) + endif (USE_GTEST) + +@@ -90,5 +91,4 @@ if( NOT EXISTS "test/OSC-ALKS-scenarios/.git" ) + endif() + + # Add variables to global scope, e.g. when esmini is used as submodule +-set(PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR} CACHE INTERNAL "") + set(EXPR_INCLUDE_DIR ${EXPR_INCLUDE_DIR} CACHE INTERNAL "") +diff --git a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt +index 83d89420..e15062d3 100644 +--- a/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt ++++ b/EnvironmentSimulator/Applications/esmini-dyn/CMakeLists.txt +@@ -1,7 +1,7 @@ + + include_directories ( + ${SCENARIOENGINE_DLL_INCLUDE_DIR} +- ${COMMON_MINI_INCLUDE_DIR} ++ ${COMMON_MINI_INCLUDE_DIR} + ${OSI_INCLUDE_DIR} + ) + +@@ -19,11 +19,12 @@ link_directories( ${OSI_DIR}/lib ) + add_executable ( ${TARGET} ${SOURCES} ${INCLUDES} ) + + +-target_link_libraries ( ++target_link_libraries ( + ${TARGET} + esminiLib + CommonMini + ${TIME_LIB} ++ pugixml::pugixml + project_options + ) + +diff --git a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt +index 6890c26a..a088ebdc 100644 +--- a/EnvironmentSimulator/Applications/esmini/CMakeLists.txt ++++ b/EnvironmentSimulator/Applications/esmini/CMakeLists.txt +@@ -44,6 +44,7 @@ target_link_libraries ( + ${sumo_libs} + ${TIME_LIB} + ${SOCK_LIB} ++ pugixml::pugixml + project_options + ) + +diff --git a/EnvironmentSimulator/CMakeLists.txt b/EnvironmentSimulator/CMakeLists.txt +index 157e8fe0..e771231a 100644 +--- a/EnvironmentSimulator/CMakeLists.txt ++++ b/EnvironmentSimulator/CMakeLists.txt +@@ -1,7 +1,3 @@ +- +-set ( FILE_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) +-set ( MODEL_STORAGE "esmini" ) # "dropbox", "google", "esmini" (limited GB/Day) +- + set ( VIEWER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/ViewerBase" ) + set ( PLAYER_BASE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlayerBase" ) + set ( ROADMANAGER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/RoadManager" ) +@@ -17,88 +13,12 @@ set ( CONTROLLERS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Modules/Controllers") + + # OpenSceneGraph package adapted for this project + set ( OSG_VERSION "osg161" ) +-set ( OSG_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OpenSceneGraph" ) +-set ( OSI_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/OSI" ) +-set ( SUMO_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/SUMO" ) + + # GoogleTest package + set ( GTEST_VERSION "1.10.1" ) +-set ( GTEST_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../externals/googletest" ) + + set( CMAKE_VERBOSE_MAKEFILE true ) + +-if ( ${FILE_STORAGE} STREQUAL "dropbox" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/d0czj6b89p9jyvv/OpenSceneGraph_mac.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://www.dropbox.com/s/m62v19gp0m73dte/osi_mac.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://www.dropbox.com/s/0x8kwztk7nmacs1/sumo_mac.7z?dl=1 ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://www.dropbox.com/s/4ug0gmkgdavzyb4/osg_linux_glibc_2_31_gcc_7_5_0.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/kwtdg0c1c8pawa1/osi_linux.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/gfwtqd3gf76f86a/sumo_linux.7z?dl=1 ) +- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/si7jsjjsy5bpoym/googletest_linux.7z?dl=1 ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://dl.dropboxusercontent.com/s/e95hnoo782p40uc/OpenSceneGraph_v10.7z?dl=1 ) +- set ( OSI_PACKAGE_URL https://dl.dropboxusercontent.com/s/an58ckp2qfx5069/osi_v10.7z?dl=1 ) +- set ( SUMO_PACKAGE_URL https://dl.dropboxusercontent.com/s/5jtpnnd61wonxuh/sumo_v10.7z?dl=1 ) +- set ( GTEST_PACKAGE_URL https://dl.dropboxusercontent.com/s/aaiehwzc6woqbc6/googletest_v10.7z?dl=1 ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-elseif ( ${FILE_STORAGE} STREQUAL "google" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1mfn_vrcXBoFBekR_t8RXTWB4sD59JD7p&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1UVzO8cPQaDU9KVn9v2v8Suj0uUw1dzYI&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1FAve0-MlJPv6lUZy0HvriZI7xstLAzvX&export=download ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Ya1bLp_0-qqlhs67WAwbGW7l37wqP3o2&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Q8O9YciIC0BPEszIKtQ2UW9KcVRZS4iB&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=1m4znxNIXapP0D-l21oIm2l7L5ti-JbZH&export=download ) +- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1Hyr9eJX2GmgpYwZhx14xOoXlZ2j-FY_p&export=download ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://drive.google.com/u/1/uc?id=1RTag0aUn_pJPK697j0-E72ABW10wZvOm&export=download ) +- set ( OSI_PACKAGE_URL https://drive.google.com/u/1/uc?id=1pcQcVHUESOk2Wmi-zUA7uzdxxE6iwRJx&export=download ) +- set ( SUMO_PACKAGE_URL https://drive.google.com/u/1/uc?id=18PhbSLyvs0IGWTAY3YBoYzpVnMFPbOuR&export=download ) +- set ( GTEST_PACKAGE_URL https://drive.google.com/u/1/uc?id=1So-3gtrmEdW9RhEvVQisj1QFksHM_otU&export=download ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-elseif ( ${FILE_STORAGE} STREQUAL "esmini" ) +- if (APPLE) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_mac.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_mac.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_mac.7z ) +- elseif (LINUX) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osg_linux_glibc_2_31_gcc_7_5_0.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_linux.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_linux.7z ) +- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_linux.7z ) +- elseif (MSVC) +- set ( OSG_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/OpenSceneGraph_v10.7z ) +- set ( OSI_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/osi_v10.7z ) +- set ( SUMO_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/sumo_v10.7z ) +- set ( GTEST_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD766065121/libs/googletest_v10.7z ) +- elseif (MINGW) +- message("MinGW, enforcing slimmed esmini") +- else () +- message ("Unsupported configuration") +- endif () +-else () +- Message("Unknown storage type: " ${FILE_STORAGE}) +-endif() +- +-if ( ${MODEL_STORAGE} STREQUAL "dropbox" ) +- set ( MODELS_PACKAGE_URL https://dl.dropboxusercontent.com/s/5gk8bvgzqiaaoco/models.7z?dl=0 ) +-elseif ( ${MODEL_STORAGE} STREQUAL "google" ) +- set ( MODELS_PACKAGE_URL https://drive.google.com/u/1/uc?id=1c3cqRzwY41gWXbg0rmugQkL5I_5L6DH_&export=download ) +-elseif ( ${MODEL_STORAGE} STREQUAL "esmini" ) +- set ( MODELS_PACKAGE_URL https://esmini.asuscomm.com/AICLOUD779364751/models/models.7z ) +-endif() +- + if (APPLE) + set ( EXT_DIR_NAME "mac" ) + set ( TIME_LIB "" ) +@@ -127,21 +47,8 @@ set ( OSI_DIR "${OSI_BASE_DIR}/${EXT_DIR_NAME}" ) + set ( SUMO_DIR "${SUMO_BASE_DIR}/${EXT_DIR_NAME}" ) + set ( GTEST_DIR "${GTEST_BASE_DIR}/${EXT_DIR_NAME}" ) + +-set ( OSG_INCLUDE_DIR +- "${OSG_DIR}/build/include" +- "${OSG_DIR}/include" +-) +-set ( OSG_LIBRARIES_PATH +- "${OSG_DIR}/lib" +- "${OSG_DIR}/lib/osgPlugins-3.6.5" +-) +- + set ( OSI_INCLUDE_DIR "${OSI_DIR}/include" ) +-if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib-dyn" ) +-else () +- set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) +-endif (DYN_PROTOBUF) ++set ( OSI_LIBRARIES_PATH "${OSI_DIR}/lib" ) + + set ( SUMO_INCLUDE_DIR "${SUMO_DIR}/include" ) + set ( SUMO_LIBRARIES_PATH "${SUMO_DIR}/lib" ) +@@ -153,74 +60,6 @@ link_directories(${OSG_LIBRARIES_PATH} ${OSI_LIBRARIES_PATH} ${SUMO_LIBRARIES_PA + + if(APPLE) + SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -std=c++14 -pthread -fPIC -flto -DGL_SILENCE_DEPRECATION -Wl,-dead_strip") +- +- set ( OSG_LIBRARIES +- osg +- osgViewer +- osgDB +- osgdb_serializers_osgsim +- osgdb_serializers_osg +- osgGA +- osgText +- osgSim +- osgdb_osg +- osgdb_jpeg +- osgUtil +- osgAnimation +- osg +- OpenThreads +- jpeg +- "-framework OpenGL" +- "-framework Cocoa" +- dl +- z +- ) +- +- if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES +- open_simulation_interface +- protobuf +- ) +- else () +- set ( OSI_LIBRARIES +- open_simulation_interface_pic +- protobuf +- ) +- endif (DYN_PROTOBUF) +- +- +- set ( SUMO_LIBRARIES +- optimized libsumostatic debug libsumostaticd +- optimized netload debug netloadd +- optimized traciserver debug traciserverd +- optimized libsumostatic debug libsumostaticd +- optimized utils_vehicle debug utils_vehicled +- optimized utils_distribution debug utils_distributiond +- optimized utils_shapes debug utils_shapesd +- optimized utils_options debug utils_optionsd +- optimized utils_xml debug utils_xmld +- optimized utils_geom debug utils_geomd +- optimized utils_common debug utils_commond +- optimized utils_iodevices debug utils_iodevicesd +- optimized utils_traction_wire debug utils_traction_wired +- optimized utils_emissions debug utils_emissionsd +- optimized microsim_engine debug microsim_engined +- optimized microsim_lcmodels debug microsim_lcmodelsd +- optimized microsim_devices debug microsim_devicesd +- optimized microsim_trigger debug microsim_triggerd +- optimized microsim_output debug microsim_outputd +- optimized microsim_transportables debug microsim_transportablesd +- optimized microsim_actions debug microsim_actionsd +- optimized microsim_traffic_lights debug microsim_traffic_lightsd +- optimized microsim debug microsimd +- optimized mesosim debug mesosimd +- optimized foreign_phemlight debug foreign_phemlightd +- optimized foreign_tcpip debug foreign_tcpipd +- optimized microsim_cfmodels debug microsim_cfmodelsd +- optimized zlibstatic debug zlibstaticd +- optimized xerces-c_3 debug xerces-c_3D +- "-framework CoreServices" +- ) + + elseif(LINUX) + +@@ -251,82 +90,8 @@ elseif(LINUX) + SET(CMAKE_CXX_FLAGS "${CXX_STD_FLAG} -pthread -fPIC -Wl,-strip-all") + endif() + +- set ( OSG_LIBRARIES +- optimized osg debug osgd +- optimized osgViewer debug osgViewerd +- optimized osgDB debug osgDBd +- optimized osgdb_serializers_osgsim debug osgdb_serializers_osgsimd +- optimized osgdb_serializers_osg debug osgdb_serializers_osgd +- optimized osgGA debug osgGAd +- optimized osgText debug osgTextd +- optimized osgSim debug osgSimd +- optimized osgdb_osg debug osgdb_osgd +- optimized osgdb_jpeg debug osgdb_jpegd +- optimized osgUtil debug osgUtild +- optimized osgAnimation debug osgAnimationd +- optimized osg debug osgd +- optimized OpenThreads debug OpenThreadsd +- optimized jpeg debug jpegd +- +- GL +- X11 +- Xrandr +- dl +- z +- Xinerama +- fontconfig +- ) +- +- if (DYN_PROTOBUF) +- set ( OSI_LIBRARIES +- optimized open_simulation_interface debug open_simulation_interfaced +- optimized protobuf debug protobufd +- ) +- else () +- set ( OSI_LIBRARIES +- optimized open_simulation_interface_pic debug open_simulation_interface_picd +- optimized protobuf debug protobufd +- ) +- endif (DYN_PROTOBUF) +- +- set ( SUMO_LIBRARIES +- optimized libsumostatic debug libsumostaticd +- optimized netload debug netloadd +- optimized traciserver debug traciserverd +- optimized libsumostatic debug libsumostaticd +- optimized utils_vehicle debug utils_vehicled +- optimized utils_distribution debug utils_distributiond +- optimized utils_shapes debug utils_shapesd +- optimized utils_options debug utils_optionsd +- optimized utils_xml debug utils_xmld +- optimized utils_geom debug utils_geomd +- optimized utils_common debug utils_commond +- optimized utils_iodevices debug utils_iodevicesd +- optimized utils_traction_wire debug utils_traction_wired +- optimized utils_emissions debug utils_emissionsd +- optimized microsim_engine debug microsim_engined +- optimized microsim_lcmodels debug microsim_lcmodelsd +- optimized microsim_devices debug microsim_devicesd +- optimized microsim_trigger debug microsim_triggerd +- optimized microsim_output debug microsim_outputd +- optimized microsim_transportables debug microsim_transportablesd +- optimized microsim_actions debug microsim_actionsd +- optimized microsim_traffic_lights debug microsim_traffic_lightsd +- optimized microsim debug microsimd +- optimized mesosim debug mesosimd +- optimized foreign_phemlight debug foreign_phemlightd +- optimized foreign_tcpip debug foreign_tcpipd +- optimized microsim_cfmodels debug microsim_cfmodelsd +- optimized zlibstatic debug zlibstaticd +- optimized xerces-c_3 debug xerces-c_3D +- ) +- +- set (GTEST_LIBRARIES +- optimized gmock debug gmockd +- optimized gmock_main debug gmock_maind +- optimized gtest debug gtestd +- optimized gtest_main debug gtest_maind +- ) ++ set ( OSI_LIBRARIES open_simulation_interface::open_simulation_interface ) ++ set ( SUMO_LIBRARIES sumocpp tracicpp ) + + elseif(MSVC) + +@@ -510,61 +275,6 @@ FOREACH(subdir ${SUBDIRS}) + endif () + ENDFOREACH() + +- +-# +-# Download library and content binary packets +-# +- +-function (download_and_extract url target_folder target_filename) +- message (STATUS "downloading ${target_filename} ...") +- file (DOWNLOAD ${url} ${target_folder}/${target_filename} STATUS DOWNLOAD_STATUS) +- +- if(DOWNLOAD_STATUS AND NOT DOWNLOAD_STATUS EQUAL 0) +- message(FATAL_ERROR "FAILED to download ${target_filename} (Status: ${DOWNLOAD_STATUS})") +- endif() +- +- execute_process (COMMAND sleep 1) # allow for file to be completely flushed +- +- message (STATUS "extracting ${target_filename} ... ") +- execute_process (COMMAND ${CMAKE_COMMAND} -E tar xfz ${target_filename} WORKING_DIRECTORY ${target_folder} RESULT_VARIABLE STATUS) +- +- if(STATUS AND NOT STATUS EQUAL 0) +- message(FATAL_ERROR "FAILED to unpack ${target_filename}") +- endif() +- +- file (REMOVE ${target_folder}/${target_filename}) +-endfunction (download_and_extract) +- +-# download OpenSceneGraph +-set ( OSG_PACKAGE_FILENAME "osg.7z" ) +-if (DEFINED OSG_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSG_DIR} )) +- download_and_extract( ${OSG_PACKAGE_URL} ${OSG_BASE_DIR} ${OSG_PACKAGE_FILENAME} ) +-endif() +- +-# download OSI +-set ( OSI_PACKAGE_FILENAME "osi.7z" ) +-if (DEFINED OSI_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${OSI_DIR} )) +- download_and_extract( ${OSI_PACKAGE_URL} ${OSI_BASE_DIR} ${OSI_PACKAGE_FILENAME} ) +-endif() +- +-# download SUMO +-set ( SUMO_PACKAGE_FILENAME "sumo.7z" ) +-if (DEFINED SUMO_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${SUMO_DIR} )) +- download_and_extract( ${SUMO_PACKAGE_URL} ${SUMO_BASE_DIR} ${SUMO_PACKAGE_FILENAME} ) +-endif() +- +-# download googletest +-if(NOT (APPLE OR MINGW)) # not available for Mac yet +- set ( GTEST_PACKAGE_FILENAME "googletest.7z" ) +- if (DEFINED GTEST_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${GTEST_DIR} )) +- download_and_extract( ${GTEST_PACKAGE_URL} ${GTEST_BASE_DIR} ${GTEST_PACKAGE_FILENAME} ) +- endif() +-endif() +- +-if (DEFINED MODELS_DIR AND (FORCE_DOWNLOAD_BINARIES OR NOT EXISTS ${MODELS_DIR} )) +- download_and_extract(${MODELS_PACKAGE_URL} ${MODELS_BASE_DIR} ${MODELS_PACKAGE_FILENAME}) +-endif() +- + add_subdirectory(Applications/odrplot) + add_subdirectory(Applications/replayer) + +diff --git a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp +index 4c701d94..cb5de5bb 100644 +--- a/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp ++++ b/EnvironmentSimulator/Modules/Controllers/ControllerSumo.cpp +@@ -16,7 +16,6 @@ + #include "ScenarioGateway.hpp" + #include "pugixml.hpp" + +-#include + #include + #include + #include +diff --git a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt +index e4fad5f1..32d7a79c 100644 +--- a/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt ++++ b/EnvironmentSimulator/Modules/RoadManager/CMakeLists.txt +@@ -2,7 +2,7 @@ + include_directories ( + ${PUGIXML_INCLUDE_DIR} + ${COMMON_MINI_INCLUDE_DIR} +- ${ROADMANAGER_INCLUDE_DIR} ++ ${ROADMANAGER_INCLUDE_DIR} + ) + + set ( SOURCES +@@ -11,8 +11,6 @@ set ( SOURCES + LaneIndependentRouter.cpp + ) + +-set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp) +- + SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) + + set ( INCLUDES +@@ -25,6 +23,6 @@ if(MSVC) + add_definitions("/wd4482") + endif() + +-add_library ( RoadManager STATIC ${SOURCES} ${SRC_ADDITIONAL} ${INCLUDES} ) ++add_library ( RoadManager STATIC ${SOURCES} ${INCLUDES} ) + +-target_link_libraries ( RoadManager CommonMini project_options) +\ No newline at end of file ++target_link_libraries ( RoadManager CommonMini pugixml::pugixml project_options) +diff --git a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt +index aec86ad6..86da77c1 100644 +--- a/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt ++++ b/EnvironmentSimulator/Modules/ScenarioEngine/CMakeLists.txt +@@ -5,7 +5,7 @@ include_directories ( + ${ROADMANAGER_INCLUDE_DIR} + ${COMMON_MINI_INCLUDE_DIR} + ${CONTROLLERS_INCLUDE_DIR} +- ${REPLAY_INCLUDE_DIR} ++ ${REPLAY_INCLUDE_DIR} + ${RDB_INCLUDE_DIR} + ${OSI_INCLUDE_DIR} + ${SUMO_INCLUDE_DIR} +@@ -20,20 +20,15 @@ if (NOT USE_OSI) + list(REMOVE_ITEM SRC_SOURCEFILES "${CMAKE_CURRENT_LIST_DIR}/SourceFiles/OSIReporter.cpp") + endif (NOT USE_OSI) + +-set ( SRC_ADDITIONAL ../../../externals/pugixml/pugixml.cpp ) +- + SOURCE_GROUP(OSCTypeDefs FILES ${SRC_OSCTYPEDEFS}) + SOURCE_GROUP("Source Files" FILES ${SRC_SOURCEFILES}) + SOURCE_GROUP("External Libraries" FILES ${SRC_ADDITIONAL}) + +-add_library ( ScenarioEngine STATIC +- ${SRC_OSCTYPEDEFS} +- ${SRC_SOURCEFILES} +- ${SRC_ADDITIONAL} ++add_library ( ScenarioEngine STATIC ++ ${SRC_OSCTYPEDEFS} ++ ${SRC_SOURCEFILES} + ) + + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +-target_link_libraries(ScenarioEngine PRIVATE project_options) +- +- ++target_link_libraries(ScenarioEngine PRIVATE pugixml::pugixml project_options) +-- +2.38.1 + diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index b949b06531..1ade349306 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -291,6 +291,76 @@ functions in virtual scenarios.") (build-system python-build-system) (arguments '()))) +(define-public esmini + (package + (name "esmini") + (version "2.27.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/esmini/esmini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "esmini-use-pkgconfig.patch" + "esmini-no-clutter-log.patch")) + (modules '((guix build utils) (ice-9 ftw))) + (snippet + #~(with-directory-excursion "externals" + (for-each + (lambda (dir) (unless (member dir '("." ".." "expr")) + (delete-file-recursively dir))) + (scandir ".")))) + (sha256 + (base32 + "07ccydz7kxy5jc52f8fmxg4nkr1spshfnpzcv0wgd5lqz9ghjahz")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DDYN_PROTOBUF=TRUE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_HOME_DIRECTORY\\}/bin") + (string-append (assoc-ref outputs "out") "/bin"))) + (substitute* "EnvironmentSimulator/CMakeLists.txt" + (("\\$\\{OSI_DIR\\}/(include|lib)(-dyn)?" all what) + (search-input-directory + inputs + (string-append what "/osi" + #$(version-major + (package-version + (this-package-input + "open-simulation-interface")))))) + (("\\$\\{SUMO_BASE_DIR\\}/\\$\\{EXT_DIR_NAME\\}") + #$(this-package-input "sumo"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (with-directory-excursion "EnvironmentSimulator/Unittest/" + (for-each invoke (find-files "_test$"))))) + (add-after 'install 'move-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib")) + (with-directory-excursion (string-append out "/bin") + (for-each + (lambda (f) + (rename-file f (string-append out "/lib/" + (basename f)))) + (find-files "." "\\.so$"))))))))) + (inputs (list mesa + openscenegraph `(,openscenegraph "pluginlib") + open-simulation-interface + protobuf pugixml sumo)) + (native-inputs (list googletest pkg-config)) + (home-page "https://github.com/esmini/esmini") + (synopsis "Basic OpenSCENARIO player") + (description "@command{esmini} is a tool to play OpenSCENARIO files. +It is provided as both a standalone application and a shared library and has +some support for generating and analysing traffic scenarios..") + (license license:mpl2.0))) + (define-public python-fenics-dijitso (package (name "python-fenics-dijitso") -- cgit 1.4.1 From 39d72fcaa172c8cd57d6d20d67df80a4ba34b84e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 11:55:43 +0200 Subject: gnu: libreoffice: Update to 7.5.0.3. * gnu/packages/libreoffice.scm (libreoffice): Update to 7.5.0.3. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e65f1be4ad..5b4397581f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -915,7 +915,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (define-public libreoffice (package (name "libreoffice") - (version "7.4.5.1") + (version "7.5.0.3") (source (origin (method url-fetch) @@ -924,7 +924,7 @@ commonly called @code{ftoa} or @code{dtoa}.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "13g1di71jdcish4rxlyi2jglpqfiq9zjf391bwplmf9prc9cy3iq")))) + (base32 "0fq0fxwhbhikqzfl2z5xg2swlnrkg1p8l0shh6qdx9w0msihy4pm")))) (build-system glib-or-gtk-build-system) (arguments (list -- cgit 1.4.1 From 2b1d1d76e7384a4d04866c3631810a8037428290 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 11:56:12 +0200 Subject: gnu: hunspell-dictionary: Update to 7.5.0.3. * gnu/packages/hunspell.scm (hunspell-dictionary): Update to 7.5.0.3. --- gnu/packages/hunspell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index cb6b3ec422..c6db9f1495 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -276,7 +276,7 @@ spell-checking library.") (#\_ #\-) (chr chr)) (string-downcase dict-name)))) - (version "7.4.5.1") + (version "7.5.0.3") (source (origin (method git-fetch) @@ -287,7 +287,7 @@ spell-checking library.") (string-append "libreoffice-" version)))) (file-name (git-file-name "libreoffice-dictionaries" version)) (sha256 - (base32 "115p29ywyn7ncq664gxmcrrz55v23s34asd2hmrg4ahjp7ycrnmy")))) + (base32 "1yzhyx8zwlfdqw4swxyr1lq68im2bfi1chimyc15jmli72n32szs")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) -- cgit 1.4.1 From 126608f7a9649bc7761331a15940dd65ff773e0c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 18 Mar 2022 11:52:05 -0400 Subject: gnu: dav1d: Update to 1.0.0. * gnu/packages/video.scm (dav1d): Update to 1.0.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c26cfd6716..df70ed6473 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5002,7 +5002,7 @@ and audio capture, network stream playback, and many more.") (define-public dav1d (package (name "dav1d") - (version "0.9.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -5011,7 +5011,7 @@ and audio capture, network stream playback, and many more.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl")))) + (base32 "0jkvb5as7danpalzlwd0w1dc9i2vijvmf39z0j6fwqvialsgnnj5")))) (build-system meson-build-system) (native-inputs (list nasm)) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit 1.4.1 From fb9799ff5f1d90a443dc197535c48041ad6b3865 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 4 Feb 2023 17:51:44 +0100 Subject: gnu: WebKit: Update to 2.38.4. * gnu/packages/webkit.scm (%webkit-version, webkitgtk, wpewebkit): Update to 2.38.4. --- gnu/packages/webkit.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 35fb5926a3..61c75dd901 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -124,7 +124,7 @@ the WPE-flavored port of WebKit.") engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.38.3") +(define %webkit-version "2.38.4") (define-public webkitgtk (package @@ -135,7 +135,7 @@ engine that uses Wayland for graphics output.") (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")) + (base32 "0dhxrj9rdkqwbr2n8grshvgfhrzhqvbf5j9xxxgg3mfll8lylisg")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -317,7 +317,7 @@ propagated by default) such as @code{gst-plugins-good} and (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "160456k4yiml0zn2fxba9qwp94dvvn93z9rqs2qa2lvjxig0gn8x")))) + (base32 "0yx06ycmiv770nya3dss56bxqmf77cr4v0j04szb07qmxw9w26wc")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit 1.4.1 From ab8327d4ce89e4da937040a36d749762c0741e5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 12:56:18 +0200 Subject: gnu: translate-shell: Update to 0.9.7.1. * gnu/packages/dictionaries.scm (translate-shell): Update to 0.9.7.1. --- gnu/packages/dictionaries.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 7024937672..ea7ba538e8 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2021 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018, 2020-2022 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -239,7 +239,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.7") + (version "0.9.7.1") (source (origin (method git-fetch) @@ -248,7 +248,7 @@ and a Python library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03p00v8g0y2xs3sza2r2kmhwiajaz9viab6xk9snw7chzw2cddiq")))) + (base32 "0jfrypcz963pfvwwaz2i0xvwp2909ldzp15v68mgd2mbqkqw9d90")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From a4ac96d18e0fc3642041c7d177db215ca3bf8a40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 12:59:22 +0200 Subject: gnu: tig: Update to 2.5.8. * gnu/packages/version-control.scm (tig): Update to 2.5.8. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 12e21336ce..7aec929246 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016, 2019, 2021 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Flashner ;;; Copyright © 2015, 2018, 2020, 2021, 2022 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari @@ -2407,7 +2407,7 @@ any project with more than one developer, is one of Aegis's major functions.") (define-public tig (package (name "tig") - (version "2.5.7") + (version "2.5.8") (source (origin (method url-fetch) (uri (string-append @@ -2415,7 +2415,7 @@ any project with more than one developer, is one of Aegis's major functions.") version "/tig-" version ".tar.gz")) (sha256 (base32 - "0xna55y1r1jssdmrzpinv96p7w00w9hn39q5l3d8l299dg4bmiyv")) + "14b38200bmwvi3030hqnwdsp34854ck3bzncj0wlljnpmr10l3mp")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 89cea75fcd6da3e2cfdb5561848071415dfbdc23 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 13:02:02 +0200 Subject: gnu: parallel: Update to 20230122. * gnu/packages/parallel.scm (parallel): Update to 20230122. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 853fdaaa5f..e2a6cfb668 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Eric Bavier ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016, 2020, 2021, 2022 Ricardo Wurmus @@ -64,14 +64,14 @@ (define-public parallel (package (name "parallel") - (version "20221222") + (version "20230122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0zsrz25yyhkvrkvlblmgrqhcyr9zavflknz3nhql9a8qxixhraad")) + (base32 "0162xprlxka96k4nlsz5qckvwqinrjv6q2404gkihcfa1h3l8z4w")) (snippet '(begin (use-modules (guix build utils)) -- cgit 1.4.1 From 36da1f2804531a28d6f1b7c814b4d3375a553fc1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 13:09:07 +0200 Subject: gnu: vim: Update to 9.0.1303. * gnu/packages/vim.scm (vim): Update to 9.0.1303. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index eda25dc909..6baf10915a 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016-2023 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke @@ -79,7 +79,7 @@ (define-public vim (package (name "vim") - (version "9.0.1073") + (version "9.0.1303") (source (origin (method git-fetch) (uri (git-reference @@ -88,7 +88,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0vifinbxjcs7j3zs290q91009cdqijn2awyva2332if7qbx48ssw")))) + "16difqsdl3v9irjiaj2zqiyn5q94r70ws4i1ygrrcpzk6127mk2q")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 455f0bd191134cd6cd8f6a29b551122209a7421d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 15:02:44 +0200 Subject: gnu: git-annex: Update to 10.20230126. * gnu/packages/haskell-apps.scm (git-annex): Update to 10.20230126. --- gnu/packages/haskell-apps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 64dde4d313..58992c2097 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2019, 2020 Kyle Meyer ;;; Copyright © 2015 John Soo -;;; Copyright © 2019, 2020, 2022 Efraim Flashner +;;; Copyright © 2019, 2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Brian Leung @@ -307,14 +307,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "10.20221212") + (version "10.20230126") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0afnl2w29w4j0229rsla93dzkmhcjlp8dv76sr861n186ywv8rzg")))) + (base32 "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 3a259f1d5026ccbd4f1ff613edfbf76785c1a66c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 15:17:27 +0200 Subject: gnu: coeurl: Update to 0.3.0. * gnu/packages/curl.scm (coeurl): Update to 0.3.0. --- gnu/packages/curl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index c713859a62..eb88c10f24 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès ;;; Copyright © 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2023 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2019, 2021 Ricardo Wurmus @@ -366,7 +366,7 @@ curl to obtain exactly that HTTP request.") (define-public coeurl (package (name "coeurl") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) @@ -375,7 +375,7 @@ curl to obtain exactly that HTTP request.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qbbrfs35zl0wl6x6jn4p9ncxgdm70a883cflvikkykx9n5k2lpq")))) + (base32 "1b435c2szwibm4i4r7mh22klyv9ncdkwkiy95p4xjfalsx4ripxh")))) (build-system meson-build-system) (native-inputs (list doctest pkg-config)) -- cgit 1.4.1 From 187e3107b99a193041d9d58bd92e2b627099518b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 15:20:25 +0200 Subject: gnu: mtxclient: Update to 0.9.1. * gnu/packages/messaging.scm (mtxclient): Update to 0.9.1. [inputs]: Add re2. --- gnu/packages/messaging.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e7da2e0b8d..5f6792f5a2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2015, 2018, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2015, 2018-2021, 2023 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur @@ -123,6 +123,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) @@ -2357,7 +2358,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.8.2") + (version "0.9.1") (source (origin (method git-fetch) @@ -2366,7 +2367,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "041ckjvfxapv1q6x9xd8q70x43cz10x7p11aql58lnc0jp0kwry7")))) + (base32 "0m8agc3c4n03r92nz3gxkpxmj2c3ncf125nmfdv0jf24gxib126z")))) (arguments `(#:configure-flags (list @@ -2386,9 +2387,10 @@ QMatrixClient project.") curl json-modern-cxx libevent - olm libsodium + olm openssl + re2 spdlog zlib)) (native-inputs -- cgit 1.4.1 From c0839cbac22e9ab12219ae3fb766c7b81daa91f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 15:20:57 +0200 Subject: gnu: nheko: Update to 0.11.2. * gnu/packages/messaging.scm (nheko): Update to 0.11.2. [inputs]: Add re2. --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5f6792f5a2..3027d56907 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2404,7 +2404,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.10.2") + (version "0.11.1") (source (origin (method git-fetch) @@ -2413,7 +2413,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "114hbv58209bwar6qjdjg2l1vh3xk20ppv6n301i7zkmwrf7q9w2")) + (base32 "0j5y5jfimmflynrg7003wr7i75b102cpv3afyp3j7z69b2apkhys")) (modules '((guix build utils))) (snippet '(begin @@ -2483,6 +2483,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") qtmultimedia-5 qtquickcontrols2-5 qtsvg-5 + re2 spdlog single-application-qt5 xcb-util-wm -- cgit 1.4.1 From e1081bcdaefed4a286e0b0272be70b3571759996 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:39:23 +0200 Subject: gnu: zathura-cb: Update to 0.1.10. * gnu/packages/pdf.scm (zathura-cb): Update to 0.1.10. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index cf5a7af6e0..9c21cb894c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -443,7 +443,7 @@ reading and editing of existing PDF files.") (define-public zathura-cb (package (name "zathura-cb") - (version "0.1.8") + (version "0.1.10") (source (origin (method url-fetch) (uri @@ -451,7 +451,7 @@ reading and editing of existing PDF files.") version ".tar.xz")) (sha256 (base32 - "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) + "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49")))) (native-inputs (list pkg-config)) (inputs (list libarchive zathura)) (build-system meson-build-system) @@ -460,7 +460,7 @@ reading and editing of existing PDF files.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.1.8: the new Meson build system + ;; Something of a regression in 0.1.10: the new Meson build system ;; now hard-codes an incorrect plugin directory. Fix it. (lambda* (#:key outputs #:allow-other-keys) (substitute* "meson.build" -- cgit 1.4.1 From d49be105d5d15a0819137109491363cc6d2c5f12 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:39:29 +0200 Subject: gnu: zathura-ps: Update to 0.2.7. * gnu/packages/pdf.scm (zathura-ps): Update to 0.2.7. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9c21cb894c..9857569a1e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -477,7 +477,7 @@ using libarchive.") (define-public zathura-ps (package (name "zathura-ps") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri @@ -485,7 +485,7 @@ using libarchive.") version ".tar.xz")) (sha256 (base32 - "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) + "0ilf63wxn1yzis9m3qs8mxbk316yxdzwxrrv86wpiygm9hhgk5sq")))) (native-inputs (list pkg-config)) (inputs (list libspectre zathura)) (build-system meson-build-system) @@ -494,7 +494,7 @@ using libarchive.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.2.6: the new Meson build system + ;; Something of a regression in 0.2.7: the new Meson build system ;; now hard-codes an incorrect plugin directory. Fix it. (lambda* (#:key outputs #:allow-other-keys) (substitute* "meson.build" -- cgit 1.4.1 From 10049e35abe9b8dc126c262c9ba9a4d71eac586f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:39:30 +0200 Subject: gnu: zathura-pdf-mupdf: Update to 0.4.0. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.4.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9857569a1e..5b930bc464 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -546,7 +546,7 @@ using the DjVuLibre library.") (define-public zathura-pdf-mupdf (package (name "zathura-pdf-mupdf") - (version "0.3.9") + (version "0.4.0") (source (origin (method url-fetch) (uri @@ -554,7 +554,7 @@ using the DjVuLibre library.") "/download/zathura-pdf-mupdf-" version ".tar.xz")) (sha256 (base32 - "01vw0lrcj9g7d5h2xvm4xb08mvfld4syfr381fjrbdj52zm9bxvp")))) + "0pcjxvlh4hls8mjhjghhhihyy2kza8l27wdx0yq4bkd1g1b5f74c")))) (native-inputs (list pkg-config)) (inputs (list gumbo-parser -- cgit 1.4.1 From 4cf0c6ee6da25c6e0fe9185e5b59cc21c6ae2163 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:39:30 +0200 Subject: gnu: zathura-pdf-poppler: Update to 0.3.1. * gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.3.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 5b930bc464..30fbceb24f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -596,7 +596,7 @@ by using the @code{mupdf} rendering library.") (define-public zathura-pdf-poppler (package (name "zathura-pdf-poppler") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri @@ -604,7 +604,7 @@ by using the @code{mupdf} rendering library.") version ".tar.xz")) (sha256 (base32 - "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m")))) + "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf")))) (native-inputs (list pkg-config)) (inputs (list poppler zathura)) -- cgit 1.4.1 From cddc26a6f90476a8177589e6bf574a1c292476b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:39:30 +0200 Subject: gnu: zathura: Update to 0.5.2. * gnu/packages/pdf.scm (zathura): Update to 0.5.2. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 30fbceb24f..864c23b0d2 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Nikita -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Efraim Flashner +;;; Copyright © 2016-2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2016, 2017, 2022 Marius Bakke ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2016 Julien Lepiller @@ -631,7 +631,7 @@ by using the poppler rendering engine.") (define-public zathura (package (name "zathura") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri @@ -639,7 +639,7 @@ by using the poppler rendering engine.") version ".tar.xz")) (sha256 (base32 - "1c8vmfpghqlq5kdnq92bzzp2grym3x3kxxxqgs51178s4z7639lq")))) + "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6")))) (native-inputs (list pkg-config gettext-minimal -- cgit 1.4.1 From 2b1383c0a2f79117103b142440c64f6a751d545d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 12 Feb 2023 16:52:58 +0200 Subject: gnu: mujs: Update to 1.3.2. * gnu/packages/javascript.scm (mujs): Update to 1.3.2. --- gnu/packages/javascript.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index f0580eff8b..fa37549625 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2019, 2020, 2022 Ricardo Wurmus ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018, 2019, 2020, 2022 Efraim Flashner +;;; Copyright © 2017-2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2021 Pierre Neidhardt ;;; Copyright © 2021 Maxim Cournoyer @@ -762,7 +762,7 @@ animating a series of images.") (define-public mujs (package (name "mujs") - (version "1.2.0") + (version "1.3.2") (source (origin (method git-fetch) @@ -771,7 +771,7 @@ animating a series of images.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0kqw3xhjk4l2jar14a1f9b3m0xq0h2g3nc9m6hsdv7kf8jhfm83l")) + (base32 "1kfp2246pzmrb65c0gfcy130zd7sbniclpjx2jv6jbkmpkjs8kb1")) (snippet #~(begin (use-modules (guix build utils)) -- cgit 1.4.1 From 7c51c9e3d4bc026813e94402c0e15429d38d4421 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Feb 2023 11:37:48 +0200 Subject: gnu: universal-ctags: Install man pages. * gnu/packages/code.scm (universal-ctags)[native-inputs]: Add python-docutils. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 4f6a4f07c7..e62cd15995 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo @@ -475,7 +475,7 @@ features that are not supported by the standard @code{stdio} implementation.") (substitute* "Tmain/utils.sh" (("/bin/echo") (which "echo")))))))) (native-inputs - (list autoconf automake packcc perl pkg-config)) + (list autoconf automake packcc perl pkg-config python-docutils)) (inputs (list jansson libseccomp libxml2 libyaml pcre2)) (home-page "https://ctags.io/") -- cgit 1.4.1 From 5b1eab43f011983d9ee560d6935409b6b39706ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Feb 2023 11:41:06 +0200 Subject: gnu: universal-ctags: Update to 6.0.20230212.0. * gnu/packages/code.scm (universal-ctags): Update to 6.0.20230212.0. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index e62cd15995..e8bc0e4307 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -430,7 +430,7 @@ features that are not supported by the standard @code{stdio} implementation.") (define-public universal-ctags (package (name "universal-ctags") - (version "6.0.20230122.0") + (version "6.0.20230212.0") (source (origin (method git-fetch) @@ -440,7 +440,7 @@ features that are not supported by the standard @code{stdio} implementation.") (file-name (git-file-name name version)) (sha256 (base32 - "121d1dyc3wd4bzv4wky3x66j1va3d6ywbw71abp3l88fv7sc0f73")) + "0616y8sqbydh4baixs1fndknjvhfpf57p7a0yr1l5n732lknk2pm")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 8d8b9a4c0c6273ce1680233ae234294f511e81b6 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 29 Jan 2023 21:06:31 +0100 Subject: gnu: wpa-supplicant: Add netdev group dbus policy. The patch allows users in netdev group to control wpa-supplicant via D-Bus interface. * gnu/packages/admin.scm (wpa-supplicant)[source]: Add dbus policy patch. * gnu/packages/patches/wpa-supplicant-dbus-group-policy.patch: New file. Signed-off-by: Andrew Tropin --- gnu/packages/admin.scm | 4 ++++ .../patches/wpa-supplicant-dbus-group-policy.patch | 23 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 gnu/packages/patches/wpa-supplicant-dbus-group-policy.patch (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3d0886aba8..847a252364 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2222,6 +2222,10 @@ command.") (name "wpa-supplicant") (inputs (modify-inputs (package-inputs wpa-supplicant-minimal) (prepend dbus))) + (source (origin + (inherit (package-source wpa-supplicant-minimal)) + (patches (search-patches + "wpa-supplicant-dbus-group-policy.patch")))) (arguments (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) ((#:phases phases) diff --git a/gnu/packages/patches/wpa-supplicant-dbus-group-policy.patch b/gnu/packages/patches/wpa-supplicant-dbus-group-policy.patch new file mode 100644 index 0000000000..95c18dac18 --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-dbus-group-policy.patch @@ -0,0 +1,23 @@ +Borrowed from debian, allows users in netdev group to control wpa-supplicant +via D-Bus. + +Description: Debian does not use pam_console but uses group membership + to control access to D-Bus. Activating both options in the conf file + makes it work on Debian and Ubuntu. +Author: Michael Biebl +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=412179 +--- +--- a/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ++++ b/wpa_supplicant/dbus/dbus-wpa_supplicant.conf +@@ -14,6 +14,11 @@ + + + ++ ++ ++ ++ ++ + + + -- cgit 1.4.1 From a9b31c567e17a31a9e4e0b1c091626f784b7dbef Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 13 Feb 2023 17:14:49 +0100 Subject: gnu: Add cl-nclasses. * gnu/packages/lisp-xyz.scm (cl-nclasses, ecl-nclasses, sbcl-nclasses): New variables. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 489763bc97..c45822fead 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23832,6 +23832,41 @@ change since last write. (cons (list "iolib" cl-iolib) (package-inputs sbcl-nfiles))))) +(define-public sbcl-nclasses + (package + (name "sbcl-nclasses") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atlas-engineer/nclasses") + (commit version))) + (file-name (git-file-name "cl-nclasses" version)) + (sha256 + (base32 + "08mad0555n883rjyg4j7r1vp35cyl4spbqfamjfalv5bl8d38849")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-moptilities)) + (native-inputs + (list sbcl-lisp-unit2)) + (home-page "https://github.com/atlas-engineer/nclasses") + (synopsis "Simplify class and condition definitions.") + (description + "NClasses provides helper macros to help write classes and conditions +with less boilerplate. + +It's a fork of @code{hu.dwim.defclass-star}. It inclues some bug fixes and +extra features like type inference.") + (license license:public-domain))) + +(define-public ecl-nclasses + (sbcl-package->ecl-package sbcl-nclasses)) + +(define-public cl-nclasses + (sbcl-package->cl-source-package sbcl-nclasses)) + (define-public sbcl-cl-template (let ((commit "46193a9a389bb950530e579eae7e6e5a18184832") (revision "0")) -- cgit 1.4.1 From ee69b60426d4f87ea19e32f757f1e7415ae58879 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 13 Feb 2023 18:34:56 +0100 Subject: gnu: cm: Update to 0.4.1. * gnu/packages/algebra.scm (cm): Update to 0.4.1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index e093056e0d..91de046a08 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -131,7 +131,7 @@ greatest common divisor operations.") (define-public cm (package (name "cm") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append @@ -139,7 +139,7 @@ greatest common divisor operations.") version ".tar.gz")) (sha256 (base32 - "04l3inafql40n0r5rq8rmp21zplgdrzblil2kgkpx5s0jbs9i8rr")))) + "1avaw6a7lyc2833gr9b7zpk4blvrrrkz8r62sv1grh9xc9i4zg07")))) (build-system gnu-build-system) (propagated-inputs (list mpfrcx zlib)) ; Header files included from cm_common.h. -- cgit 1.4.1 From e8483a410ba6858ad97ae55605d43054ff42bd67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Feb 2023 17:34:30 +0000 Subject: gnu: python-git-multimail: Update to 1.6.0. * gnu/packages/version-control.scm (python-git-multimail): Update to 1.6.0. [arguments]: Patch setup.py to fix finding. README.rst. --- gnu/packages/version-control.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7aec929246..5de344e549 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1114,20 +1114,23 @@ a built-in cache to decrease server I/O pressure.") (define-public python-git-multimail (package (name "python-git-multimail") - (version "1.5.0.post1") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "git-multimail" version)) (sha256 (base32 - "1zkrbsa70anwpw86ysfwalrb7nsr064kygfiyikyq1pl9pcl969y")))) + "0hwgf2p2dd4z397wj0y558s8xxbkzbsa6yb9n1iax624y7swjng1")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda* (#:key inputs #:allow-other-keys) + (substitute* "setup.py" + (("'git-multimail', 'README.rst'") + "'README.rst'")) (substitute* "git-multimail/git_multimail.py" (("GIT_EXECUTABLE = 'git'") (string-append "GIT_EXECUTABLE = '" -- cgit 1.4.1 From ecebf5924c28154794fb344b2ea1b057512ca06a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 10 Jan 2023 18:09:07 +0000 Subject: gnu: r-survival: Update to 3.5-0. * gnu/packages/statistics.scm (r-survival): Update to 3.5-0. Signed-off-by: Christopher Baines --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7ba75cf59d..b41e89075f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -780,14 +780,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.4-0") + (version "3.5-0") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "04pqkklbjpcqaq49h49j0vw18q4hi31ry3szzf84vzk5fba273m4")))) + "12nwvfa921m546acxiidpif6g1laz1h1vxbwc45ww69wdc51gcmq")))) (build-system r-build-system) (propagated-inputs (list r-matrix)) -- cgit 1.4.1 From 7696206ce841b1b5bc70ecee0ab907d31920e71d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 12 Jan 2023 20:35:24 +0000 Subject: gnu: LLVM, Clang, libomp, lld: Update to 15.0.7. * gnu/packages/llvm.scm (llvm-15, clang-15, libomp-15, lld-15): Update to 15.0.7. Signed-off-by: Christopher Baines --- gnu/packages/llvm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 58bd91d7be..1468a79c90 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -562,11 +562,11 @@ output), and Binutils.") (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") - ("15.0.6" . "13vj0q6if5095a3awq8d97l17qdsc7fks6avkai9k80kl0kzxpv6"))) + ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) - ("15.0.6" . ("clang-15.0-libc-search-path.patch")))) + ("15.0.7" . ("clang-15.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -582,7 +582,7 @@ output), and Binutils.") (define-public llvm-15 (package (name "llvm") - (version "15.0.6") + (version "15.0.7") (source (llvm-monorepo version)) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) @@ -739,7 +739,7 @@ of programming tools as well as libraries with equivalent functionality.") (package-version llvm-15))) (sha256 (base32 - "099v2yqg11h0h8qqddzkny6b77pafcr7vy5ksc33kqggji173ccj"))))) + "1lagnspm5limxh1cp5jlixnzlhf09905d4rqra1kpgj6dps2x6l0"))))) (define-public clang-14 (clang-from-llvm -- cgit 1.4.1 From 2106deb9f6f7d6efaa3e170a99e7172c222eda10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:16:53 +0100 Subject: gnu: fet: Update to 6.8.3. * gnu/packages/education.scm (fet): Update to 6.8.3. Signed-off-by: Christopher Baines --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index dbb704c136..62c4d2352d 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -582,7 +582,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.8.2") + (version "6.8.3") (source (origin (method url-fetch) @@ -591,7 +591,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "1wv7qwfmpmmfyr2kklp2q047rl38ps55cizjrm6v8np2cjl0ah3g")))) + (base32 "1iqjdldarh8r92qq7c00m1gkdf53v8csmm7if3h4rhajz91rcnm2")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 54cd2049e862f460a6add2430230f2c9c109a52d Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 11 Feb 2023 10:10:25 +0000 Subject: gnu: osm2pgsql: Update to 1.8.0. * gnu/packages/geo.scm (osm2pgsql): Update to 1.8.0. [arguments]: Remove -DEXTERNAL_RAPIDJSON configure-flag, since osm2pgsql 1.8.0 does not use rapidjson anymore. [inputs]: Remove rapidjson. Signed-off-by: Christopher Baines --- gnu/packages/geo.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 097ced33e1..b9a617c009 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1415,7 +1415,7 @@ based on the Osmium library.") (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.7.0") + (version "1.8.0") (source (origin (method git-fetch) @@ -1424,7 +1424,7 @@ based on the Osmium library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii")) + (base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1435,8 +1435,7 @@ based on the Osmium library.") #:configure-flags (list "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON" - "-DEXTERNAL_RAPIDJSON=ON"))) + "-DEXTERNAL_FMT=ON"))) (inputs (list boost bzip2 @@ -1447,7 +1446,6 @@ based on the Osmium library.") postgresql proj protozero - rapidjson zlib)) (native-inputs (list python python-psycopg2)) -- cgit 1.4.1 From af1c817c84dfb074862451de04db3c8b9b534d9f Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Sat, 11 Feb 2023 22:16:45 +0100 Subject: gnu: icedove: Update to 102.7.2. * gnu/packages/gnuzilla.scm (%icedove-build-id, icedove-version, thunderbird-source): Update to 102.7.2 build 20230207000000. Signed-off-by: Christopher Baines --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0b39774a2e..150481f1dc 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1097,8 +1097,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20230119000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.7.0") +(define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.7.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1107,11 +1107,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "a786f143946e93a3059e6fe290bb954840ab9778"))) + (changeset "0f6deed0752b618055c34e06c268af3da9d1548d"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "02pz9yhpp3lswjmvj30vbx05mbi31bnzzfwyw5v996zg5wz2fpyv")))) + "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) (define-public icedove (package -- cgit 1.4.1 From 403066162cefb65b4ad858517722641c6394ffc2 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 11 Feb 2023 22:59:26 -0500 Subject: gnu: libnitrokey: Update to 3.8. * gnu/packages/security-token.scm (libnitrokey): Update to 3.8. [description]: Fix typo. Signed-off-by: Christopher Baines --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 619be42305..a7f5e3acf9 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -725,7 +725,7 @@ an unprivileged user.") (define-public libnitrokey (package (name "libnitrokey") - (version "3.6") + (version "3.8") (source (origin (method git-fetch) (uri (git-reference @@ -734,7 +734,7 @@ an unprivileged user.") (file-name (git-file-name name version)) (sha256 (base32 - "0ngrvv61d36vvfwrfg0qxmp2wg18v4aaldwvwzgxvwaysjswhn9r")))) + "1b95l979y353rli54a79z18iya9bza83cymcjpndr01q1pb134zm")))) (build-system cmake-build-system) (arguments ;; These tests do not require any device to be connected @@ -743,7 +743,7 @@ an unprivileged user.") (inputs (list hidapi libusb)) (home-page "https://github.com/Nitrokey/libnitrokey") (synopsis "Communication library for Nitrokey") - (description "This packate provides communication library for Nitrokey.") + (description "This package provides a communication library for Nitrokey.") (license license:lgpl3+))) (define-public cppcodec -- cgit 1.4.1 From dd724cfad45d76b9dcc5b073876c995715c92a07 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 13 Feb 2023 01:11:35 +0800 Subject: gnu: picard: Update to 2.8.5. * gnu/packages/music.scm (picard): Update to 2.8.5. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e99bee9cc7..6fb2824483 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3678,7 +3678,7 @@ event-based scripts for scrobbling, notifications, etc.") (define-public picard (package (name "picard") - (version "2.8.3") + (version "2.8.5") (source (origin (method url-fetch) (uri (string-append @@ -3686,7 +3686,7 @@ event-based scripts for scrobbling, notifications, etc.") "picard/picard-" version ".tar.gz")) (sha256 (base32 - "0h4yk1y4k23hkfk7k2in27rd34ani857m0vvn7xa8vxizz951dka")))) + "1kjl7iqgvvrv7mygsb7491cz872gm334489nyj0v8b79bxnzghdi")))) (build-system python-build-system) (arguments (list -- cgit 1.4.1 From f223f773a4e52d17643191c667ed3eef6270cb09 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 22:04:12 +0100 Subject: gnu: Add r-visnetwork. * gnu/packages/cran.scm (r-visnetwork): New variable. --- gnu/packages/cran.scm | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ca7ab0f9a..b4dc7822f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30777,6 +30777,98 @@ data visualisations of an entire dataset to identify problems or unexpected feat using @code{ggplot2}.") (license license:expat))) +(define-public r-visnetwork + (package + (name "r-visnetwork") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "visNetwork" version)) + (sha256 + (base32 + "116w3l65lgv18xzav5zz1pbgwpwck66n9cjpja9axrl9zi19vja7")) + (snippet + '(for-each delete-file + '("inst/htmlwidgets/lib/vis/vis-network.min.js" + "inst/htmlwidgets/lib/export/FileSaver/FileSaver.min.js" + "inst/common-docs-files/js/jquery.url.min.js"))))) + (properties `((upstream-name . "visNetwork"))) + (build-system r-build-system) + (arguments + (list + #:modules '((guix build utils) + (guix build r-build-system) + (srfi srfi-1)) + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + ;; The inst directory contains some minified JavaScript + ;; files. Regenerate them from sources. + (with-directory-excursion "inst/" + (call-with-values + (lambda () + (unzip2 + `((,(search-input-file inputs "/FileSaver.js") + "htmlwidgets/lib/export/FileSaver/FileSaver.min.js") + (,(search-input-file inputs "/url.js") + "common-docs-files/js/jquery.url.min.js") + (,(assoc-ref inputs "vis-network.js") + "htmlwidgets/lib/vis/vis-network.min.js")))) + (lambda (sources targets) + (for-each (lambda (source target) + (format #true "Processing ~a --> ~a~%" + source target) + (invoke "esbuild" source "--minify" + (string-append "--outfile=" target))) + sources targets))))))))) + (propagated-inputs + (list r-htmltools + r-htmlwidgets + r-jsonlite + r-magrittr)) + (native-inputs + `(("r-knitr" ,r-knitr) + ("esbuild" ,esbuild) + ;; The included file has no version information but was created + ;; at around the same time as version 9.1.0. + ("vis-network.js" + ,(origin + (method url-fetch) + (uri "https://unpkg.com/vis-network@9.1.0/dist/vis-network.js") + (sha256 + (base32 + "0vh2zf221ildsr5ly9idxi3jpqx61j3phbz5kdd801i0crqk4yj0")))) + ;; Version 1.2.0 is a few months more recent than what + ;; visNetwork bundles. + ("filesaver.js" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eligrey/FileSaver.js/") + (commit "1.2.0"))) + (file-name (git-file-name "FileSaver.js" "1.2.0")) + (sha256 + (base32 + "07mw01056fk36pganhs27y8rl5y5hrdsm945pwbbvmdjnzq4ijny")))) + ("jquery-url.js" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/websanova/js-url/") + (commit "v1.8.6"))) + (file-name (git-file-name "js-url.js" "1.8.6")) + (sha256 + (base32 + "0pxqjwqf9avd4d99csgny8xf5c65kyqjnm24pwm4ca1zghsl9wyr")))))) + (home-page "https://datastorm-open.github.io/visNetwork/") + (synopsis "Network Visualization using vis.js Library") + (description + "This package provides an R interface to the vis.js JavaScript charting +library. It allows an interactive visualization of networks.") + (license license:expat))) + (define-public r-muhaz (package (name "r-muhaz") -- cgit 1.4.1 From 51d2b76529def12628fb124cbbe98ffe407e2145 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 12:29:28 +0000 Subject: gnu: icedove-wayland: Use gexps. * gnu/packages/gnuzilla.scm (icedove/wayland) [inputs]: Set to the empty list. [arguments]: Use gexps. --- gnu/packages/gnuzilla.scm | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 150481f1dc..de6db9ddfb 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1420,37 +1420,30 @@ Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (package (inherit icedove) (name "icedove-wayland") - (native-inputs '()) - (inputs - `(("bash" ,bash-minimal) - ("icedove" ,icedove))) (build-system trivial-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin + (list + #:modules '((guix build utils)) + #:builder + #~(begin (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "bash")) - (icedove (assoc-ref %build-inputs "icedove")) - (out (assoc-ref %outputs "out")) - (exe (string-append out "/bin/icedove"))) + (let* ((exe (string-append #$output "/bin/icedove"))) (mkdir-p (dirname exe)) - (call-with-output-file exe (lambda (port) (format port "#!~a MOZ_ENABLE_WAYLAND=1 exec ~a $@" - (string-append bash "/bin/bash") - (string-append icedove "/bin/icedove")))) + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append icedove "/share") - (string-append out "/share")) - (substitute* (string-append - out "/share/applications/icedove.desktop") - ((icedove) out)) - #t)))))) + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) (define-public firefox-decrypt (package -- cgit 1.4.1 From 7df2b610fc8ad163874437b1dd04f49de084508d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 13:04:51 +0000 Subject: gnu: Add nspr-next. * gnu/packages/nss.scm (nspr-next): New variable. --- gnu/packages/nss.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 0d18592be4..b24f9abdde 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. @@ -107,6 +107,19 @@ in the Mozilla clients.") (base32 "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv")))))) +(define-public nspr-next + (package + (inherit nspr) + (version "4.35") + (source (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v" + version "/src/nspr-" version ".tar.gz")) + (sha256 + (base32 + "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy")))))) + (define-public nss (package (name "nss") -- cgit 1.4.1 From cc9633ad07ee360b9d2a44aab9a52d5a206acbf7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 13:14:13 +0000 Subject: gnu: Add nss-next. * gnu/packages/nss.scm (nss-next): New variable. --- gnu/packages/nss.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b24f9abdde..c1d9966fd7 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -242,3 +242,20 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) + +(define-public nss-next + (package + (inherit nss) + (version "3.83") + (source (origin + (inherit (package-source nss)) + (uri (let ((version-with-underscores + (string-join (string-split version #\.) "_"))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" version-with-underscores "_RTM/src/" + "nss-" version ".tar.gz"))) + (sha256 + (base32 + "0a01xwfrr334mibj1agbykjkc72ph906f2n8ff5hn2b4z5kyl8xb")))) + (propagated-inputs (list nspr-next)))) ;required by nss.pc -- cgit 1.4.1 From 9fd1cd442fab5e80bed33dccbbbec51c098ffc2a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 12:38:12 +0000 Subject: gnu: icedove: Unbundle NSS. * gnu/packages/gnuzilla.scm (icedove) [inputs]: Add nss-next. Remove nspr-4.32. [configure]: Add "ac_add_options --with-system-nss". --- gnu/packages/gnuzilla.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index de6db9ddfb..082a54abec 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1306,7 +1306,7 @@ ca495991b7852b855")) "ac_add_options --with-system-jpeg\n" "ac_add_options --with-system-libevent\n" "ac_add_options --with-system-nspr\n" - ;"ac_add_options --with-system-nss\n" + "ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" "ac_add_options --without-wasm-sandboxed-libraries\n" "mk_add_options MOZ_MAKE_FLAGS=-j" @@ -1383,9 +1383,7 @@ ca495991b7852b855")) libxt mesa mit-krb5 - nspr-4.32 - ;; FIXME: create nss >= 3.68 after core-updates merge - ;;nss + nss-next pango pixman pulseaudio -- cgit 1.4.1 From fbd3565efc81f22faf9c52cb33ab0946c44682fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 12:46:24 +0000 Subject: gnu: icedove: Use more gexps. * gnu/packages/gnuzilla.scm (icedove) [configure]: Use search-input-file and this-package-native-input. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 082a54abec..ef21673e2f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1246,7 +1246,8 @@ ca495991b7852b855")) (string-drop hash 8)))))) (delete 'bootstrap) (replace 'configure - (lambda* (#:key inputs configure-flags #:allow-other-keys) + (lambda* (#:key native-inputs inputs configure-flags + #:allow-other-keys) (let* ((bash (which "bash")) (abs-srcdir (getcwd)) (srcdir (string-append "../" (basename abs-srcdir))) @@ -1298,9 +1299,12 @@ ca495991b7852b855")) "ac_add_options --enable-system-ffi\n" "ac_add_options --enable-system-pixman\n" "ac_add_options --prefix=" #$output "\n" - "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" + "ac_add_options --with-clang-path=" + (search-input-file (or native-inputs inputs) + "bin/clang") "\n" "ac_add_options --with-distribution-id=org.gnu\n" - "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" + "ac_add_options --with-libclang-path=" + #$(this-package-native-input "clang") "/lib\n" "ac_add_options --with-system-bz2\n" "ac_add_options --with-system-icu\n" "ac_add_options --with-system-jpeg\n" -- cgit 1.4.1 From 47f0e022dcc3a7f3fbf36654d75a22a4e61a7dc5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Feb 2023 09:01:51 -0500 Subject: gnu: icedove: Install icons. * gnu/packages/gnuzilla.scm (icedove) [phases]: Add install-icons phase. Series-to: 61391@debbugs.gnu.org Cover-letter: Improvements to Icedove (icons, gexps, un-bundling) Hi Guix, This series improves our Icedove package a bit, unbundling NSS and producing its icon so that it looks more tidy in GNOME or other desktop environments. Thanks! END --- gnu/packages/gnuzilla.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ef21673e2f..33b5744c17 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1347,6 +1347,19 @@ ca495991b7852b855")) Name=Write new message~@ Exec=~@*~a/bin/icedove -compose~%" #$output)))))) + (add-after 'install-desktop-file 'install-icons + (lambda _ + (with-directory-excursion "browser/branding/official" + (for-each + (lambda (file) + (let* ((size (string-filter char-numeric? file)) + (icons (string-append #$output "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file file (string-append icons "/icedove.png")))) + '("default16.png" "default22.png" "default24.png" + "default32.png" "default48.png" "content/icon64.png" + "mozicon128.png" "default256.png"))))) (add-after 'install 'wrap-program (lambda* (#:key inputs #:allow-other-keys) (let* ((lib (string-append #$output "/lib")) -- cgit 1.4.1 From 7260cc75daef53bae508e738206fd55bb75ea177 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 22:34:37 +0100 Subject: gnu: fastqc: Use gexp. * gnu/packages/bioinformatics.scm (fastqc)[arguments]: Use gexp; drop trailing #T from build phase. [inputs]: Drop package labels. --- gnu/packages/bioinformatics.scm | 71 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1e7ce7eb60..265697d625 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5262,44 +5262,41 @@ VCF.") "18rrlkhcrxvvvlapch4dpj6xc6mpayzys8qfppybi8jrpgx5cc5f")))) (build-system ant-build-system) (arguments - `(#:tests? #f ; there are no tests - #:build-target "build" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-dependencies - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "build.xml" - (("jbzip2-0.9.jar") - (search-input-file inputs "/share/java/jbzip2.jar")) - (("sam-1.103.jar") - (search-input-file inputs - "/share/java/sam-1.112.jar")) - (("cisd-jhdf5.jar") - (search-input-file inputs - "/share/java/sis-jhdf5.jar"))))) - ;; There is no installation target - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (share (string-append out "/share/fastqc/")) - (exe (string-append share "/fastqc"))) - (for-each mkdir-p (list bin share)) - (copy-recursively "bin" share) - (substitute* exe - (("my \\$java_bin = 'java';") - (string-append "my $java_bin = '" - (assoc-ref inputs "java") - "/bin/java';"))) - (chmod exe #o555) - (symlink exe (string-append bin "/fastqc")) - #t)))))) + (list + #:tests? #f ;there are no tests + #:build-target "build" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.xml" + (("jbzip2-0.9.jar") + (search-input-file inputs "/share/java/jbzip2.jar")) + (("sam-1.103.jar") + (search-input-file inputs "/share/java/sam-1.112.jar")) + (("cisd-jhdf5.jar") + (search-input-file inputs "/share/java/sis-jhdf5.jar"))))) + ;; There is no installation target + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin")) + (share (string-append #$output "/share/fastqc/")) + (exe (string-append share "/fastqc"))) + (for-each mkdir-p (list bin share)) + (copy-recursively "bin" share) + (substitute* exe + (("my \\$java_bin = 'java';") + (string-append "my $java_bin = '" + (search-input-file inputs "/bin/java") + "';"))) + (chmod exe #o555) + (symlink exe (string-append bin "/fastqc")))))))) (inputs - `(("java" ,icedtea) - ("perl" ,perl) ; needed for the wrapper script - ("java-cisd-jhdf5" ,java-cisd-jhdf5) - ("java-picard-1.113" ,java-picard-1.113) - ("java-jbzip2" ,java-jbzip2))) + (list icedtea + java-cisd-jhdf5 + java-picard-1.113 + java-jbzip2 + perl)) ;needed for the wrapper script (native-inputs (list unzip)) (home-page "https://www.bioinformatics.babraham.ac.uk/projects/fastqc/") -- cgit 1.4.1 From 54b431b7b38c6148ee24b64e86bbbf1d57361584 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 22:36:55 +0100 Subject: gnu: fastp: Simplify. * gnu/packages/bioinformatics.scm (fastp)[arguments]: Simplify gexp. --- gnu/packages/bioinformatics.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 265697d625..4e16b0d39a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5337,15 +5337,16 @@ The main functions of FastQC are: "0ly8mxdvrcy23jwxyppysx3dhb1lwsqhfbgpyvargxhfk6k700x4")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; there are none - #:make-flags - ,#~(list (string-append "PREFIX=" #$output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'create-target-dir - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))))) + (list + #:tests? #false ;there are none + #:make-flags + #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'create-target-dir + (lambda _ + (mkdir-p (string-append #$output "/bin"))))))) (inputs (list zlib)) (home-page "https://github.com/OpenGene/fastp/") -- cgit 1.4.1 From 4ef9ac7f27faa7373069194e18d8ffdb5040ddee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 22:41:16 +0100 Subject: gnu: fastp: Update to 0.23.2. * gnu/packages/bioinformatics.scm (fastp): Update to 0.23.2. [inputs]: Remove zlib; add isa-l and libdeflate. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4e16b0d39a..73d555e454 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5324,7 +5324,7 @@ The main functions of FastQC are: (define-public fastp (package (name "fastp") - (version "0.20.1") + (version "0.23.2") (source (origin (method git-fetch) @@ -5334,7 +5334,7 @@ The main functions of FastQC are: (file-name (git-file-name name version)) (sha256 (base32 - "0ly8mxdvrcy23jwxyppysx3dhb1lwsqhfbgpyvargxhfk6k700x4")))) + "04nmrqpjc3qni0cbazlwvpg8rk1mkfmfma0n4q3zivs3zi6rfnav")))) (build-system gnu-build-system) (arguments (list @@ -5348,7 +5348,7 @@ The main functions of FastQC are: (lambda _ (mkdir-p (string-append #$output "/bin"))))))) (inputs - (list zlib)) + (list isa-l libdeflate)) (home-page "https://github.com/OpenGene/fastp/") (synopsis "All-in-one FastQ preprocessor") (description -- cgit 1.4.1 From 661e995c70504111c24314b4703ea85e8d7fb49f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 23:07:47 +0100 Subject: gnu: jellyfish: Drop input labels. * gnu/packages/bioinformatics.scm (jellyfish)[native-inputs]: Drop package labels. --- gnu/packages/bioinformatics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 73d555e454..e798489d41 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5550,10 +5550,10 @@ experiments and provide highly stable thresholds based on reproducibility.") ;; to run tests. (setenv "SHELL" (which "bash"))))))) (native-inputs - `(("bc" ,bc) - ("time" ,time) - ("python" ,python-wrapper) - ("pkg-config" ,pkg-config))) + (list bc + time + python-wrapper + pkg-config)) (inputs (list htslib)) (synopsis "Tool for fast counting of k-mers in DNA") -- cgit 1.4.1 From 67d2f688fb89553df53e73a4c584b1b9eb7d5c24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 23:08:21 +0100 Subject: gnu: jellyfish: Remove confusing quoting syntax. * gnu/packages/bioinformatics.scm (jellyfish)[arguments]: Do not mix quasiquote with gexp. --- gnu/packages/bioinformatics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e798489d41..c6eab671cb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5539,11 +5539,12 @@ experiments and provide highly stable thresholds based on reproducibility.") (outputs '("out" ;for library "python")) ;for Python bindings (arguments - `(#:configure-flags - ,#~(list "--without-sse" ; configure script probes for CPU features when SSE is enabled. - (string-append "--enable-python-binding=" #$output:python)) - #:phases - (modify-phases %standard-phases + (list + #:configure-flags + #~(list "--without-sse" ; configure script probes for CPU features when SSE is enabled. + (string-append "--enable-python-binding=" #$output:python)) + #:phases + '(modify-phases %standard-phases (add-before 'check 'set-SHELL-variable (lambda _ ;; generator_manager.hpp either uses /bin/sh or $SHELL -- cgit 1.4.1 From d1e68f4f23fffca93b141e3a54e8dd5f96f97b1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Feb 2023 09:36:15 +0100 Subject: gnu: Add metacity. * gnu/packages/gnome.scm (metacity): New variable. --- gnu/packages/gnome.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 19a96ef9f4..4698b883af 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2023 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015-2023 Efraim Flashner @@ -1145,6 +1145,55 @@ freedesktop.org desktop notification specification.") (home-page "https://wiki.gnome.org/Projects/NotificationDaemon") (license license:gpl2+))) +(define-public metacity + (package + (name "metacity") + (version "3.46.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/metacity/" + (version-major+minor version) "/" + "metacity-" version ".tar.xz")) + (sha256 + (base32 + "1ifnbpiflaw72m0flysa5qy44c1axd2rr9zcparz5210c7vlkfh0")))) + (build-system glib-or-gtk-build-system) + (native-inputs + (list gettext-minimal + libtool + autoconf + automake + pkg-config + (list glib "bin") + grep)) + (inputs + (list libcanberra + zenity + libsm + libice + gtk+ + pango + gsettings-desktop-schemas + gobject-introspection + libgtop + libxcomposite + libxcursor + libxfixes + libxdamage + libxext + libxpresent + libxres + libxrender + libxinerama + libx11 + libxrandr)) + (home-page "https://gitlab.gnome.org/GNOME/metacity") + (synopsis "Simple compositing window manager") + (description "Metacity is a window manager with a focus on simplicity and +usability rather than novelties or gimmicks. Its author has characterized it +as a \"boring window manager for the adult in you.\"") + (license license:gpl2+))) + (define-public mm-common (package (name "mm-common") -- cgit 1.4.1 From ae2ecd04fc16577b7a7a7f1fa7ca15631a8a092f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Feb 2023 09:36:50 +0100 Subject: gnu: sugar: Add metacity to inputs. * gnu/packages/sugar.scm (sugar)[inputs]: Add metacity. [arguments]: Patch references to metacity executables. --- gnu/packages/sugar.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index c9b8433f01..d2df6be012 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -80,6 +80,11 @@ (substitute* "bin/sugar.in" (("exec python3") (string-append "exec " (which "python3")))) + (substitute* "src/jarabe/main.py" + (("'metacity'") + (string-append "'" (search-input-file inputs "/bin/metacity") "'")) + (("'metacity-message") + (string-append "'" (search-input-file inputs "/bin/metacity-message")))) (substitute* "extensions/cpsection/datetime/model.py" (("/usr/share/zoneinfo/zone.tab") (search-input-file inputs "/share/zoneinfo/zone.tab"))) @@ -111,6 +116,7 @@ (find-files (string-append #$output "/bin") "^sugar.*"))))))) (inputs (list gtk+ + metacity mobile-broadband-provider-info python sugar-artwork -- cgit 1.4.1 From 455ecb5cbe3201e4c1591ed12650cad6ba34893a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Feb 2023 16:27:48 +0200 Subject: gnu: go-1.14: On systems not supported by go-1.4 use gccgo-12. * gnu/packages/golang.scm (go-1.14)[native-inputs]: On systems not supported by go-1.4 replace gccgo-10 with gccgo-12. (go-1.17)[native-inputs]: Remove workaround and inherit from go-1.14. --- gnu/packages/golang.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 829b216cf3..55c489a5d7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -463,7 +463,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (native-inputs `(,@(if (member (%current-system) (package-supported-systems go-1.4)) `(("go" ,go-1.4)) - `(("go" ,gccgo-10))) + `(("go" ,gccgo-12))) ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch")) ,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") @@ -837,13 +837,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") "README.md" "SECURITY.md")))))))) (inputs (if (not (target-arm?)) (alist-delete "gcc:lib" (package-inputs go-1.16)) - (package-inputs go-1.16))) - (native-inputs - (if (not (member (%current-system) (package-supported-systems go-1.4))) - ;; gccgo-10.4, 11.3 and lower has a bug which causes bootstrapping - ;; to fail. Use go-1.16 until we have a newer version available. - (alist-replace "go" (list go-1.16) (package-native-inputs go-1.16)) - (package-native-inputs go-1.16))))) + (package-inputs go-1.16))))) (define-public go-1.18 (package -- cgit 1.4.1 From 024a8b39957203f3a3cb93c87746c35635b81e57 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Feb 2023 16:31:34 +0200 Subject: gnu: go-1.17: Skip tests on riscv64-linux. * gnu/packages/golang.scm (go-1.17)[arguments]: When building for riscv64-linux skip the test suite. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 55c489a5d7..07e4c9ed22 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -651,7 +651,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (guix build utils)) ;; TODO: Disable the test(s) in misc/cgo/test/cgo_test.go ;; that cause segfaults in the test suite. - #:tests? ,(not (target-aarch64?)) + #:tests? ,(not (or (target-aarch64?) (target-riscv64?))) #:phases (modify-phases %standard-phases (replace 'configure -- cgit 1.4.1 From 542fcc3dfef4e3f1dc7a61cedf6f1fde6ad7ba4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 13 Feb 2023 16:32:17 +0200 Subject: gnu: golang.scm: Update comment about bootstrapping go. * gnu/packages/golang.scm: Update the comment at the top of the file about bootstrapping go on different architectures and about which versions of gccgo are currently provided. --- gnu/packages/golang.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 07e4c9ed22..8dfcca5ccf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -93,13 +93,11 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -;; According to https://golang.org/doc/install/gccgo, gccgo-4.8.2 includes a -;; complete go-1.1.2 implementation, gccgo-4.9 includes a complete go-1.2 -;; implementation, and gccgo-5 a complete implementation of go-1.4. Ultimately -;; we hope to build go-1.5+ with a bootstrap process using gccgo-5. As of -;; go-1.5, go cannot be bootstrapped without go-1.4, so we need to use go-1.4 or -;; gccgo-5. Mips is not officially supported, but it should work if it is -;; bootstrapped. +;; According to https://go.dev/doc/install/gccgo, gccgo-11 includes a complete +;; implementation of go-1.16 and gccgo-12 includes a complete implementation of +;; go-1.18. Starting with go-1.5 go cannot be built without an existing +;; installation of go, so we need to use go-1.4 or gccgo. For architectures which +;; are not supported with go-1.4 we use a version of gccgo to bootstrap them. (define-public go-1.4 (package -- cgit 1.4.1 From 76ac9edb0d9452189d7533f0059465fb885ace6a Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:02:43 +0400 Subject: gnu: tree-sitter-grammar: Extend functionality. * gnu/packages/tree-sitter.scm (tree-sitter-delete-generated-files): Add support for grammar-directories. (tree-sitter-grammar): Add support for grammar-directories, license, article, reorder and rename arguments, update description and synopsis generation logic. (tree-sitter-html): Migrate to new tree-sitter-grammar. --- gnu/packages/tree-sitter.scm | 52 +++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index bf6cd55b40..937c519cd6 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -188,26 +188,42 @@ can be embedded in any application. This package includes the @command{tree-sitter} command-line tool.") (license license:expat))) -(define tree-sitter-delete-generated-files +(define (tree-sitter-delete-generated-files grammar-directories) #~(begin (use-modules (guix build utils)) (delete-file "binding.gyp") (delete-file-recursively "bindings") - (delete-file "src/grammar.json") - (delete-file "src/node-types.json") - (delete-file "src/parser.c") - (delete-file-recursively "src/tree_sitter"))) + (for-each + (lambda (lang) + (with-directory-excursion lang + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + '#$grammar-directories))) (define* (tree-sitter-grammar - language language-for-synopsis version commit hash + name text hash version #:key + (commit (string-append "v" version)) (repository-url - (format #f "https://github.com/tree-sitter/tree-sitter-~a" - language)) - (inputs '())) - (let ((synopsis (string-append language-for-synopsis - " grammar for tree-sitter")) - (name (string-append "tree-sitter-" language))) + (format #f "https://github.com/tree-sitter/tree-sitter-~a" name)) + (grammar-directories '(".")) + (article "a") + (inputs '()) + (license license:expat)) + "Returns a package for Tree-sitter grammar. NAME will be used with +tree-sitter- prefix to generate package name and also for generating +REPOSITORY-URL value if it's not specified explicitly, TEXT is a string which +will be used in description and synopsis." + (let* ((multiple? (> (length grammar-directories) 1)) + (grammar-names (string-append text " grammar" (if multiple? "s" ""))) + (synopsis (string-append "Tree-sitter " grammar-names)) + (description + (string-append "This package provides " + (if multiple? "" article) (if multiple? "" " ") + grammar-names " for the Tree-sitter library.")) + (name (string-append "tree-sitter-" name))) (package (name name) (version version) @@ -219,15 +235,17 @@ This package includes the @command{tree-sitter} command-line tool.") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 hash)) - (snippet tree-sitter-delete-generated-files))) + (snippet + (tree-sitter-delete-generated-files grammar-directories)))) (build-system tree-sitter-build-system) + (arguments (list #:grammar-directories grammar-directories)) (inputs inputs) (synopsis synopsis) - (description (string-append synopsis ".")) - (license license:expat)))) + (description description) + (license license)))) (define-public tree-sitter-html (tree-sitter-grammar "html" "HTML" - "0.19.0" "v0.19.0" - "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy")) + "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy" + "0.19.0")) -- cgit 1.4.1 From acae7b10e890d3128837406109a0190222b811c7 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:19:15 +0400 Subject: gnu: Add tree-sitter-javascript. gnu/packages/tree-sitter.scm (tree-sitter-javascript): New variable. --- gnu/packages/tree-sitter.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 937c519cd6..60bd602639 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -249,3 +249,10 @@ will be used in description and synopsis." "html" "HTML" "1hg7vbcy7bir6b8x11v0a4x0glvqnsqc3i2ixiarbxmycbgl3axy" "0.19.0")) + +(define-public tree-sitter-javascript + (tree-sitter-grammar + "javascript" "JavaScript(JSX)" + "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" + "0.20.0" + #:commit "rust-0.20.0")) -- cgit 1.4.1 From adfbb5e3eb2e0787016830e060591bc987382092 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:19:55 +0400 Subject: gnu: Add tree-sitter-typescript. gnu/packages/tree-sitter.scm (tree-sitter-typescript): New variable. --- gnu/packages/tree-sitter.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 60bd602639..51703da85d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -256,3 +256,11 @@ will be used in description and synopsis." "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" "0.20.0" #:commit "rust-0.20.0")) + +(define-public tree-sitter-typescript + (tree-sitter-grammar + "typescript" "TypeScript and TSX" + "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x" + "0.20.1" + #:inputs (list tree-sitter-javascript) + #:grammar-directories '("typescript" "tsx"))) -- cgit 1.4.1 From 49a95477a81252e4e8b4f7e39b499e80f381ec23 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:20:12 +0400 Subject: gnu: Add tree-sitter-c. gnu/packages/tree-sitter.scm (tree-sitter-c): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 51703da85d..72fc6c9de5 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -264,3 +264,9 @@ will be used in description and synopsis." "0.20.1" #:inputs (list tree-sitter-javascript) #:grammar-directories '("typescript" "tsx"))) + +(define-public tree-sitter-c + (tree-sitter-grammar + "c" "C" + "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v" + "0.20.2")) -- cgit 1.4.1 From b8b05538fff5a1fa705dfc74289c343cb3e6ff89 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:20:25 +0400 Subject: gnu: Add tree-sitter-cpp. gnu/packages/tree-sitter.scm (tree-sitter-cpp): New variable. --- gnu/packages/tree-sitter.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 72fc6c9de5..443d9de88e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -270,3 +270,14 @@ will be used in description and synopsis." "c" "C" "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v" "0.20.2")) + +(define-public tree-sitter-cpp + ;; There are a lot of additions, the last tag was placed more than 1 year ago + (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740") + (revision "0")) + (tree-sitter-grammar + "cpp" "C++" + "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09" + (git-version "0.20.0" revision commit) + #:commit commit + #:inputs (list tree-sitter-c)))) -- cgit 1.4.1 From cda1fa50c5572357e2ac5189a5161f9a54f41409 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:28:49 +0400 Subject: gnu: Add tree-sitter-css. gnu/packages/tree-sitter.scm (tree-sitter-css): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 443d9de88e..eecd82fcc9 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -265,6 +265,12 @@ will be used in description and synopsis." #:inputs (list tree-sitter-javascript) #:grammar-directories '("typescript" "tsx"))) +(define-public tree-sitter-css + (tree-sitter-grammar + "css" "CSS" + "014jrlgi7zfza9g38hsr4vlbi8964i5p7iglaih6qmzaiml7bja2" + "0.19.0")) + (define-public tree-sitter-c (tree-sitter-grammar "c" "C" -- cgit 1.4.1 From 4650f8e9bab5e689b8dc46f17960c9d9bdb42771 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 13:30:13 +0400 Subject: gnu: Add tree-sitter-elixir. gnu/packages/tree-sitter.scm (tree-sitter-elixir): New variable. --- gnu/packages/tree-sitter.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index eecd82fcc9..71a74ae721 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -287,3 +287,16 @@ will be used in description and synopsis." (git-version "0.20.0" revision commit) #:commit commit #:inputs (list tree-sitter-c)))) + +(define-public tree-sitter-elixir + ;; No tags at all, version in the source code is 0.19.0 + (let ((commit "b20eaa75565243c50be5e35e253d8beb58f45d56") + (revision "0")) + (tree-sitter-grammar + "elixir" "Elixir" + "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" + (git-version "0.19.0" revision commit) + #:article "an" + #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" + #:commit commit + #:license (list license:asl2.0 license:expat)))) -- cgit 1.4.1 From fa1421283d29180c90fc27c53e3063baaaebf90a Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 14:59:30 +0400 Subject: gnu: Add tree-sitter-bash. gnu/packages/tree-sitter.scm (tree-sitter-bash): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 71a74ae721..caa38596ec 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -300,3 +300,9 @@ will be used in description and synopsis." #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" #:commit commit #:license (list license:asl2.0 license:expat)))) + +(define-public tree-sitter-bash + (tree-sitter-grammar + "bash" "Bash" + "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5" + "0.19.0")) -- cgit 1.4.1 From de4122701121baa523a3b3303c0d9943f6fe0464 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:05:33 +0400 Subject: gnu: Add tree-sitter-c-sharp. gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index caa38596ec..b022de4d11 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -306,3 +306,9 @@ will be used in description and synopsis." "bash" "Bash" "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5" "0.19.0")) + +(define-public tree-sitter-c-sharp + (tree-sitter-grammar + "c-sharp" "C#" + "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r" + "0.19.1")) -- cgit 1.4.1 From 2c988d7ce3feea13875fbeb17251dcd3536e3e7b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:08:12 +0400 Subject: gnu: Add tree-sitter-elm. gnu/packages/tree-sitter.scm (tree-sitter-elm): New variable. --- gnu/packages/tree-sitter.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index b022de4d11..1e7c6815da 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -312,3 +312,11 @@ will be used in description and synopsis." "c-sharp" "C#" "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r" "0.19.1")) + +(define-public tree-sitter-elm + (tree-sitter-grammar + "elm" "Elm" + "0b5jpj8bnil1ylisyc4w48j8a30dyf3zylhidj73mlrb8rf7xm2s" + "5.6.3" + #:article "an" + #:repository-url "https://github.com/elm-tooling/tree-sitter-elm")) -- cgit 1.4.1 From 291e44ec2e94c6308ee1673629e9bdbad83845b4 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:34:48 +0400 Subject: gnu: Add tree-sitter-go. gnu/packages/tree-sitter.scm (tree-sitter-go): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 1e7c6815da..848e746d24 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -320,3 +320,13 @@ will be used in description and synopsis." "5.6.3" #:article "an" #:repository-url "https://github.com/elm-tooling/tree-sitter-elm")) + +(define-public tree-sitter-go + ;; There are a lot of additions, the last tag was placed more than 1 year ago + (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a") + (revision "0")) + (tree-sitter-grammar + "go" "Go" + "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz" + (git-version "0.19.1" revision commit) + #:commit commit))) -- cgit 1.4.1 From d39b899eacdf4184918d5927dabf3a123595ac06 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:39:32 +0400 Subject: gnu: Add tree-sitter-haskell. gnu/packages/tree-sitter.scm (tree-sitter-haskell): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 848e746d24..cae6f25cd5 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -330,3 +330,13 @@ will be used in description and synopsis." "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz" (git-version "0.19.1" revision commit) #:commit commit))) + +(define-public tree-sitter-haskell + ;; There are a lot of additions, the last tag was placed more than 4 years ago + (let ((commit "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3") + (revision "0")) + (tree-sitter-grammar + "haskell" "Haskell" + "1hg19af1n510bndf5k5iri7dzb48xb527vispv1aapki4mvr98gx" + (git-version "0.14.0" revision commit) + #:commit commit))) -- cgit 1.4.1 From bcc8e9c77bb1c912ef16cc92efca823939359620 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:43:25 +0400 Subject: gnu: Add tree-sitter-java. gnu/packages/tree-sitter.scm (tree-sitter-java): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index cae6f25cd5..4fc90dac7e 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -340,3 +340,9 @@ will be used in description and synopsis." "1hg19af1n510bndf5k5iri7dzb48xb527vispv1aapki4mvr98gx" (git-version "0.14.0" revision commit) #:commit commit))) + +(define-public tree-sitter-java + (tree-sitter-grammar + "java" "Java" + "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341" + "0.20.0")) -- cgit 1.4.1 From 1777d700eca35e4d208ff2fa1aae91998d992648 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:45:04 +0400 Subject: gnu: Add tree-sitter-json. gnu/packages/tree-sitter.scm (tree-sitter-json): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 4fc90dac7e..638d7e8643 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -346,3 +346,9 @@ will be used in description and synopsis." "java" "Java" "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341" "0.20.0")) + +(define-public tree-sitter-json + (tree-sitter-grammar + "json" "JSON" + "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff" + "0.19.0")) -- cgit 1.4.1 From f5a2f3883a72f3ee41e6cfaf0a75a55a0baabb1d Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:46:30 +0400 Subject: gnu: Add tree-sitter-julia. gnu/packages/tree-sitter.scm (tree-sitter-julia): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 638d7e8643..f7282dd9a7 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -352,3 +352,9 @@ will be used in description and synopsis." "json" "JSON" "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff" "0.19.0")) + +(define-public tree-sitter-julia + (tree-sitter-grammar + "julia" "Julia" + "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463" + "0.19.0")) -- cgit 1.4.1 From e38833c5928558e104db9f8f4fba69066bf70018 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 15:57:06 +0400 Subject: gnu: Add tree-sitter-ocaml. gnu/packages/tree-sitter.scm (tree-sitter-ocaml): New variable. --- gnu/packages/tree-sitter.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index f7282dd9a7..e9b76733a7 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -358,3 +358,10 @@ will be used in description and synopsis." "julia" "Julia" "1pbnmvhy2gq4vg1b0sjzmjm4s2gsgdjh7h01yj8qrrqbcl29c463" "0.19.0")) + +(define-public tree-sitter-ocaml + (tree-sitter-grammar + "ocaml" "OCaml (.ml and .mli)" + "021vnbpzzb4cca3ncd4qhzy583vynhndn3qhwayxrpgdl61m44i6" + "0.20.1" + #:grammar-directories '("ocaml" "interface"))) -- cgit 1.4.1 From 73bfb0ad9141c16dcc3e965e79f160de4e4bae9f Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:01:35 +0400 Subject: gnu: Add tree-sitter-php. gnu/packages/tree-sitter.scm (tree-sitter-php): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e9b76733a7..5774fe8adc 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -365,3 +365,13 @@ will be used in description and synopsis." "021vnbpzzb4cca3ncd4qhzy583vynhndn3qhwayxrpgdl61m44i6" "0.20.1" #:grammar-directories '("ocaml" "interface"))) + +(define-public tree-sitter-php + ;; There are a lot of additions, the last tag was placed more than 1 year ago + (let ((commit "f860e598194f4a71747f91789bf536b393ad4a56") + (revision "0")) + (tree-sitter-grammar + "php" "PHP" + "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g" + (git-version "0.19.0" revision commit) + #:commit commit))) -- cgit 1.4.1 From 429666b60003b6c0317d1a1e7e43e1641b23e20b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:05:05 +0400 Subject: gnu: Add tree-sitter-python. gnu/packages/tree-sitter.scm (tree-sitter-python): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 5774fe8adc..eb15bb99ad 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -375,3 +375,13 @@ will be used in description and synopsis." "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g" (git-version "0.19.0" revision commit) #:commit commit))) + +(define-public tree-sitter-python + ;; There are a lot of additions, the last tag was placed a while ago + (let ((commit "9e53981ec31b789ee26162ea335de71f02186003") + (revision "0")) + (tree-sitter-grammar + "python" "Python" + "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg" + (git-version "0.20.0" revision commit) + #:commit commit))) -- cgit 1.4.1 From 4bdb570c707ac3748f4d7015c214b6dbb2fcbb81 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:11:18 +0400 Subject: gnu: Add tree-sitter-r. gnu/packages/tree-sitter.scm (tree-sitter-r): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index eb15bb99ad..a1d7cb819b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -385,3 +385,13 @@ will be used in description and synopsis." "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg" (git-version "0.20.0" revision commit) #:commit commit))) + +(define-public tree-sitter-r + ;; No tags + (let ((commit "80efda55672d1293aa738f956c7ae384ecdc31b4") + (revision "0")) + (tree-sitter-grammar + "r" "R" + "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9" + (git-version "0.0.1" revision commit) + #:commit commit))) -- cgit 1.4.1 From 8fb1af3483e0e8b3794d4db08f061036bd29c2ac Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:14:49 +0400 Subject: gnu: Add tree-sitter-ruby. gnu/packages/tree-sitter.scm (tree-sitter-ruby): New variable. --- gnu/packages/tree-sitter.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a1d7cb819b..fafd65942d 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -395,3 +395,13 @@ will be used in description and synopsis." "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9" (git-version "0.0.1" revision commit) #:commit commit))) + +(define-public tree-sitter-ruby + ;; There are a lot of additions, the last tag was placed more than 1 year ago + (let ((commit "206c7077164372c596ffa8eaadb9435c28941364") + (revision "0")) + (tree-sitter-grammar + "ruby" "Ruby" + "1pqr24bj68lgi1w2cblr8asfby681l3032jrppq4n9x5zm23fi6n" + (git-version "0.19.0" revision commit) + #:commit commit))) -- cgit 1.4.1 From f9485e59f07342eb420303cd459133813563b2ed Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:20:37 +0400 Subject: gnu: Add tree-sitter-rust. gnu/packages/tree-sitter.scm (tree-sitter-rust): New variable. --- gnu/packages/tree-sitter.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index fafd65942d..9dcf273f83 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -405,3 +405,9 @@ will be used in description and synopsis." "1pqr24bj68lgi1w2cblr8asfby681l3032jrppq4n9x5zm23fi6n" (git-version "0.19.0" revision commit) #:commit commit))) + +(define-public tree-sitter-rust + (tree-sitter-grammar + "rust" "Rust" + "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f" + "0.20.3")) -- cgit 1.4.1 From b6e27a24fe004fce679f6866afd8bd9db5fb16e5 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:25:37 +0400 Subject: gnu: Add tree-sitter-clojure. gnu/packages/tree-sitter.scm (tree-sitter-clojure): New variable. --- gnu/packages/tree-sitter.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 9dcf273f83..00bf4b1b3f 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -411,3 +411,10 @@ will be used in description and synopsis." "rust" "Rust" "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f" "0.20.3")) + +(define-public tree-sitter-clojure + (tree-sitter-grammar + "clojure" "Clojure" + "0bgd9g1j4ww45g0l0aa1jac49421z95cc2rhcgqmgx7nzn94rszp" + "0.0.11" + #:repository-url "https://github.com/sogaiu/tree-sitter-clojure")) -- cgit 1.4.1 From 5c0b86f741b2d6b0eebb7b99dd04282328c34b4c Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:30:50 +0400 Subject: gnu: Add tree-sitter-markdown. gnu/packages/tree-sitter.scm (tree-sitter-markdown): New variable. --- gnu/packages/tree-sitter.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 00bf4b1b3f..a1e10e5434 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -418,3 +418,16 @@ will be used in description and synopsis." "0bgd9g1j4ww45g0l0aa1jac49421z95cc2rhcgqmgx7nzn94rszp" "0.0.11" #:repository-url "https://github.com/sogaiu/tree-sitter-clojure")) + +(define-public tree-sitter-markdown + ;; No tags + (let ((commit "ef3caf83663ea97ad9e88d891424fff6a20d878d") + (revision "0")) + (tree-sitter-grammar + "markdown" "Markdown (CommonMark Spec v0.30)" + "0p9mxpvkhzsxbndda36zx5ycd6g2r2qs60gpx4y56p10lhgzlyqj" + "0.1.1" + #:repository-url "https://github.com/MDeiml/tree-sitter-markdown" + #:grammar-directories '("tree-sitter-markdown" + "tree-sitter-markdown-inline") + #:commit commit))) -- cgit 1.4.1 From 637df0cd94dbe2cd1f1542ee2e149871009dd7ae Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 16:59:47 +0400 Subject: gnu: Add tree-sitter-markdown-gfm. gnu/packages/tree-sitter.scm (tree-sitter-markdown-gfm): New variable. --- gnu/packages/tree-sitter.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a1e10e5434..162f606865 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -431,3 +431,12 @@ will be used in description and synopsis." #:grammar-directories '("tree-sitter-markdown" "tree-sitter-markdown-inline") #:commit commit))) + +(define-public tree-sitter-markdown-gfm + ;; Not updated for more than 1 year, can be deprecated when gfm will be + ;; implemented in tree-sitter-markdown + (tree-sitter-grammar + "markdown-gfm" "Markdown (CommonMark Spec v0.29-gfm)" + "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk" + "0.7.1" + #:repository-url "https://github.com/ikatyang/tree-sitter-markdown")) -- cgit 1.4.1 From a3c6959de63c6dd91271ed5d1f15e0a7d75dee92 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 14 Feb 2023 17:00:05 +0400 Subject: gnu: Add tree-sitter-org. gnu/packages/tree-sitter.scm (tree-sitter-org): New variable. --- gnu/packages/tree-sitter.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 162f606865..5b01793744 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -440,3 +440,14 @@ will be used in description and synopsis." "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk" "0.7.1" #:repository-url "https://github.com/ikatyang/tree-sitter-markdown")) + +(define-public tree-sitter-org + ;; There are a lot of additions, the last tag was placed a while ago + (let ((commit "081179c52b3e8175af62b9b91dc099d010c38770") + (revision "0")) + (tree-sitter-grammar + "org" "Org" + "0h9krbaq9j6ijf86sg0w221s0zbpbx5f7m1l0whzjahbrqpnqgxl" + (git-version "1.3.1" revision commit) + #:repository-url "https://github.com/milisims/tree-sitter-org" + #:commit commit))) -- cgit 1.4.1 From 04509e095f3ea57384de0491f69be14569f6cd64 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 12 Feb 2023 12:40:55 +0100 Subject: gnu: linux-libre: Update to 6.1.11. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.11. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4130cdb4ed..926a1d3668 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.10") +(define-public linux-libre-6.1-version "6.1.11") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -491,7 +491,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb"))) + (hash (base32 "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From bf6cd144b482a55f0723835576ed4b7580805972 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 12 Feb 2023 12:41:38 +0100 Subject: gnu: linux-libre 5.15: Update to 5.15.93. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.93. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 926a1d3668..20028d6682 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.92") +(define-public linux-libre-5.15-version "5.15.93") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz"))) + (hash (base32 "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From c4fca4340343dc1a00c873074185e1902da43477 Mon Sep 17 00:00:00 2001 From: Steve George Date: Mon, 13 Feb 2023 11:17:55 +0000 Subject: gnu: Add rust-protobuf-2. * gnu/packages/crates-io.scm (rust-protobuf-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 80f7e619bb..e45263041e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43149,6 +43149,32 @@ language.") language.") (license license:asl2.0))) +;; It's recommended that rust-protobuf, rust-protobuf-codegen +;; and rust-probuf-codegen-pure be the same version +(define-public rust-protobuf-2 + (package + (name "rust-protobuf") + (version "2.14.0") + (source (origin + (method url-fetch) + (uri (crate-uri "protobuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11bl8hf522s9mbkckivnn9n8s3ss4g41w6jmfdsswmr5adqd71lf")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; missing files in the release tarball. + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1)))) + (home-page "https://github.com/stepancheg/rust-protobuf/") + (synopsis "Rust implementation of Google protocol buffers") + (description + "This package provides a library to read and write protocol buffer's data.") + (license license:expat))) + (define-public rust-psl-2 (package (name "rust-psl") -- cgit 1.4.1 From 25df704601b73fbdc083d57b68628960969f5cbe Mon Sep 17 00:00:00 2001 From: Steve George Date: Mon, 13 Feb 2023 11:17:56 +0000 Subject: gnu: Add rust-protobuf-codegen-2. * gnu/packages/crates-io.scm (rust-protobuf-codegen-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e45263041e..44fe03206b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43175,6 +43175,30 @@ language.") "This package provides a library to read and write protocol buffer's data.") (license license:expat))) +;; It's recommended that rust-protobuf, rust-protobuf-codegen +;; and rust-probuf-codegen-pure be the same version +(define-public rust-protobuf-codegen-2 + (package + (name "rust-protobuf-codegen") + (version "2.14.0") + (source (origin + (method url-fetch) + (uri (crate-uri "protobuf-codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "031bx325lsgcx7wc76vc2cqph6q0b34jgc8nz0g2rkwcfnx3n4fy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-protobuf" ,rust-protobuf-2)))) + (home-page "https://github.com/stepancheg/rust-protobuf/") + (synopsis "Code generator for rust-protobuf") + (description + "This package provides a code generator for rust-protobuf. It includes a +library to invoke programmatically (e.g. from @code{build.rs}) and +@code{protoc-gen-rust} binary.") + (license license:expat))) + (define-public rust-psl-2 (package (name "rust-psl") -- cgit 1.4.1 From 4501a50bbdb35b4e0b5adf57c11a511af31f76f5 Mon Sep 17 00:00:00 2001 From: Steve George Date: Mon, 13 Feb 2023 11:17:57 +0000 Subject: gnu: Add rust-protobuf-codegen-pure-2. * gnu/packages/crates-io.scm (rust-protobuf-codegen-pure-2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44fe03206b..654e514fa8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43199,6 +43199,30 @@ library to invoke programmatically (e.g. from @code{build.rs}) and @code{protoc-gen-rust} binary.") (license license:expat))) +;; It's recommended that rust-protobuf, rust-protobuf-codegen +;; and rust-probuf-codegen-pure be the same version +(define-public rust-protobuf-codegen-pure-2 + (package + (name "rust-protobuf-codegen-pure") + (version "2.14.0") + (source (origin + (method url-fetch) + (uri (crate-uri "protobuf-codegen-pure" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0h34gfqlb7bqmgqv1mfgy5wk35z5r2h5ki3p3pdcmw1vqzmly6id")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-protobuf" ,rust-protobuf-2) + ("rust-protobuf-codegen" ,rust-protobuf-codegen-2)))) + (home-page "https://github.com/stepancheg/rust-protobuf/") + (synopsis "Pure-rust codegen for protobuf using protobuf-parser") + (description "This package provides a pure-rust codegen for protobuf +using protobuf-parser.") + (license license:expat))) + (define-public rust-psl-2 (package (name "rust-psl") -- cgit 1.4.1 From a22b62b98e051cced363e7a363aa3847210aec50 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 13 Feb 2023 22:24:36 -0600 Subject: gnu: onionshare: Update to 2.6. * gnu/packages/patches/onionshare-cli-async-mode.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/tor.scm (onionshare): Update to 2.6. [source]: Use patch. [inputs]: Add xdg-utils. Move xvfb-run, used for tests, to ... [native-inputs]: here. [arguments]: Run tests. Add "absolutize" phase for xdg-open. --- gnu/local.mk | 1 + .../patches/onionshare-cli-async-mode.patch | 25 ++++++++++++++++++++++ gnu/packages/tor.scm | 25 +++++++++++----------- 3 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/onionshare-cli-async-mode.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index cdb99813d0..07a7a0f527 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1597,6 +1597,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ + %D%/packages/patches/onionshare-cli-async-mode.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ diff --git a/gnu/packages/patches/onionshare-cli-async-mode.patch b/gnu/packages/patches/onionshare-cli-async-mode.patch new file mode 100644 index 0000000000..b71b56046d --- /dev/null +++ b/gnu/packages/patches/onionshare-cli-async-mode.patch @@ -0,0 +1,25 @@ +Specifying the `async_mode` parameter seems to have been a workaround for +packaging on Windows and macOS. If not given, flask_socketio.SocketIO will +probe for an available asynchronous model, e.g. `eventlet`, and otherwise gets +stuck if `gevent-socketio` is not available. + +c.f. https://github.com/onionshare/onionshare/commit/ec7fa4ef16c9e1ba6028ee927c23f76c399a17a6 +and https://github.com/onionshare/onionshare/issues/1510 + +diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py +index 64844b5..7e1b095 100644 +--- a/cli/onionshare_cli/web/web.py ++++ b/cli/onionshare_cli/web/web.py +@@ -164,10 +164,10 @@ class Web: + elif self.mode == "chat": + if self.common.verbose: + self.socketio = SocketIO( +- async_mode="gevent", logger=True, engineio_logger=True ++ logger=True, engineio_logger=True + ) + else: +- self.socketio = SocketIO(async_mode="gevent") ++ self.socketio = SocketIO() + self.socketio.init_app(self.app) + self.chat_mode = ChatModeWeb(self.common, self) + diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 6e5b3c0f60..9e26753857 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018, 2019, 2021 Eric Bavier +;;; Copyright © 2017, 2018, 2019, 2021, 2023 Eric Bavier ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018, 2022 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll @@ -46,6 +46,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -256,7 +257,7 @@ networks.") (define-public onionshare-cli (package (name "onionshare-cli") - (version "2.5") + (version "2.6") (source (origin (method git-fetch) @@ -265,7 +266,8 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16m5ll0v0qjbirwwzbzxg53kq4ry1n3ay5x0h8zkij73v3x0q864")))) + (base32 "1bhrp019a0923h7dnfxhgvgvdp81blvnsbnvzy34hp827abxf3ic")) + (patches (search-patches "onionshare-cli-async-mode.patch")))) (build-system python-build-system) (native-inputs (list python-pytest)) @@ -329,6 +331,11 @@ OnionShare.") (substitute-keyword-arguments (package-arguments onionshare-cli) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "desktop/onionshare/tab/mode/history.py" + (("Popen\\(\\[\"xdg-open\"") + (string-append "Popen([\"" (which "xdg-open") "\""))))) (replace 'change-directory (lambda _ (chdir "desktop/"))) (add-after 'install 'install-data @@ -353,15 +360,9 @@ OnionShare.") (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "HOME" "/tmp") (apply invoke "xvfb-run" "pytest" "-vv" - (find-files "tests" "^test_gui.*\\.py$"))))))) - ;; Most tests fail: "2 failed, 8 warnings, 44 errors in 6.06s", due to - ;; error "RuntimeError: Please destroy the Application singleton before - ;; creating a new Application instance." (see: - ;; https://github.com/onionshare/onionshare/issues/1603). - ((#:tests? _ #f) - #f))) + (find-files "tests" "^test_gui.*\\.py$"))))))))) (native-inputs - (list python-pytest)) + (list python-pytest xvfb-run)) (inputs ;; The desktop client uses onionshare-cli like a python module. But ;; propagating onionshare-cli's inputs is not great, since a user would @@ -372,7 +373,7 @@ OnionShare.") python-shiboken-2 python-pyside-2 python-qrcode - xvfb-run))) + xdg-utils))) (description "OnionShare lets you securely and anonymously share files, host websites, and chat with friends using the Tor network."))) -- cgit 1.4.1 From efe9612953bf60d0d7887ece15469a5b30c337a2 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 13 Feb 2023 21:23:54 -0500 Subject: gnu: Remove kdewebkit. This goes towards . * gnu/packages/kde-frameworks.scm (kdewebkit): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/kde-frameworks.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 71ee9ea895..6f463d217c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2435,38 +2435,6 @@ ini-style description files.") with su and ssh respectively.") (license license:lgpl2.1+))) -(define-public kdewebkit - (package - (name "kdewebkit") - (version "5.98.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "03bwwgzh1xfj4w7q2cvr7712yrjgf9qhqkqgzypcdb49gpvaq164")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list kconfig - kcoreaddons - kio - kjobwidgets - kparts - kservice - kwallet - qtbase-5 - qtwebkit)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Integration for QtWebKit") - (description "This library provides KDE integration of the HTML rendering -engine WebKit via QtWebKit.") - (license license:lgpl2.1+))) - (define-public kemoticons (package (name "kemoticons") -- cgit 1.4.1 From 36f7b1f02ff1119ff7bca6f9d20d951816db59bc Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 23 Dec 2022 23:31:09 +0100 Subject: gnu: Add u-boot-qemu-arm * gnu/packages/bootloaders.scm (u-boot-qemu-arm): New variable. --- gnu/packages/bootloaders.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0db2021910..b88df0109b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1102,6 +1102,14 @@ partition.")) (modify-inputs (package-native-inputs base) (append arm-trusted-firmware-rk3399)))))) +(define-public u-boot-qemu-arm + (make-u-boot-package "qemu_arm" "arm-linux-gnueabihf" + ;; Disable features that require OpenSSL due + ;; to GPL/Openssl license incompatibilities. + ;; See https://bugs.gnu.org/34717 for + ;; details. + #:configs '("# CONFIG_FIT_SIGNATURE is not set"))) + (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) -- cgit 1.4.1 From 8a68407ac1eb1f6fca245efcc9c372df52045e96 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 24 Dec 2022 07:15:17 +0100 Subject: gnu: Add u-boot-qemu-arm64. * gnu/packages/bootloaders.scm (u-boot-qemu-arm64): New variable. --- gnu/packages/bootloaders.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b88df0109b..9d56efb628 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1110,6 +1110,14 @@ partition.")) ;; details. #:configs '("# CONFIG_FIT_SIGNATURE is not set"))) +(define-public u-boot-qemu-arm64 + (make-u-boot-package "qemu_arm64" "aarch64-linux-gnu" + ;; Disable features that require OpenSSL due + ;; to GPL/Openssl license incompatibilities. + ;; See https://bugs.gnu.org/34717 for + ;; details. + #:configs '("# CONFIG_FIT_SIGNATURE is not set"))) + (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) -- cgit 1.4.1 From e2320fea44a8096b2ddbe53125c01a4376762571 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 13 Feb 2023 20:19:53 +0100 Subject: gnu: orage: Update to 4.18.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (orage): Update to 4.18.0. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7a64667139..3213cc584a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1324,7 +1324,7 @@ memory usage graphically, and it can display processes as a tree.") (define-public orage (package (name "orage") - (version "4.16.0") + (version "4.18.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1332,7 +1332,7 @@ memory usage graphically, and it can display processes as a tree.") name "-" version ".tar.bz2")) (sha256 (base32 - "000py6r63rlv7pjwvwd7ycrb383lny8ha7ha3qpwh1r0d8xil496")))) + "1v5385hps6jgcw1ky9vl7w7iryp0rzxz6s4lx72rz8yg4sdv84v3")))) (build-system gnu-build-system) (native-inputs (list -- cgit 1.4.1 From 0412c8dc0e1f9097fd4945cd6992e2a573820895 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 13 Feb 2023 20:36:23 +0100 Subject: gnu: libxfce4ui: Update to 4.18.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (libxfce4ui): Update to 4.18.2. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3213cc584a..28e8ff4094 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -184,7 +184,7 @@ storage system.") (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -192,7 +192,7 @@ storage system.") name "-" version ".tar.bz2")) (sha256 (base32 - "0bp5wl9r6wbl7a18wikldb6kvyqzaz16sk2bh9swwyqv08q7pgvf")))) + "01wlwigrq5icf6bz3waqxjd066hm0z397crxnlz0ri764w22sq5d")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 444089d3b64357dd677360886af09c4db80aca1f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 13 Feb 2023 21:12:29 +0100 Subject: gnu: xfce4-panel: Update to 4.18.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-panel): Update to 4.18.2. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 28e8ff4094..c36a2e9c7c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -395,7 +395,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -403,7 +403,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "0wnfx08gacq803ha6ywvqfxn91brgbyymhi5x2xis713gl4mizgi")) + "1hbxwlw806qj7z1169ahwgkl1fm789z22r6dszddx2wzv8w9qv3w")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From e685b94e0a40cf9eb4700baa172b206964318a7e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 13 Feb 2023 21:50:50 +0100 Subject: gnu: mousepad: Update to 0.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (mousepad): Update to 0.6.0. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c36a2e9c7c..9731dd0ee6 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1417,7 +1417,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.5.10") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1425,7 +1425,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "1b9bal9wxmgpff6r7k48gnkd0vla7xljmiahjq6mdrdyaa6z7fkf")))) + "1m0k36fbh1gkxps3yjfagjnka13ndcfk3r588bc9ka5qhb2salr2")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than -- cgit 1.4.1 From 22f6783f33b699bea678ea46ffaebd275e7900af Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 13 Feb 2023 22:01:26 +0100 Subject: gnu: ristretto: Update to 0.13.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (ristretto): Update to 0.13.0. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 9731dd0ee6..6734bf781b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1266,7 +1266,7 @@ inhibit interface which allows applications to prevent automatic sleep.") (define-public ristretto (package (name "ristretto") - (version "0.12.4") + (version "0.13.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/ristretto/" @@ -1274,7 +1274,7 @@ inhibit interface which allows applications to prevent automatic sleep.") "ristretto-" version ".tar.bz2")) (sha256 (base32 - "0c3rx02bk74fip7ishdxnbn0l9f48qbiglckzclz7v758fbmq074")))) + "00g3yk06h2xca73bq3dzyiha4ck8ps1vprc3il63knma3ns7crjr")))) (build-system gnu-build-system) (native-inputs (list intltool desktop-file-utils -- cgit 1.4.1 From 495b0227632d2d1669463426ec42637fc5e14365 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 14 Feb 2023 11:30:51 +0800 Subject: gnu: xfce4-session: Update to 4.18.1. * gnu/packages/xfce.scm (xfce4-session): Update to 4.18.1. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6734bf781b..96ad5e9699 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -627,7 +627,7 @@ your system in categories, so you can quickly find and launch them.") (define-public xfce4-session (package (name "xfce4-session") - (version "4.18.0") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -635,7 +635,7 @@ your system in categories, so you can quickly find and launch them.") "xfce4-session-" version ".tar.bz2")) (sha256 (base32 - "0zwsp2qc1bk87gbvx5fc8wb3hg2nq2ln0fjljks148171d8dpfiq")) + "1ky54pc0zi2q3qkpmccr3qa4c08j5c6bb6xxiczdnngjxrz9anhw")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From d92db1a55592bec09ff71d0e64824a07a4c4a7b0 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 14 Feb 2023 11:30:51 +0800 Subject: gnu: xfce4-settings: Update to 4.18.2. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.18.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 96ad5e9699..b3e231b724 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -679,7 +679,7 @@ allows you to shut down the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -687,7 +687,7 @@ allows you to shut down the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "140xclvl05y3xwlckwnryxyj6y6gr8cpksrpzlhvip6jz9l0wxfm")) + "08jgvhxhh95rcgpvsfqn1rv7i45zj37zyhcpnkpmgbpshw83cqa6")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 445ef24a61975b17ca73d5d307cf2e3da6475b10 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 14 Feb 2023 11:30:51 +0800 Subject: gnu: xfce4-power-manager: Update to 4.18.1. * gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.18.1. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b3e231b724..4ce857aa14 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1237,7 +1237,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "4.18.0") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -1245,7 +1245,7 @@ system resources, while still being visually appealing and user friendly.") "xfce4-power-manager-" version ".tar.bz2")) (sha256 (base32 - "16n3f9zam3v8584rprckvr72gmgsv9kyqy690jkrybr5hrw4dvif")))) + "00zz9bhzsf2vww8mym9c093sz7va5716qb6kvdvn6ldp9h6b223b")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) -- cgit 1.4.1 From c0e9ddfa290056f137ee21a53be6be4fbb8586ea Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 14 Feb 2023 11:52:00 +0800 Subject: gnu: xfce4-notifyd: Update to 0.8.0. * gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.8.0. [inputs]: Add sqlite. --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4ce857aa14..3ee728e710 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages search) + #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -1354,7 +1355,7 @@ several different time zones.") (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.7.3") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1362,12 +1363,12 @@ several different time zones.") name "-" version ".tar.bz2")) (sha256 (base32 - "0hz9x42cfwd52i02a50mqvw3qwpgb3hpnlxqnnlkc8bwadfn1nah")))) + "1jcmcjq2kay9kmzd5j5l8kasrzqb7aidp26q4nbmxghxxa3ncyf7")))) (build-system glib-or-gtk-build-system) (native-inputs (list intltool pkg-config)) (inputs - (list libxfce4ui libnotify xfce4-panel)) + (list libxfce4ui libnotify sqlite xfce4-panel)) (home-page "https://goodies.xfce.org/projects/applications/xfce4-notifyd") (synopsis "Show notification bubbles on Xfce") (description -- cgit 1.4.1 From d2504fbe45c0510230fb48723e67a71796bf83f1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 14 Feb 2023 21:33:44 -0600 Subject: gnu: fgallery: Update to 1.9.1. * gnu/packages/graphics.scm (fgallery): Update to 1.9.1. [arguments]: Use new Makefile in install phase. [inputs]: Add bash-minimal for wrap-program. Use new style. [source,home-page]: "http" -> "https". --- gnu/packages/graphics.scm | 53 ++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6f117f69a2..be6f63d5c7 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 dan ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 David Thompson +;;; Copyright © 2023 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1734,16 +1735,16 @@ your terminal.") (define-public fgallery (package (name "fgallery") - (version "1.8.2") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append - "http://www.thregr.org/~wavexx/software/fgallery/releases/" + "https://www.thregr.org/~wavexx/software/fgallery/releases/" "fgallery-" version ".zip")) (sha256 (base32 - "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf")))) + "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1754,19 +1755,12 @@ your terminal.") (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (share (string-append out "/share/fgallery")) - (man (string-append out "/share/man/man1")) - (perl5lib (getenv "PERL5LIB")) - (script (string-append share "/fgallery"))) + (script (string-append out "/bin/fgallery")) + (perl5lib (getenv "PERL5LIB"))) (define (bin-directory input-name) (string-append (assoc-ref inputs input-name) "/bin")) - (mkdir-p man) - (copy-file "fgallery.1" (string-append man "/fgallery.1")) - - (mkdir-p share) - (copy-recursively "." share) + (invoke "make" "install" (string-append "PREFIX=" out)) ;; fgallery copies files from store when it is run. The ;; read-only permissions from the store directories will cause @@ -1776,37 +1770,34 @@ your terminal.") (("'cp'") "'cp', '--no-preserve=all'")) - (mkdir-p bin) - (symlink script (string-append out "/bin/fgallery")) - (wrap-program script `("PATH" ":" prefix ,(map bin-directory '("imagemagick" "lcms" "fbida" - "libjpeg" + "libjpeg-turbo" "zip" "jpegoptim" "pngcrush" "p7zip"))) - `("PERL5LIB" ":" prefix (,perl5lib))) - #t)))))) + `("PERL5LIB" ":" prefix (,perl5lib))))))))) (native-inputs (list unzip)) ;; TODO: Add missing optional dependency: facedetect. (inputs - `(("imagemagick" ,imagemagick) - ("lcms" ,lcms) - ("fbida" ,fbida) - ("libjpeg" ,libjpeg-turbo) - ("zip" ,zip) - ("perl" ,perl) - ("perl-cpanel-json-xs" ,perl-cpanel-json-xs) - ("perl-image-exiftool" ,perl-image-exiftool) - ("jpegoptim" ,jpegoptim) - ("pngcrush" ,pngcrush) - ("p7zip" ,p7zip))) - (home-page "http://www.thregr.org/~wavexx/software/fgallery/") + (list bash-minimal + imagemagick + lcms + fbida + libjpeg-turbo + zip + perl + perl-cpanel-json-xs + perl-image-exiftool + jpegoptim + pngcrush + p7zip)) + (home-page "https://www.thregr.org/~wavexx/software/fgallery/") (synopsis "Static photo gallery generator") (description "FGallery is a static, JavaScript photo gallery generator with minimalist -- cgit 1.4.1 From e47918d00ff12d34084832fc636cab6d9e474ac5 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 14 Feb 2023 22:47:39 -0600 Subject: gnu: Add facedetect. * gnu/packages/graphics.scm (facedetect): New variable. (fgallery)[inputs,arguments]: Add it. --- gnu/packages/graphics.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index be6f63d5c7..5a50a77a72 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1732,6 +1732,59 @@ rendering @acronym{SVG, Scalable Vector Graphics}.") your terminal.") (license license:expat))) +(define-public facedetect + (let ((commit "5f9b9121001bce20f7d87537ff506fcc90df48ca") + (revision "0")) + (package + (name "facedetect") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wavexx/facedetect") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jiz72y3ykkxkiij1qqjf45gxg223sghkjir7sr663x91kviwkjd")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~`(("facedetect" "bin/facedetect") + ("README.rst" ,(string-append "share/doc/" #$name + "-" #$version "/README.rst"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "facedetect" + (("^DATA_DIR = .*") + (string-append "DATA_DIR = '" + #$opencv "/share/opencv" + #$(version-major (package-version opencv)) + "'\n"))))) + (add-after 'install 'wrap + (lambda _ + (let ((program (string-append #$output "/bin/facedetect"))) + (patch-shebang program) + (wrap-program program + `("GUIX_PYTHONPATH" prefix + ,(search-path-as-string->list + (getenv "GUIX_PYTHONPATH")))))))))) + (inputs + (list bash-minimal + opencv + python + python-numpy)) + (home-page "https://www.thregr.org/~wavexx/software/facedetect/") + (synopsis "Face detector") + (description "@code{facedetect} is a face detector for batch processing. +It answers the question: \"Is there a face in this image?\" and gives back +either an exit code or the coordinates of each detect face in the standard +output. @code{facedetect} is used in software such as @code{fgallery} to +improve the thumbnail cutting region, so that faces are always centered.") + (license license:gpl2+)))) + (define-public fgallery (package (name "fgallery") @@ -1774,6 +1827,7 @@ your terminal.") `("PATH" ":" prefix ,(map bin-directory '("imagemagick" "lcms" + "facedetect" "fbida" "libjpeg-turbo" "zip" @@ -1783,11 +1837,11 @@ your terminal.") `("PERL5LIB" ":" prefix (,perl5lib))))))))) (native-inputs (list unzip)) - ;; TODO: Add missing optional dependency: facedetect. (inputs (list bash-minimal imagemagick lcms + facedetect fbida libjpeg-turbo zip -- cgit 1.4.1 From c44149de9702743b866e5bae2e0773c31d9bc29d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:49 -0500 Subject: gnu: icecat: Update the "ach" locale. The previously specified changeset didn't match what was in the manifest (browser/locales/l10n-changesets.json) of the upstream source. * gnu/packages/gnuzilla.scm (all-mozilla-locales) [ach]: Update revision and hash. Modified-by: Mark H Weaver --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 33b5744c17..d6145cada2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -375,7 +375,7 @@ in C/C++.") (mozilla-locales ;; sha256 changeset locale ;;--------------------------------------------------------------------------- - ("1y562h0dg33vhhhwfk6jl7xbr67gng21vcf3rpm96zzcgbnf8rjj" "503a7baec899" "ach") + ("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach") ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af") ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an") ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar") -- cgit 1.4.1 From 24e20d419b404e4b43c12d70f0839502b09714b6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 14 Feb 2023 15:46:35 -0500 Subject: gnu: icecat: Update to 102.8.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2023-0767, CVE-2023-25728, CVE-2023-25729, CVE-2023-25730, CVE-2023-25732, CVE-2023-25734, CVE-2023-25735, CVE-2023-25737, CVE-2023-25738, CVE-2023-25739, CVE-2023-25742, CVE-2023-25743, CVE-2023-25744, and CVE-2023-25746. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. Remove the dependency on the Perl 'rename' program. * gnu/packages/patches/icecat-makeicecat.patch: Update to apply cleanly. --- gnu/packages/gnuzilla.scm | 17 ++++++++--------- gnu/packages/patches/icecat-makeicecat.patch | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d6145cada2..b2e0870fea 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2016 Alex Griffin @@ -477,8 +477,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.7.0-guix0-preview1") -(define %icecat-build-id "20230117000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -500,11 +500,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) + "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - (upstream-icecat-base-version "102.7.0") ; maybe older than base-version + (upstream-icecat-base-version "102.8.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837") + (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") (gnuzilla-source (origin (method git-fetch) @@ -516,7 +516,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "19i66qvwzgllgnlw270bxphymybjj1qb5hdznqi4i2dcgpcrq77l")))) + "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -540,8 +540,7 @@ in C/C++.") (set-path-environment-variable "PATH" '("bin") - (list #+rename - #+python + (list #+python #+(canonical-package bash) #+(canonical-package coreutils) #+(canonical-package findutils) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index c46cb27ff6..940ca36b6c 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -6,7 +6,7 @@ diff --git a/makeicecat b/makeicecat index bf2b7a6..bc3b19b 100755 --- a/makeicecat +++ b/makeicecat -@@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} +@@ -56,7 +56,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} # debug/shell options readonly DEVEL=0 set -euo pipefail @@ -15,8 +15,8 @@ index bf2b7a6..bc3b19b 100755 ############################################################################### -@@ -459,7 +459,7 @@ configure_search() - sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json +@@ -455,7 +455,7 @@ configure_search() + # Process various JSON pre-configuration dumps. - python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/ @@ -24,7 +24,7 @@ index bf2b7a6..bc3b19b 100755 } configure_mobile() -@@ -855,12 +855,12 @@ finalize_sourceball() +@@ -837,12 +837,12 @@ finalize_sourceball() # entry point ############################################################################### @@ -43,7 +43,7 @@ index bf2b7a6..bc3b19b 100755 apply_patches configure configure_search -@@ -872,4 +872,4 @@ prepare_macos_packaging +@@ -854,4 +854,4 @@ prepare_macos_packaging configure_extensions configure_onboarding apply_bugfixes -- cgit 1.4.1 From 42cf3694a5c85c6183959e96341fb8cf83888d7b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 15 Feb 2023 10:19:16 +0400 Subject: gnu: Add tree-sitter-scheme. gnu/packages/tree-sitter.scm (tree-sitter-scheme): New variable. --- gnu/packages/tree-sitter.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 5b01793744..e1fc91909b 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -451,3 +451,14 @@ will be used in description and synopsis." (git-version "1.3.1" revision commit) #:repository-url "https://github.com/milisims/tree-sitter-org" #:commit commit))) + +(define-public tree-sitter-scheme + ;; There are a lot of additions, the last tag was placed a while ago + (let ((commit "67b90a365bebf4406af4e5a546d6336de787e135") + (revision "0")) + (tree-sitter-grammar + "scheme" "Scheme (R5RS, R6RS)" + "1pvxckza1kdfwqs78ka3lbwldrwkgymb31f5x1fq5vyawg60wxk8" + (git-version "0.2.0" revision commit) + #:repository-url "https://github.com/6cdh/tree-sitter-scheme" + #:commit commit))) -- cgit 1.4.1 From a97a102d21edc0c9624cf92c1fbc0c01b1067290 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 15 Feb 2023 10:32:43 +0400 Subject: gnu: Add tree-sitter-racket. gnu/packages/tree-sitter.scm (tree-sitter-racket): New variable. --- gnu/packages/tree-sitter.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e1fc91909b..8dda7737ca 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -462,3 +462,14 @@ will be used in description and synopsis." (git-version "0.2.0" revision commit) #:repository-url "https://github.com/6cdh/tree-sitter-scheme" #:commit commit))) + +(define-public tree-sitter-racket + ;; No tags + (let ((commit "1a5df0206b25a05cb1b35a68d2105fc7493df39b") + (revision "0")) + (tree-sitter-grammar + "racket" "Racket" + "06gwn3i7swhkvbkgxjlljdjgvx8y1afafbqmpwya70r9z635593h" + (git-version "0.1.0" revision commit) + #:repository-url "https://github.com/6cdh/tree-sitter-racket" + #:commit commit))) -- cgit 1.4.1 From 89a8d213292ab99a4af67d9767743f47d6a1dc3f Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 13 Feb 2023 09:51:18 +0100 Subject: gnu: mes: Update to 0.24.2. * gnu/packages/mes.scm (mes): Update to 0.24.2. --- gnu/packages/mes.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 9ec506a1ed..4176977375 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021, 2022 Ricardo Wurmus @@ -158,14 +158,14 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.24.1") + (version "0.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "0d855agwawjjzwbjmvb5xlbwg77zdpwbjm9kjxc2wqvn0vmhq4im")))) + "0vp8v88zszh1imm3dvdfi3m8cywshdj7xcrsq4cgmss69s2y1nkx")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) (native-inputs -- cgit 1.4.1 From ce5b94cb79a68796b3bd946557e98bd0c3f648b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: sudo: Update to 1.9.13. * gnu/packages/admin.scm (sudo): Update to 1.9.13. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 847a252364..055be32972 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1969,7 +1969,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.12p2") + (version "1.9.13") (source (origin (method url-fetch) (uri @@ -1979,7 +1979,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0fc55axh2hfd8hn66dpmyrrgb0gf0nz71zpaygkrpp8x1ypb385r")) + "0dp4fy0nrqby06vcl34dnxzpqbzifacw7p15v4ls3c7d8rdlam9z")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 630b6e62d2c59ab6b869c36d47b53bf02a38a426 Mon Sep 17 00:00:00 2001 From: Gleb Zakharov Date: Fri, 9 Dec 2022 16:04:37 +0100 Subject: gnu: go-gopkg-in-yaml-v3: Update to 3.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This addresses an apparent upstream hash change, which was actually our own fault: the Guix package underspecified the version as ‘3’ instead of ‘3.0.0’, hence treating the ‘v3’ *branch* as a tag. Guix's hash for ‘3’ never matched upstream's ‘3.0.0’ release, so upgrade straight to ‘3.0.1’. * gnu/packages/golang.scm (go-gopkg-in-yaml-v3): Update to 3.0.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dfcca5ccf..18b785f61b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4695,7 +4695,7 @@ values.") (define-public go-gopkg-in-yaml-v3 (package (name "go-gopkg-in-yaml-v3") - (version "3") + (version "3.0.1") (source (origin (method git-fetch) @@ -4704,7 +4704,7 @@ values.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "06f4lnrp494wqaygv09dggr2dwf3z2bawqhnlnnwiamg5y787k4g")))) + (base32 "01b0wjb7yzv8wzzz2iim8mjpkwjnykcanrwiq06pkl89lr6gv8hn")))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/yaml.v3")) -- cgit 1.4.1 From 016eab3e29263045b1422289b7ec9382edc725f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Jan 2023 01:00:00 +0100 Subject: gnu: papirus-icon-theme: Recursively resolve symlinks. This follows up on commit aed385e18ec7b68a0bc1bb4b173aeadc9cd97245. * gnu/packages/gnome-xyz.scm (papirus-icon-theme)[arguments]: Replace READLINK with CANONICALIZE-PATH to resolve symlink chains. --- gnu/packages/gnome-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0cb4adac76..e1d0e5ec07 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -227,11 +227,10 @@ simple and consistent.") (symlink? (lambda (_ stat) (eq? 'symlink (stat:type stat))))) (for-each (lambda (file) - (with-directory-excursion (dirname file) - (let ((target (readlink file))) - (when (eq? 'regular (stat:type (stat target))) - (delete-file file) - (link target file))))) + (let ((target (canonicalize-path file))) + (when (eq? 'regular (stat:type (stat target))) + (delete-file file) + (link target file)))) (find-files out symlink?)))))))) (native-inputs (list `(,gtk+ "bin"))) -- cgit 1.4.1 From 77aff2b5d201a68542684aefb1fcf83b4d17490a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Jan 2023 01:00:00 +0100 Subject: gnu: papirus-icon-theme: Harden links before cache generation. Output is identical. This just feels moar correct. * gnu/packages/gnome-xyz.scm (papirus-icon-theme)[arguments]: Run the 'halve-inode-consumption phase before the 'install one. --- gnu/packages/gnome-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index e1d0e5ec07..f25cf446d7 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -217,21 +217,20 @@ simple and consistent.") (delete 'bootstrap) (delete 'configure) (delete 'build) - (add-after 'install 'halve-inode-consumption + (add-before 'install 'halve-inode-consumption ;; This package uses over 100K inodes, which is a lot. We can easily ;; halve that number by using (hard) links, to no ill effect. ;; See . ;; However, the source checkout will still use the full amount! - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (symlink? (lambda (_ stat) + (lambda _ + (let ((symlink? (lambda (_ stat) (eq? 'symlink (stat:type stat))))) (for-each (lambda (file) (let ((target (canonicalize-path file))) (when (eq? 'regular (stat:type (stat target))) (delete-file file) (link target file)))) - (find-files out symlink?)))))))) + (find-files "." symlink?)))))))) (native-inputs (list `(,gtk+ "bin"))) (home-page "https://git.io/papirus-icon-theme") -- cgit 1.4.1 From 017f1779e937a85e525debdb89807592b35f55ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Jan 2023 01:00:00 +0100 Subject: gnu: linux-libre: Disable unprivileged BPF by default. * gnu/packages/aux-files/linux-libre/5.15-arm.conf: Set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y. * gnu/packages/aux-files/linux-libre/5.15-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-arm.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-x86_64.conf: Likewise. --- gnu/packages/aux-files/linux-libre/5.15-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-x86_64.conf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/linux-libre/5.15-arm.conf b/gnu/packages/aux-files/linux-libre/5.15-arm.conf index a45530711e..2d5b20f1de 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-arm.conf @@ -101,7 +101,7 @@ CONFIG_HAVE_EBPF_JIT=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y # CONFIG_BPF_JIT_ALWAYS_ON is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_LSM=y # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/5.15-arm64.conf b/gnu/packages/aux-files/linux-libre/5.15-arm64.conf index 3a3d144330..5ed52b3c76 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-arm64.conf @@ -96,7 +96,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y # CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_BPF_JIT_DEFAULT_ON=y -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_LSM=y # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/5.15-i686.conf b/gnu/packages/aux-files/linux-libre/5.15-i686.conf index ab2008f3e5..d2bf661acf 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-i686.conf @@ -108,7 +108,7 @@ CONFIG_HAVE_EBPF_JIT=y # CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf index 8fbb48bcb6..973fd2e47c 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf @@ -112,7 +112,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y # CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/6.1-arm.conf b/gnu/packages/aux-files/linux-libre/6.1-arm.conf index d0e1c9ad08..59dd0ad9f7 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-arm.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-arm.conf @@ -103,7 +103,7 @@ CONFIG_HAVE_EBPF_JIT=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y # CONFIG_BPF_JIT_ALWAYS_ON is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_LSM=y # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/6.1-arm64.conf b/gnu/packages/aux-files/linux-libre/6.1-arm64.conf index b5654dcd8e..6d25a1c2b5 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-arm64.conf @@ -112,7 +112,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y # CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_BPF_JIT_DEFAULT_ON=y -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_LSM=y # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/6.1-i686.conf b/gnu/packages/aux-files/linux-libre/6.1-i686.conf index b91ff79b72..f06280b0ff 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-i686.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-i686.conf @@ -111,7 +111,7 @@ CONFIG_HAVE_EBPF_JIT=y # CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem diff --git a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf index 68187506f1..7224770c4a 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf @@ -116,7 +116,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y # CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem -- cgit 1.4.1 From f7f6000f81a467d6e38e0ac57130db752db39792 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sat, 23 Apr 2022 21:04:58 +0200 Subject: gnu: rust-structopt-derive-0.4: Update to 0.4.18. * gnu/packages/crates-io.scm (rust-structopt-derive-0.4): Update to 0.4.18. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 654e514fa8..121e94082c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56253,7 +56253,7 @@ struct.") (define-public rust-structopt-derive-0.4 (package (name "rust-structopt-derive") - (version "0.4.14") + (version "0.4.18") (source (origin (method url-fetch) @@ -56262,7 +56262,7 @@ struct.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav")))) + "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 06d45a82397fb19479b4cdde0372afb541d579c1 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 24 Apr 2022 01:27:08 +0200 Subject: gnu: rust-structopt-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-structopt): Update to 0.3.26. [arguments]: Add rust-paw-1 to cargo-inputs. Add cargo development inputs. Add phases to fix rust-clap-2 version and remove lints feature. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 121e94082c..e615a51b01 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56202,7 +56202,7 @@ and Jaro-Winkler.") (define-public rust-structopt-0.3 (package (name "rust-structopt") - (version "0.3.21") + (version "0.3.26") (source (origin (method url-fetch) @@ -56211,14 +56211,27 @@ and Jaro-Winkler.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj")))) + "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-structopt-derive" ,rust-structopt-derive-0.4) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-clap" ,rust-clap-2)))) + ("rust-paw" ,rust-paw-1) + ("rust-clap" ,rust-clap-2)) + #:cargo-development-inputs + (("rust-strum" ,rust-strum-0.21) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-rustversion" ,rust-rustversion-1)) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fixup-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ;; feature does not exist + (("lints.*") "") + (("2.33") ,(package-version rust-clap-2)))))))) (home-page "https://github.com/TeXitoi/structopt") (synopsis "Parse command line argument by defining a struct") (description -- cgit 1.4.1 From b4d2670771b8c2b9c4aedbef0371f1d23197d209 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Feb 2023 11:26:49 +0200 Subject: gnu: alacritty: Adjust bash completions. * gnu/packages/terminals.scm (alacritty)[arguments]: Adjust custom 'install phase to install the bash completion script with the correct name. --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index cca3210bec..3877fbc4c8 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1543,8 +1543,9 @@ basic input/output.") "-o" (string-append share "/terminfo/") "extra/alacritty.info") ;; Install completions. - (install-file "extra/completions/alacritty.bash" - (string-append out "/etc/bash_completion.d")) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (copy-file "extra/completions/alacritty.bash" + (string-append out "/etc/bash_completion.d/alacritty")) (install-file "extra/completions/_alacritty" (string-append share "/zsh/site-functions")) (install-file "extra/completions/alacritty.fish" -- cgit 1.4.1 From 12127395dc55d9ea389a6dc619207c406725237e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 15 Feb 2023 16:15:25 +0000 Subject: gnu: openmw-openscenegraph: Fix builder. This broke with the changes to openscenegraph in 629a5936a6dfa0fe2cc2a3092ec51920b216b652. * gnu/packages/graphics.scm (openmw-openscenegraph)[arguments]: Handle #:configure-flags from openscenegraph as a gexp. --- gnu/packages/graphics.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 5a50a77a72..94b93970b1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1492,18 +1492,18 @@ in Julia).") (substitute-keyword-arguments (package-arguments openscenegraph) ((#:configure-flags flags) ;; As per the above wiki link, the following plugins are enough: - `(append - '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0" - "-DBUILD_OSG_PLUGIN_OSG=1" - "-DBUILD_OSG_PLUGIN_DDS=1" - "-DBUILD_OSG_PLUGIN_TGA=1" - "-DBUILD_OSG_PLUGIN_BMP=1" - "-DBUILD_OSG_PLUGIN_JPEG=1" - "-DBUILD_OSG_PLUGIN_PNG=1" - "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" - ;; The jpeg plugin requires conversion between integers and booleans - "-DCMAKE_CXX_FLAGS=-fpermissive") - ,flags)))))))) + #~(append + '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0" + "-DBUILD_OSG_PLUGIN_OSG=1" + "-DBUILD_OSG_PLUGIN_DDS=1" + "-DBUILD_OSG_PLUGIN_TGA=1" + "-DBUILD_OSG_PLUGIN_BMP=1" + "-DBUILD_OSG_PLUGIN_JPEG=1" + "-DBUILD_OSG_PLUGIN_PNG=1" + "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" + ;; The jpeg plugin requires conversion between integers and booleans + "-DCMAKE_CXX_FLAGS=-fpermissive") + #$flags)))))))) (define-public povray (package -- cgit 1.4.1 From 6992e66b21a1bda67f4928729564efe25aa7337c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Feb 2023 20:24:42 -0500 Subject: gnu: linux-libre: Update to 6.1.12. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.12. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 20028d6682..4e0de37331 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.11") +(define-public linux-libre-6.1-version "6.1.12") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -491,7 +491,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq"))) + (hash (base32 "1spdl3i69qwn7cywzs6kql8nlisdnmnwk9za7v4xq1092xsscynl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From 8462ce0eebf743f464bda8998c6633f2f03b9edf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Feb 2023 20:25:03 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.94. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.94. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4e0de37331..4d2fb96f51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.93") +(define-public linux-libre-5.15-version "5.15.94") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7"))) + (hash (base32 "0wjsqvhp0jnisypb8yw6dncyp5k7zxbhjivh7jqivpsdwvdp14ns"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From f5fb40478120f342d9040f39a862d436e4fdb0d6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 11 Feb 2023 21:50:35 +0000 Subject: gnu: Add julia-erfa-jll. * gnu/packages/julia-jll.scm (julia-erfa-jll): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-jll.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 1aab2f78ce..77bb3ff3d5 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -232,6 +232,42 @@ originating @code{build_tarballs.jl} script can be found on the community build tree Yggdrasil.") (license license:expat))) +(define-public julia-erfa-jll + (package + (name "julia-erfa-jll") + (version "2.0.0+0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/ERFA_jll.jl") + (commit (string-append "ERFA-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0knlck3vqr19g9z8zgjr7lj0qf1lisji5s2lm00y3ymv9bkj59sl")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ;no runtests + #:phases + (modify-phases %standard-phases + (add-after 'link-depot 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"ERFA\", \"" + (assoc-ref inputs "erfa") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (inputs (list erfa)) + (propagated-inputs (list julia-jllwrappers)) + (home-page "https://github.com/JuliaBinaryWrappers/ERFA_jll.jl") + (synopsis "ERFA library wrappers") + (description "This package provides a wrapper for the erfa library.") + (license license:expat))) + (define-public julia-expat-jll (package (name "julia-expat-jll") -- cgit 1.4.1 From c4cd6560d3351827fbce4fdd9c6c8ab095ba792d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 11 Feb 2023 21:50:36 +0000 Subject: gnu: Add julia-wcs-jll. * gnu/packages/julia-jll.scm (julia-wcs-jll): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-jll.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 77bb3ff3d5..2320b03595 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1763,6 +1763,44 @@ build tree Yggdrasil.") (description "This package provides a wrapper for the wayland-protocols library.") (license license:expat))) +(define-public julia-wcs-jll + (package + (name "julia-wcs-jll") + (version "7.7.0+0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/WCS_jll.jl") + (commit (string-append "WCS-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16i9899jwcp5i9mh88rn4b83v3i5v8g1jygixrr0grjnvf5qfvpk")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; no runtests + #:phases + (modify-phases %standard-phases + (add-after 'link-depot 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"WCS\", \"" + (assoc-ref inputs "wcslib") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (inputs + (list wcslib)) + (propagated-inputs + (list julia-jllwrappers)) + (home-page "https://github.com/JuliaBinaryWrappers/WCS_jll.jl") + (synopsis "WCS library wrappers") + (description "This package provides a wrapper for the wcs library.") + (license license:expat))) + (define-public julia-x264-jll (package (name "julia-x264-jll") -- cgit 1.4.1 From 86237323d292b839fcc127990704ff70c4a04250 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 11 Feb 2023 21:50:37 +0000 Subject: gnu: Add julia-erfa. * gnu/packages/julia-xyz.scm (julia-erfa): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b6da796b59..8f2b29193a 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1852,6 +1852,27 @@ It's similar to the Python @code{...} in that it means \"all of the columns before (or after)\".") (license license:expat))) +(define-public julia-erfa + (package + (name "julia-erfa") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaAstro/ERFA.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f63kyqpsx9n4dh54hzy1bvm3fpl4vf8wi1279vfiza3vhh2ggx5")))) + (build-system julia-build-system) + (propagated-inputs + (list julia-erfa-jll julia-staticarrays)) + (home-page "https://github.com/JuliaAstro/ERFA.jl") + (synopsis "Julia wrapper for liberfa") + (description "This package provides a Julia wrapper for astronomical library ERFA.") + (license license:expat))) + (define-public julia-example (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) (package -- cgit 1.4.1 From fe3121d651878c9a9581711c966369b73cfa87c6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 11 Feb 2023 21:50:38 +0000 Subject: gnu: Add julia-wcs. * gnu/packages/julia-xyz.scm (julia-wcs): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 8f2b29193a..82429c957d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -6141,6 +6141,29 @@ useful in order to support @code{VersionNumber} comparisons applied to \"foreign\" version numbers from external packages.") (license license:expat))) +(define-public julia-wcs + (package + (name "julia-wcs") + (version "0.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaAstro/WCS.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ala8j4mh51gh14k3npcxmnlj2f00l0pij74qz453iqadb2283mi")))) + (build-system julia-build-system) + (propagated-inputs + (list julia-constructionbase julia-wcs-jll)) + (home-page "https://github.com/JuliaAstro/WCS.jl") + (synopsis "Astronomical WCS library for Julia") + (description "Astronomical @url{World Coordinate System, +https://www.atnf.csiro.au/people/mcalabre/WCS/} library for Julia. This package +wraps the WCSLIB C library.") + (license license:expat))) + (define-public julia-weakrefstrings (package (name "julia-weakrefstrings") -- cgit 1.4.1 From 47439697aeed1d8788e7fc4c02ef1c610e0b4151 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Feb 2023 21:17:40 +0200 Subject: gnu: mold: Update to 1.10.1. * gnu/packages/mold.scm (mold): Update to 1.10.1. [arguments]: Adjust substitution in custom 'force-system-xxhash phase. --- gnu/packages/mold.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index dfc452a329..1e67f80081 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -34,7 +34,7 @@ (define-public mold (package (name "mold") - (version "1.9.0") + (version "1.10.1") (source (origin (method git-fetch) @@ -43,7 +43,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03qkl9qw5l5kg1awij40hcrfxq6jj70mvq4iscdy9dsn8qw8r3wb")) + (base32 "1bqv1a93n3nks38k8fdc5i7v7ca2sav8n4xxaph0ikaqw1mkjcg7")) (modules '((guix build utils))) (snippet #~(begin @@ -60,8 +60,8 @@ #~(modify-phases %standard-phases (add-before 'configure 'force-system-xxhash (lambda _ - (substitute* "mold.h" - (("#include \"third-party/xxhash/xxhash.h\"") + (substitute* "common/common.h" + (("#include \"../third-party/xxhash/xxhash.h\"") "#include ")))) (add-before 'configure 'fix-compiler-name-in-test (lambda _ -- cgit 1.4.1 From ebd19dd668fa7d42f32d1e21e0ecdc9eae0e0495 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: bind: Update to 9.16.38. * gnu/packages/dns.scm (isc-bind): Update to 9.16.38. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 3c2762918f..8865d16a1a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -337,14 +337,14 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; The BIND release notes are available here: ;; https://www.isc.org/bind/ - (version "9.16.37") + (version "9.16.38") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/bind9/" version "/bind-" version ".tar.xz")) (sha256 - (base32 "1az2y8zdpn6vfmx4xqnsh5znagcrsvkqa1hz3h8izzm24ban2ihf")) + (base32 "03y52iyc2g63lkk9x2vaizpr0jv27g1z6mcxnjw8m8l4kaflrx4d")) (patches (search-patches "bind-re-add-attr-constructor-priority.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From c1303a914c172dc80166be22389e7032c5ea5e09 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 15 Feb 2023 17:55:12 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.168. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.168. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d2fb96f51..33faf8920d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.167") +(define-public linux-libre-5.10-version "5.10.168") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq"))) + (hash (base32 "171mmgkjdsn6gx6z8kr5d80aygn4jjf8jc9zfh7m2c4dpab2azdn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 1b4f6286df13505cd17b3060fe4da7f03f39ba59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Feb 2023 17:07:35 +0200 Subject: gnu: scsh: Use a search path. * gnu/packages/shells.scm (scsh)[source]: Add patch. [native-search-paths]: New field. * gnu/packages/patches/scsh-nonstring-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/patches/scsh-nonstring-search-path.patch | 15 +++++++++++++++ gnu/packages/shells.scm | 10 ++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/scsh-nonstring-search-path.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 07a7a0f527..5fcbdd4586 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1843,6 +1843,7 @@ dist_patch_DATA = \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scons-test-environment.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ + %D%/packages/patches/scsh-nonstring-search-path.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \ diff --git a/gnu/packages/patches/scsh-nonstring-search-path.patch b/gnu/packages/patches/scsh-nonstring-search-path.patch new file mode 100644 index 0000000000..3934d49fa3 --- /dev/null +++ b/gnu/packages/patches/scsh-nonstring-search-path.patch @@ -0,0 +1,15 @@ +This patch was submitted upstream: +https://github.com/scheme/scsh/pull/46 + +diff --git a/scheme/lib-dirs.scm b/scheme/lib-dirs.scm +index a1fc009..c630fb4 100644 +--- a/scheme/lib-dirs.scm ++++ b/scheme/lib-dirs.scm +@@ -75,6 +75,7 @@ + (let ((val (read))) + (cond ((eof-object? val) '()) + ((string? val) (cons val (recur))) ++ ((symbol? val) (cons (symbol->string val) (recur))) + ((not val) (append default-lib-dirs (recur))) + (else + (error diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 128e557a21..0c8cbf3f4c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021, 2022 Nicolas Goaziou ;;; Copyright © 2021, 2022 Felix Gruber @@ -612,7 +612,8 @@ use of experts and novices alike.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q")))) + "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q")) + (patches (search-patches "scsh-nonstring-search-path.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -631,6 +632,11 @@ use of experts and novices alike.") (list scheme48 scheme48-rx)) (native-inputs (list autoconf automake)) + (native-search-paths + (list (search-path-specification + (variable "SCSH_LIB_DIRS") + (separator " ") + (files '("share/scsh-0.7"))))) (home-page "https://github.com/scheme/scsh") (synopsis "Unix shell embedded in Scheme") (description -- cgit 1.4.1 From b6a4fbb488f1f539ae45ed7924c9af8905fa0d8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 14 Feb 2023 13:32:58 +0100 Subject: gnu: fastqc: Update to 0.11.9. * gnu/packages/bioinformatics.scm (fastqc): Update to 0.11.9. [source]: Fetch via git; delete bundled jar files. [arguments]: Also patch .classpath file in 'fix-dependencies; fix patching of reference to java in fastqc wrapper; override CLASSPATH. --- gnu/packages/bioinformatics.scm | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c6eab671cb..5b9d754060 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5250,16 +5250,22 @@ VCF.") (define-public fastqc (package (name "fastqc") - (version "0.11.5") + (version "0.11.9") (source (origin - (method url-fetch) - (uri (string-append "http://www.bioinformatics.babraham.ac.uk/" - "projects/fastqc/fastqc_v" - version "_source.zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/s-andrews/FastQC") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "18rrlkhcrxvvvlapch4dpj6xc6mpayzys8qfppybi8jrpgx5cc5f")))) + "00y9drm0bkpxw8xfl8ysss18jmnhj8blgqgr6fpa58rkpfcbg8qk")) + (snippet + '(for-each delete-file + '("cisd-jhdf5.jar" + "sam-1.103.jar" + "jbzip2-0.9.jar"))))) (build-system ant-build-system) (arguments (list @@ -5269,7 +5275,7 @@ VCF.") #~(modify-phases %standard-phases (add-after 'unpack 'fix-dependencies (lambda* (#:key inputs #:allow-other-keys) - (substitute* "build.xml" + (substitute* '("build.xml" ".classpath") (("jbzip2-0.9.jar") (search-input-file inputs "/share/java/jbzip2.jar")) (("sam-1.103.jar") @@ -5278,17 +5284,28 @@ VCF.") (search-input-file inputs "/share/java/sis-jhdf5.jar"))))) ;; There is no installation target (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) (let* ((bin (string-append #$output "/bin")) (share (string-append #$output "/share/fastqc/")) (exe (string-append share "/fastqc"))) (for-each mkdir-p (list bin share)) (copy-recursively "bin" share) (substitute* exe - (("my \\$java_bin = 'java';") - (string-append "my $java_bin = '" - (search-input-file inputs "/bin/java") - "';"))) + (("my \\$java_bin = \"java\";") + (string-append "my $java_bin = \"" + ;; Use java from the JRE, not the JDK + #$(this-package-input "icedtea") "/bin/java" + "\";")) + (("\\$RealBin\\$delimiter\\$RealBin.*") + (string-append + (string-join + (list + share + (search-input-file inputs "/share/java/sam-1.112.jar") + (search-input-file inputs "/share/java/jbzip2.jar") + (search-input-file inputs "/share/java/sis-jhdf5.jar")) + "$delimiter") + "\";\n"))) (chmod exe #o555) (symlink exe (string-append bin "/fastqc")))))))) (inputs -- cgit 1.4.1 From 312f1f41d3f3f3e5d2c36ff46920c6dce1c21a17 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Thu, 16 Feb 2023 16:45:23 +0100 Subject: gnu: Add r-changepoint. * gnu/packages/cran.scm (r-changepoint): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b4dc7822f2..6cea202519 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -283,6 +283,29 @@ simulating diversification models, dating trees, comparing trees, and reading/writing trees in Newick format.") (license license:gpl2+))) +(define-public r-changepoint + (package + (name "r-changepoint") + (version "2.2.4") + (source (origin + (method url-fetch) + (uri (cran-uri "changepoint" version)) + (sha256 + (base32 + "16v4p2c9zi2w3anwf5y9snl5dy1g5aidiqz1vn2p64qhfvg6yqxc")))) + (properties `((upstream-name . "changepoint"))) + (build-system r-build-system) + (propagated-inputs (list r-zoo)) + (home-page "https://github.com/rkillick/changepoint/") + (synopsis "Methods for changepoint detection") + (description + "Changepoint implements various mainstream and specialised changepoint +methods. These methods are suitable for finding single and multiple +changepoints within data. Many popular non-parametric and frequentist methods +are included as well.") + ;; Any version of the GPL. + (license license:gpl3+))) + (define-public r-collections (package (name "r-collections") -- cgit 1.4.1 From 672036c6dfe508810b565f4cf38e4f2aad2f7151 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Feb 2023 22:36:43 +0200 Subject: gnu: Remove unneeded module imports. * gnu/packages/abiword.scm, * gnu/packages/ada.scm, * gnu/packages/agda.scm, * gnu/packages/backup.scm, * gnu/packages/barrier.scm, * gnu/packages/bioinformatics.scm, * gnu/packages/bootstrap.scm, * gnu/packages/bqn.scm, * gnu/packages/c.scm, * gnu/packages/chemistry.scm, * gnu/packages/coq.scm, * gnu/packages/cross-base.scm, * gnu/packages/databases.scm, * gnu/packages/emacs-xyz.scm, * gnu/packages/enlightenment.scm, * gnu/packages/games.scm, * gnu/packages/geo.scm, * gnu/packages/ghostscript.scm, * gnu/packages/gl.scm, * gnu/packages/golang.scm, * gnu/packages/jami.scm, * gnu/packages/java-maths.scm, * gnu/packages/kde-frameworks.scm, * gnu/packages/kde-plasma.scm, * gnu/packages/language.scm, * gnu/packages/libreoffice.scm, * gnu/packages/linphone.scm, * gnu/packages/lisp.scm, * gnu/packages/llvm.scm, * gnu/packages/machine-learning.scm, * gnu/packages/minetest.scm, * gnu/packages/monitoring.scm, * gnu/packages/nfs.scm, * gnu/packages/ocr.scm, * gnu/packages/opencl.scm, * gnu/packages/pdf.scm, * gnu/packages/python-xyz.scm, * gnu/packages/racket.scm, * gnu/packages/rust.scm, * gnu/packages/syncthing.scm, * gnu/packages/syndication.scm, * gnu/packages/telegram.scm, * gnu/packages/vulkan.scm, * gnu/packages/web-browsers.scm, * gnu/packages/web.scm, * gnu/packages/webkit.scm: Remove some unecessary module imports. --- gnu/packages/abiword.scm | 1 - gnu/packages/ada.scm | 6 ------ gnu/packages/agda.scm | 1 - gnu/packages/backup.scm | 1 - gnu/packages/barrier.scm | 1 - gnu/packages/bioinformatics.scm | 1 - gnu/packages/bootstrap.scm | 1 - gnu/packages/bqn.scm | 1 - gnu/packages/c.scm | 1 - gnu/packages/chemistry.scm | 1 - gnu/packages/coq.scm | 1 - gnu/packages/cross-base.scm | 1 - gnu/packages/databases.scm | 2 -- gnu/packages/emacs-xyz.scm | 2 -- gnu/packages/enlightenment.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/geo.scm | 2 -- gnu/packages/ghostscript.scm | 1 - gnu/packages/gl.scm | 1 - gnu/packages/golang.scm | 1 - gnu/packages/jami.scm | 1 - gnu/packages/java-maths.scm | 1 - gnu/packages/kde-frameworks.scm | 1 - gnu/packages/kde-plasma.scm | 1 - gnu/packages/language.scm | 1 - gnu/packages/libreoffice.scm | 1 - gnu/packages/linphone.scm | 4 +--- gnu/packages/lisp.scm | 2 -- gnu/packages/llvm.scm | 1 - gnu/packages/machine-learning.scm | 1 - gnu/packages/minetest.scm | 1 - gnu/packages/monitoring.scm | 1 - gnu/packages/nfs.scm | 3 --- gnu/packages/ocr.scm | 1 - gnu/packages/opencl.scm | 1 - gnu/packages/pdf.scm | 1 - gnu/packages/python-xyz.scm | 2 -- gnu/packages/racket.scm | 1 - gnu/packages/rust.scm | 1 - gnu/packages/syncthing.scm | 1 - gnu/packages/syndication.scm | 1 - gnu/packages/telegram.scm | 1 - gnu/packages/vulkan.scm | 1 - gnu/packages/web-browsers.scm | 1 - gnu/packages/web.scm | 1 - gnu/packages/webkit.scm | 1 - 46 files changed, 1 insertion(+), 60 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 5a0a4cd7be..2817ca0e89 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -25,7 +25,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages autotools) diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm index ea3e9c365b..6fcd689be0 100644 --- a/gnu/packages/ada.scm +++ b/gnu/packages/ada.scm @@ -21,16 +21,10 @@ (define-module (gnu packages ada) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages base) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (ice-9 match)) (define-public ada/ed diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 038b38195f..0cc3151e3f 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -28,7 +28,6 @@ #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) - #:use-module (guix build-system trivial) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 6815b0e337..5841c894d1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -50,7 +50,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) - #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (gnu packages) diff --git a/gnu/packages/barrier.scm b/gnu/packages/barrier.scm index 721fdcf314..5c2ecb0f2f 100644 --- a/gnu/packages/barrier.scm +++ b/gnu/packages/barrier.scm @@ -18,7 +18,6 @@ (define-module (gnu packages barrier) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix download) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5b9d754060..9470e6eb1a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -56,7 +56,6 @@ #:use-module (guix build-system go) #:use-module (guix build-system haskell) #:use-module (guix build-system meson) - #:use-module (guix build-system ocaml) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 9ea1a3e4d1..75980f2148 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -30,7 +30,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system) - #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module ((guix store) #:select (%store-monad interned-file text-file store-lift)) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 8cce9564a2..9b44ea7992 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -23,7 +23,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (gnu packages) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d6bd8c194a..b2f16613dd 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -44,7 +44,6 @@ #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build-system trivial) #:use-module (guix store) #:use-module (gnu packages) #:use-module (gnu packages bash) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index fb6d6fc27f..529d013f3d 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -67,7 +67,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) - #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 0d8cb26358..09ca4030ea 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -42,7 +42,6 @@ #:use-module (gnu packages texinfo) #:use-module (guix build-system dune) #:use-module (guix build-system gnu) - #:use-module (guix build-system ocaml) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index add9a2f901..59548bac3e 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -38,7 +38,6 @@ #:use-module (guix i18n) #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8e0db3090a..f32c1f2d07 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -178,8 +178,6 @@ #:use-module (guix build-system qt) #:use-module (guix build-system ruby) #:use-module (guix build-system cmake) - #:use-module (guix build-system scons) - #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 729c190969..6047bbe393 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -152,8 +152,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system emacs) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system perl) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index a08ad05143..64d8945f8e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -27,7 +27,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) - #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index be2b158f40..f9b4505ffe 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -216,7 +216,6 @@ #:use-module (gnu packages xml) #:use-module (guix build-system copy) #:use-module (guix build-system cmake) - #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b9a617c009..ff0dc0b6b0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -46,8 +46,6 @@ #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system qt) - #:use-module (guix build-system scons) - #:use-module (guix build-system r) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index ca522e52ab..55f3ab9364 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -43,7 +43,6 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) #:use-module (srfi srfi-1)) (define-public lcms diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 09aafcc1c3..6956b989d6 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -64,7 +64,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system meson) #:use-module (guix build-system python) - #:use-module (guix build-system waf) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 18b785f61b..c4b6bcd874 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -66,7 +66,6 @@ #:use-module (guix packages) #:use-module (guix gexp) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) #:use-module (guix build-system go) #:use-module (gnu packages) #:use-module (gnu packages admin) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 92a4e55606..83e7157f35 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (gnu packages) - #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system qt) diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm index 45c42297ad..55b8a35e75 100644 --- a/gnu/packages/java-maths.scm +++ b/gnu/packages/java-maths.scm @@ -22,7 +22,6 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) - #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages gcc) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6f463d217c..10b8ac0134 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -31,7 +31,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (guix build-system qt) - #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2a3d86f801..9000ae80d2 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -30,7 +30,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix build-system cmake) - #:use-module (guix build-system copy) #:use-module (guix build-system trivial) #:use-module (guix build-system qt) #:use-module (gnu packages) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index b29ed9c013..994bc09e67 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -61,7 +61,6 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 5b4397581f..32802334e7 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -34,7 +34,6 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build-system trivial) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 130097ef40..84bc16805c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -59,9 +59,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) - #:use-module (guix build-system qt) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system qt)) (define-public bcunit (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e63511fd9a..777c6edbc5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -54,8 +54,6 @@ #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system ant) - #:use-module (guix build-system asdf) #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (gnu packages admin) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1468a79c90..09c546734e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -50,7 +50,6 @@ #:use-module (guix git-download) #:use-module (guix memoization) #:use-module (guix utils) - #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system python) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9aae8d8243..162bdcb74f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -45,7 +45,6 @@ #:use-module (guix build-system ocaml) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) - #:use-module (guix build-system r) #:use-module (guix build-system trivial) #:use-module (guix git-download) #:use-module (gnu packages) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index a30bce57de..c5fc18f5d1 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -46,7 +46,6 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) - #:use-module (guix build-system trivial) #:use-module (guix build-system minetest) #:use-module ((guix licenses) #:prefix license:)) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 74ec7b6cdf..629bb02acc 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -36,7 +36,6 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system gnu) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index d5ebe6a760..88d4069587 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -33,10 +33,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 0382e0d869..c1cd4f061e 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -31,7 +31,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 847284c427..fdfb7d0a27 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -20,7 +20,6 @@ (define-module (gnu packages opencl) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) - #:use-module (guix build-system copy) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix utils) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 864c23b0d2..378b1b2411 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -53,7 +53,6 @@ #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) - #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 445f5a787d..ac09edcc98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -257,7 +257,6 @@ #:use-module (gnu packages serialization) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix gexp) @@ -266,7 +265,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) - #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2cda2b6b9c..b5959e5f68 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -26,7 +26,6 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix gexp) - #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix diagnostics) #:use-module (guix i18n) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c0f663977a..133c46fb7c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -54,7 +54,6 @@ #:use-module (guix build-system cargo) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 74c25ed3ab..5f98cb56b0 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -26,7 +26,6 @@ (define-module (gnu packages syncthing) #:use-module (guix build-system go) #:use-module (guix build-system python) - #:use-module (guix build-system trivial) #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 506245fd17..769cc85d37 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -33,7 +33,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) - #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ad9ca74a6c..c6ab5d312c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -75,7 +75,6 @@ #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) - #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system qt)) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a2db5511d5..9203731865 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -28,7 +28,6 @@ #:use-module (guix gexp) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b898311c51..b35d29c160 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -38,7 +38,6 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages web-browsers) - #:use-module (guix build-system asdf) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7e49f798ea..271c6ffa81 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -98,7 +98,6 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) - #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system trivial) #:use-module (gnu packages) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 61c75dd901..5dd66ecd76 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -33,7 +33,6 @@ #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) - #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bison) -- cgit 1.4.1 From 28bd26b6b8245c71bc474237b24498caa832cc25 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Thu, 16 Feb 2023 21:17:50 +0100 Subject: gnu: aerc: Update to 0.14.0 * gnu/packages/mail.scm (aerc): Update to 0.14.0. Signed-off-by: Leo Famulari --- gnu/packages/mail.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index adac3cce4b..c8bf77f8c2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 jgart ;;; Copyright © 2022 ( +;;; Copyright © 2023 Timo Wilken ;;; ;;; This file is part of GNU Guix. ;;; @@ -4788,7 +4789,7 @@ remote SMTP server.") (define-public aerc (package (name "aerc") - (version "0.13.0") + (version "0.14.0") (source (origin (method git-fetch) (uri (git-reference @@ -4797,7 +4798,7 @@ remote SMTP server.") (file-name (git-file-name name version)) (sha256 (base32 - "18rykklc0ppl53sm9lzhrw6kv4rcc7x45nv7qii7m4qads2pyjm5")))) + "067j7kja78hv7dafw8gy3m2g5cslq6xlnzja8lm3b5p0m0vfabm8")))) (build-system go-build-system) (arguments (list #:import-path "git.sr.ht/~rjarry/aerc" -- cgit 1.4.1 From 8ecda39a3c1c40a4fb40ce2d4232af2683e9abf4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 16 Feb 2023 16:46:45 +0100 Subject: gnu: Add cl-nasdf. * gnu/packages/lisp-xyz.scm (cl-nasdf, ecl-nasdf, sbcl-nasdf): New variables. --- gnu/packages/lisp-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c45822fead..2faa0cab74 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23832,6 +23832,52 @@ change since last write. (cons (list "iolib" cl-iolib) (package-inputs sbcl-nfiles))))) +(define-public sbcl-nasdf + (let ((commit "c63a6ff12239f132844cc0703e79ea3b33dae630")) + (package + (name "sbcl-nasdf") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atlas-engineer/ntemplate") + (commit commit))) + (file-name (git-file-name "cl-ntemplate" version)) + (sha256 + (base32 + "1b57jkyrvr3n0c66lih4m34fqzw3s5yqlk91v7hg2gchcn3v9glg")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'cd-sdl + (lambda _ + (chdir "nasdf") + #t))))) + (home-page "https://github.com/atlas-engineer/ntemplate") + (synopsis "ASDF helpers for system setup, testing and installation") + (description + "NASDF is an ASDF extension providing utilities to ease system setup, testing and installation. + +@itemize +@item Simple way to fetch Git submodules and “do the right thing” for +setup. This may effectively supersede Quicklisp. A benefit of using Git +submodules over the default Quicklisp distribution is improved +reproducibility. +@item Test helpers, like distinction between offline and online tests, or +continuous integration options, and warning reports. +@item Installation helpers, for instance to install libraries, icons and +desktop files to the right directories. +@end itemize\n") + (license license:bsd-3)))) + +(define-public ecl-nasdf + (sbcl-package->ecl-package sbcl-nasdf)) + +(define-public cl-nasdf + (sbcl-package->cl-source-package sbcl-nasdf)) + (define-public sbcl-nclasses (package (name "sbcl-nclasses") -- cgit 1.4.1 From d0ba3f94284a03df6cd742f04ce37f81cebe19bf Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 16 Feb 2023 15:44:04 +0100 Subject: gnu: sbcl-nclasses: Update to 0.2.1. * gnu/packages/lisp-xyz.scm (sbcl-nclasses): Update to 0.2.1. --- gnu/packages/lisp-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2faa0cab74..a737a996b7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23881,7 +23881,7 @@ desktop files to the right directories. (define-public sbcl-nclasses (package (name "sbcl-nclasses") - (version "0.2.0") + (version "0.2.1") (source (origin (method git-fetch) @@ -23891,12 +23891,18 @@ desktop files to the right directories. (file-name (git-file-name "cl-nclasses" version)) (sha256 (base32 - "08mad0555n883rjyg4j7r1vp35cyl4spbqfamjfalv5bl8d38849")))) + "1y1za2vm7m1bhkj6ssc29jvs9p82swjvclnhm9xyp2b275ykzz7l")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "nasdf") + #t)))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-moptilities)) (native-inputs - (list sbcl-lisp-unit2)) + (list sbcl-lisp-unit2 + sbcl-nasdf)) (home-page "https://github.com/atlas-engineer/nclasses") (synopsis "Simplify class and condition definitions.") (description -- cgit 1.4.1 From 08edbd2535ae622d319a51e6f877d23d75dc24f3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 16 Feb 2023 16:47:51 +0100 Subject: gnu: sbcl-nfiles: Update to 1.1.2. * gnu/packages/lisp-xyz.scm (sbcl-nfiles): Update to 1.1.2. --- gnu/packages/lisp-xyz.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a737a996b7..3648e12db1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23760,7 +23760,7 @@ access lexicographic data from WordNet.") (define-public sbcl-nfiles (package (name "sbcl-nfiles") - (version "1.1.0") + (version "1.1.2") (source (origin (method git-fetch) @@ -23770,19 +23770,25 @@ access lexicographic data from WordNet.") (file-name (git-file-name "cl-nfiles" version)) (sha256 (base32 - "03rc990kzh7d33642r28ms4d3i1qf8nng6ph2bv9b9ykm1h4pjg6")))) + "1z6xxkr5q325zhpiyy3z03mv663jz85k844cczym4869b845rib2")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "nasdf") + #t)))) (build-system asdf-build-system/sbcl) (inputs (list gnupg sbcl-alexandria - sbcl-hu.dwim.defclass-star + sbcl-nclasses sbcl-quri sbcl-serapeum sbcl-trivial-garbage sbcl-trivial-package-local-nicknames sbcl-trivial-types)) (native-inputs - (list sbcl-lisp-unit2)) + (list sbcl-lisp-unit2 + sbcl-nasdf)) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From cb45e9d0dc6cbe6f69a858f71252411610b4ce82 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 21:49:05 +0100 Subject: gnu: webkitgtk: Update to 2.38.5 [fixes CVE-2023-23529]. * gnu/packages/webkit.scm (webkitgtk): Update to 2.38.5. --- gnu/packages/webkit.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 5dd66ecd76..0a51479985 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,7 +123,7 @@ the WPE-flavored port of WebKit.") engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.38.4") +(define %webkit-version "2.38.5") (define-public webkitgtk (package @@ -134,7 +134,7 @@ engine that uses Wayland for graphics output.") (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0dhxrj9rdkqwbr2n8grshvgfhrzhqvbf5j9xxxgg3mfll8lylisg")) + (base32 "19y1n05mp370mq4bp2bk0pm3wk49z9a10azjjdcdyx12091hrhj0")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -316,7 +316,7 @@ propagated by default) such as @code{gst-plugins-good} and (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0yx06ycmiv770nya3dss56bxqmf77cr4v0j04szb07qmxw9w26wc")))) + (base32 "0q8nmk9l6bqv2bhljm9wv7mvgdl393z7v2m7a0c5avac18yzs07z")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit 1.4.1 From 1a8a78a0c4f2bad3f33ec692464ef0b64b3af103 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 13 Feb 2023 00:23:17 +0000 Subject: gnu: cl-croatoan: Update to 0.0.1-7.42e474f. * gnu/packages/lisp-xyz.scm (sbcl-croatoan): Update to 0.0.1-7.42e474f. [arguments]{phases}(fix-paths): Use search-input-file procedure. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3648e12db1..7684ee6e48 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17213,8 +17213,8 @@ protocol for Mastodon.") (sbcl-package->cl-source-package sbcl-tooter)) (define-public sbcl-croatoan - (let ((commit "35c92fcc6c4458339c7e27bdf16f7fa908d95eb8") - (revision "6")) + (let ((commit "42e474f4dffe2f4e429905a612be5736c2c3e374") + (revision "7")) (package (name "sbcl-croatoan") (version (git-version "0.0.1" revision commit)) @@ -17226,7 +17226,7 @@ protocol for Mastodon.") (commit commit))) (file-name (git-file-name "cl-croatoan" version)) (sha256 - (base32 "0v1lrdjd29krjb6pr0mql9hjj5c2lv760xwpr17dbsw263vx29xz")))) + (base32 "12hnj8gwk2600j3kn778xvvpx3y6z0428v5dq2qbf4vbzj66vcxj")))) (build-system asdf-build-system/sbcl) (arguments '(#:phases @@ -17234,10 +17234,8 @@ protocol for Mastodon.") (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "ncurses/ncurses.lisp" - (("libncursesw" all) - (string-append (assoc-ref inputs "ncurses") - "/lib/" - all)))))))) + (("libncursesw.so") + (search-input-file inputs "/lib/libncursesw.so")))))))) (inputs (list ncurses sbcl-cffi -- cgit 1.4.1 From eb38e74c6b018710c804bb57042ae770d33cd99e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 13 Feb 2023 00:23:18 +0000 Subject: gnu: tinmop: Update to 0.9.9.141. * gnu/packages/web-browsers.scm (tinmop): Update to 0.9.9.141. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b35d29c160..ec60df0bc0 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -829,7 +829,7 @@ http, and https via third-party applications.") (define-public tinmop (package (name "tinmop") - (version "0.9.9.14") + (version "0.9.9.141") (source (origin (method git-fetch) @@ -838,7 +838,7 @@ http, and https via third-party applications.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xpqakqg4827wv92vvzwcvkqzr8d523fvnyjvnj4ac83d4w6nnls")))) + (base32 "0hx52kaq0q9iccalkxk50q1v3mf9ypardjgv56d5sdrbhfqyashl")))) (build-system gnu-build-system) (native-inputs (list autoconf -- cgit 1.4.1 From fa06b3124c5a711c65179574854d3f9f4242948b Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:50 +0100 Subject: gnu: Add ocaml-domain-name. gnu/packages/ocaml.scm (ocaml-domain-name): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0cc92c3e85..75f112f0ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Garek Dyszel +;;; Copyright © 2023 Csepp ;;; ;;; This file is part of GNU Guix. ;;; @@ -3529,6 +3530,28 @@ and command-line tool.") (license (list license:gpl3+ license:lgpl2.1+)))) +(define-public ocaml-domain-name + (package + (name "ocaml-domain-name") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hannesm/domain-name/") + (commit (string-append "v" version)))) + (file-name name) + (sha256 + (base32 + "1a669zz1pc7sqbi1c13jsnp8algcph2b8gr5fjrjhyh3p232770k")))) + (build-system dune-build-system) + (native-inputs (list ocaml-alcotest)) + (home-page "https://github.com/hannesm/domain-name") + (synopsis "RFC 1035 Internet domain name data structure and parser") + (description + "Parses and constructs RFC compliant domain names. The invariants on the +length of domain names are preserved throughout the module.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 4d4486a5c2edc0b1c85eb6e9704e8211a05eb440 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:51 +0100 Subject: gnu: Add ocaml-macaddr. * gnu/packages/ocaml.scm (ocaml-macaddr): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 75f112f0ac..7fb32ade5a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3552,6 +3552,35 @@ and command-line tool.") length of domain names are preserved throughout the module.") (license license:isc))) +(define-public ocaml-macaddr + (package + (name "ocaml-macaddr") + (version "5.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-ipaddr/") + (commit (string-append "v" version)))) + (file-name name) + (sha256 + (base32 + "1zgwx0ms3l4k4dzwnkrwq4zzqjrddjsvqn66mbd0rm6aq1ib019d")))) + (build-system dune-build-system) + (arguments '(#:package "macaddr")) + (propagated-inputs (list ocaml-cstruct ocaml-domain-name)) + (native-inputs (list ocaml-ounit2 ocaml-ppx-sexp-conv)) + (home-page "https://github.com/mirage/ocaml-ipaddr") + (synopsis "OCaml library for manipulation of MAC address representations") + (description + "Features: +@itemize +@item MAC-48 (Ethernet) address support +@item @code{Macaddr} is a @code{Map.OrderedType} +@item All types have sexplib serializers/deserializers optionally via the +@code{Macaddr_sexp} library +@end itemize") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From a0606cc03e942750ec578ae9600537b54514a582 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:52 +0100 Subject: gnu: Add ocaml-ipaddr. * gnu/packages/ocaml.scm (ocaml-ipaddr): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fb32ade5a..e3e63c26b4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3581,6 +3581,19 @@ length of domain names are preserved throughout the module.") @end itemize") (license license:isc))) +(define-public ocaml-ipaddr + ;; same repo and versions as ocaml-macaddr + (package + (inherit ocaml-macaddr) + (name "ocaml-ipaddr") + (arguments '(#:package "ipaddr")) + (propagated-inputs (list ocaml-macaddr ocaml-domain-name)) + (synopsis + "Library for manipulation of IP (and MAC) address representations") + (description + "IP address types with serialization, supporting a wide range of RFCs.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 2dbf7055a5c83adbde5d9fe0b822316bea360cf5 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:53 +0100 Subject: gnu: Add ocaml-opam-monorepo. * gnu/packages/ocaml.scm (ocaml-opam-monorepo): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3e63c26b4..d9b0d74c80 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -976,6 +976,39 @@ Git-friendly development workflow.") ;; The 'LICENSE' file waives some requirements compared to LGPLv3. (license license:lgpl3))) +(define-public ocaml-opam-monorepo + (package + (name "ocaml-opam-monorepo") + (version "0.3.5") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/tarides/opam-monorepo/") + (commit version))) + (file-name name) + (sha256 + (base32 + "09lq788b1sai4v1nxd16b00pw0m55plcwrx3f9v5a90gpxg0a6sc")))) + (build-system dune-build-system) + (arguments + ;; TODO + ;; Too many tests require a fully initialized opam, disabling them would + ;; be a huge pain. "Mocking" opam init is difficult because it requires + ;; networking access. + '(#:tests? #f)) + ;; TODO: not entirely clear if these should be native, test cross-building + (native-inputs (list ocaml-odoc + pkg-config)) + ;; (propagated-inputs lablgtk3) optional and is currently failing to build + (home-page "https://github.com/tarides/opam-monorepo") + (synopsis "Assemble and manage fully vendored Dune repositories") + (description + "The opam monorepo plugin provides a convenient interface to bridge the +opam package manager with having a local copy of all the source code required +to build a project using the dune build tool.") + (license license:isc))) + (define-public ocaml-camlp-streams (package (name "ocaml-camlp-streams") -- cgit 1.4.1 From 9ca7804aafe3a8560a492c561969e8dd39630ed5 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:54 +0100 Subject: gnu: Add ocaml-pecu. * gnu/packages/ocaml.scm (ocaml-pecu): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d9b0d74c80..17230b5023 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3627,6 +3627,27 @@ length of domain names are preserved throughout the module.") "IP address types with serialization, supporting a wide range of RFCs.") (license license:isc))) +(define-public ocaml-pecu + (package + (name "ocaml-pecu") + (version "0.6") + (source (origin + (method url-fetch) + (uri + "https://github.com/mirage/pecu/releases/download/v0.6/pecu-v0.6.tbz") + (sha256 + (base32 + "1iz5jj9lyl1pah8dfni4wv0qml0ir5zknv4zhw7v50sc8kdbglm9")))) + (build-system dune-build-system) + (native-inputs (list ocaml-fmt ocaml-alcotest ocaml-crowbar ocaml-astring)) + (home-page "https://github.com/mirage/pecu") + (synopsis "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)") + (description + "This package provides a non-blocking encoder/decoder of Quoted-Printable +according to RFC2045 and RFC2047 (about encoded-word). Useful to translate +contents of emails.") + (license license:expat))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 8b62d9403ea79ce21d7ef036c4edc3faaa2885bb Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:55 +0100 Subject: gnu: Add ocaml-emile. * gnu/packages/ocaml.scm (ocaml-emile): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 17230b5023..f6371983d3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3648,6 +3648,33 @@ according to RFC2045 and RFC2047 (about encoded-word). Useful to translate contents of emails.") (license license:expat))) +(define-public ocaml-emile + (package + (name "ocaml-emile") + (version "1.1") + (source (origin + (method url-fetch) + (uri + "https://github.com/mirage/emile/releases/download/v1.1/emile-v1.1.tbz") + (sha256 + (base32 + "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-angstrom + ocaml-ipaddr + ocaml-base64 + ocaml-pecu + ocaml-bigstringaf + ocaml-uutf)) + (native-inputs (list ocaml-alcotest)) + (home-page "https://github.com/mirage/emile") + (synopsis "Parser of email address according RFC822") + (description + "This package provides a parser of email address according RFC822, RFC2822, +RFC5321 and RFC6532. It handles UTF-8 email addresses and encoded-word +according RFC2047.") + (license license:expat))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 9770402a92585f5af15264aacf8718e7f594102c Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:56 +0100 Subject: gnu: Add ocaml-functoria-runtime * gnu/packages/ocaml.scm (ocaml-functoria-runtime): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f6371983d3..38d581682b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3675,6 +3675,39 @@ RFC5321 and RFC6532. It handles UTF-8 email addresses and encoded-word according RFC2047.") (license license:expat))) +(define-public ocaml-functoria-runtime + (package + (name "ocaml-functoria-runtime") + (version "4.3.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/mirage/mirage/") + (commit (string-append "v" version)))) + (file-name (git-file-name "mirage" version)) + (sha256 + (base32 + "09mqbffrhnklbc50gaflkwb3h1xysqqiwb84a9q1phjl038pic6r")))) + (build-system dune-build-system) + (arguments + '(#:package "functoria-runtime" + ;; TODO + ;; again, requires opam for tests, which needs network access. + ;; most other tests seem to pass. + #:tests? #f)) + (propagated-inputs + (list ocaml-cmdliner ocaml-fmt ocaml-logs ocaml-bos ocaml-ipaddr + ocaml-emile ocaml-uri)) + (native-inputs + (list ocaml-alcotest)) + (home-page "https://github.com/mirage/mirage") + (synopsis "Runtime support library for functoria-generated code") + (description + "This is the runtime support library for code generated by functoria.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 8ca17c042622220c54491ae616812bc199a2f2b9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:57 +0100 Subject: gnu: Add ocaml-mirage-runtime. * gnu/packages/ocaml.scm (ocaml-mirage-runtime): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 38d581682b..40ef5c27e2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3708,6 +3708,27 @@ according RFC2047.") "This is the runtime support library for code generated by functoria.") (license license:isc))) +(define-public ocaml-mirage-runtime + (package + (inherit ocaml-functoria-runtime) + (name "ocaml-mirage-runtime") + (build-system dune-build-system) + (arguments + '(#:package "mirage-runtime" + ;; TODO again, wants opam, other tests seem to pass + ;; look for a way to disable tests that want network access + #:tests? #f)) + (propagated-inputs (list ocaml-ipaddr ocaml-functoria-runtime ocaml-fmt + ocaml-logs ocaml-lwt)) + (native-inputs (list ocaml-alcotest)) + (home-page "https://github.com/mirage/mirage") + (synopsis + "The base MirageOS runtime library, part of every MirageOS unikernel") + (description + "This package provides a bundle of useful runtime functions for +applications built with MirageOS") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 1d7c1ae2b4fa9018315ef835da35351d34288af6 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:58 +0100 Subject: gnu: Add ocaml-functoria. * gnu/packages/ocaml.scm (ocaml-functoria): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 40ef5c27e2..8c189fab07 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3729,6 +3729,29 @@ according RFC2047.") applications built with MirageOS") (license license:isc))) +(define-public ocaml-functoria + (package + (inherit ocaml-functoria-runtime) + (name "ocaml-functoria") + (build-system dune-build-system) + (arguments + '(#:package "functoria" + ;; TODO again, wants opam, other tests seem to pass + ;; look for a way to disable tests that want network access + #:tests? #f)) + (propagated-inputs (list ocaml-cmdliner ocaml-rresult ocaml-result + ocaml-astring ocaml-fmt ocaml-logs ocaml-bos + ocaml-fpath ocaml-emile ocaml-uri)) + (native-inputs (list ocaml-alcotest ocaml-functoria-runtime)) + (home-page "https://github.com/mirage/mirage") + (synopsis + "DSL to organize functor applications") + (description + "DSL to describe a set of modules and functors, their types and +how to apply them in order to produce a complete application. The main use +case is mirage.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From c71552a5626597fd2978564b79aa27f3f5abdcaf Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 22:59:59 +0100 Subject: gnu: Add ocaml-mirage. * gnu/packages/ocaml.scm (ocaml-mirage): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c189fab07..892a247883 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3752,6 +3752,30 @@ how to apply them in order to produce a complete application. The main use case is mirage.") (license license:isc))) +(define-public ocaml-mirage + (package + (inherit ocaml-functoria-runtime) + (name "ocaml-mirage") + (build-system dune-build-system) + (arguments + '(#:package "mirage" + ;; TODO again, wants opam, other tests seem to pass + ;; look for a way to disable tests that want network access + #:tests? #f)) + (propagated-inputs + (list ocaml-astring ocaml-bos ocaml-functoria ocaml-ipaddr ocaml-logs + ocaml-mirage-runtime ocaml-opam-monorepo)) + (native-inputs (list ocaml-alcotest ocaml-fmt)) + (home-page "https://github.com/mirage/mirage") + (synopsis + "The MirageOS library operating system") + (description + "Library operating system that constructs unikernels for secure, +high-performance network applications across a variety of cloud computing and +mobile platforms. Code can be developed on a normal OS and then compiled into +a fully-standalone, specialised unikernel.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 7d15ed9c825d82ab4841de281d7854f386ee98dd Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:00 +0100 Subject: gnu: Add ocaml-duration. * gnu/packages/ocaml.scm (ocaml-duration): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 892a247883..0093ef0032 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3776,6 +3776,30 @@ mobile platforms. Code can be developed on a normal OS and then compiled into a fully-standalone, specialised unikernel.") (license license:isc))) +(define-public ocaml-duration + (package + (name "ocaml-duration") + (version "0.2.1") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hannesm/duration/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vvxi0ipxmdz1k4h501brvccniwf3wpc32djbccyyrzraiz7qkff")))) + (build-system dune-build-system) + (native-inputs (list ocaml-alcotest)) + (home-page "https://github.com/hannesm/duration") + (synopsis "Conversions to various time units") + (description + "This package provides a duration is represented in nanoseconds as an +unsigned 64 bit integer. This has a range of up to 584 years. Functions +provided check the input and raise on negative or out of bound input.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 1132921ea6a978941e27cdbbf69cd0108fa77af9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:01 +0100 Subject: gnu: Add ocaml-mirage-unix. * gnu/packages/ocaml.scm (ocaml-mirage-unix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0093ef0032..ca53dd67ee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3800,6 +3800,27 @@ unsigned 64 bit integer. This has a range of up to 584 years. Functions provided check the input and raise on negative or out of bound input.") (license license:isc))) +(define-public ocaml-mirage-unix + (package + (name "ocaml-mirage-unix") + (version "5.0.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mirage/mirage-unix/releases/download/v" + version "/mirage-unix-5.0.1.tbz")) + (sha256 + (base32 + "1y44hvsd5lxqbazwkv9n6cn936lpn8l7v82wf55w4183fp70nnjk")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-lwt ocaml-duration ocaml-mirage-runtime)) + (home-page "https://github.com/mirage/mirage-unix") + (synopsis "Unix core platform libraries for MirageOS") + (description + "This package provides the MirageOS `OS` library for Unix targets, which +handles the main loop and timers.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 14ccbf500cfac3162938b5901c7fde87cba5e39b Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:02 +0100 Subject: gnu: Add ocaml-mirage-time. * gnu/packages/ocaml.scm (ocaml-mirage-time): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ca53dd67ee..6abd38e1ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3800,6 +3800,26 @@ unsigned 64 bit integer. This has a range of up to 584 years. Functions provided check the input and raise on negative or out of bound input.") (license license:isc))) +(define-public ocaml-mirage-time + (package + (name "ocaml-mirage-time") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mirage/mirage-time/releases/download/v" + version "/mirage-time-v3.0.0.tbz")) + (sha256 + (base32 + "0z5xkhlgyhm22wyhwpf9r0rn4125cc3cxj6ccavyiiz2b2dr8h0d")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-lwt ocaml-duration)) + (home-page "https://github.com/mirage/mirage-time") + (synopsis "Time operations for MirageOS") + (description + "Defines the signature for time-related operations for MirageOS.") + (license license:isc))) + (define-public ocaml-mirage-unix (package (name "ocaml-mirage-unix") -- cgit 1.4.1 From 74560bf3c3b1f373f2d10f71042beb97680f34f9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:03 +0100 Subject: gnu: Add aliases for ocaml-cstruct and ocaml-lwt subpackages. * gnu/packages/ocaml.scm (ocaml-lwt-ppx ocaml-cstruct-unix ocaml-cstruct-sexp): New variables. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6abd38e1ad..9069b320e9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2963,6 +2963,11 @@ process. Also, in many cases, Lwt threads can interact without the need for locks or other synchronization primitives.") (license license:lgpl2.1))) +;; TODO this alias is not ideal but ocaml-lwt already explicitly specifies a +;; package argument and at least this way the importer doesn't try to +;; re-import it. +(define ocaml-lwt-ppx ocaml-lwt) + (define-public ocaml-lwt-dllist (package (name "ocaml-lwt-dllist") @@ -4451,6 +4456,12 @@ writing to these structures, and they are accessed via the Bigarray module.") "0jj3whs8r3jc524i9bb67rffh7y7r157hjgvws0bkxijxpjzwkbk")))) (properties '())))) +;; TODO again, the "parent" package already has an explicit package argument, +;; so a variant package doesn't make sense, at least these aliases help the +;; importer out so it doesn't re-import things. At least hopefully. +(define ocaml-cstruct-unix ocaml-cstruct) +(define ocaml-cstruct-sexp ocaml-cstruct) + (define-public ocaml-hex (package (name "ocaml-hex") -- cgit 1.4.1 From a9a8d626b1e6b1a055b63932be432cc8d66792c5 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:04 +0100 Subject: gnu: Add ocaml-ppx-cstruct. * gnu/packages/ocaml.scm (ocaml-ppx-cstruct): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9069b320e9..7a9e8d4f89 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4462,6 +4462,22 @@ writing to these structures, and they are accessed via the Bigarray module.") (define ocaml-cstruct-unix ocaml-cstruct) (define ocaml-cstruct-sexp ocaml-cstruct) +(define-public ocaml-ppx-cstruct + (package + (inherit ocaml-cstruct) + (name "ocaml-ppx-cstruct") + (properties `((upstream-name . "ppx_cstruct"))) + (arguments + '(#:package "ppx_cstruct" + ;; TODO doesn't find test deps for some reason? + ;; I have no clue why. + #:tests? #f)) + (propagated-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct) + (append ocaml-cstruct ocaml-ppxlib ocaml-sexplib))) + (native-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct) + (append ocaml-cstruct-sexp ocaml-findlib + ocaml-ppx-sexp-conv))))) + (define-public ocaml-hex (package (name "ocaml-hex") -- cgit 1.4.1 From 89c1bc291e2e1ef860b7cad182b2433eebd4beaa Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:05 +0100 Subject: gnu: Add ocaml-mirage-profile-unix. * gnu/packages/ocaml.scm (ocaml-mirage-profile-unix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7a9e8d4f89..e4f7b929a1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3846,6 +3846,44 @@ provided check the input and raise on negative or out of bound input.") handles the main loop and timers.") (license license:isc))) +(define-public ocaml-mirage-profile-unix + (package + (name "ocaml-mirage-profile-unix") + (version "0.9.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mirage-profile/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11p3ai8g993algds9mbg4xf3is0agqah127r69fb7rm35dryzq95")))) + (build-system dune-build-system) + (arguments + '(#:package "mirage-profile-unix" + #:tests? #f ;depends on ocaml-mirage-profile which would form a loop + #:phases (modify-phases %standard-phases + ;; TODO is there a way to do this with dune build flags? + (add-after 'unpack 'disable-xen + (lambda _ + ;; this way it is not detected as a build target + (rename-file "xen" "_xen")))))) + (propagated-inputs (list ocaml-cstruct ocaml-ocplib-endian ocaml-lwt + ocaml-mtime ocaml-ppx-cstruct)) + (native-inputs (list ocaml-ppx-cstruct)) + (home-page "https://github.com/mirage/mirage-profile") + (synopsis "Collects Ocaml/Lwt profiling information in CTF format") + (description + "Used to trace execution of OCaml/Lwt programs (such as Mirage +unikernels) at the level of Lwt threads. The traces can be viewed using +JavaScript or GTK viewers provided by mirage-trace-viewer or processed by +tools supporting the Common Trace Format. +When compiled against a normal version of Lwt, OCaml's cross-module inlining +will optimise these calls away, meaning there should be no overhead in the +non-profiling case.") + (license license:bsd-2))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From fa0c8e82608d51aadd9436e0351d2415924921bb Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:06 +0100 Subject: gnu: Add ocaml-mirage-profile. * gnu/packages/ocaml.scm (ocaml-mirage-profile): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e4f7b929a1..061654facd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3884,6 +3884,20 @@ will optimise these calls away, meaning there should be no overhead in the non-profiling case.") (license license:bsd-2))) +(define-public ocaml-mirage-profile + (package + (inherit ocaml-mirage-profile-unix) + (name "ocaml-mirage-profile") + (arguments + '(#:package "mirage-profile" + ;; TODO cyclic dependency with mirage-profile + ;; It could be broken using package variants, if not for + ;; propagated inputs leading to version conflicts. + #:tests? #f)) + (propagated-inputs (modify-inputs (package-propagated-inputs + ocaml-mirage-profile-unix) + (append ocaml-mirage-profile-unix))))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From 0d4ff1c2ad9b1451e38ede6f647eae492125cc08 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:07 +0100 Subject: gnu: Add ocaml-mirage-clock. * gnu/packages/ocaml.scm (ocaml-mirage-clock): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 061654facd..3c77cbfa9b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3825,6 +3825,30 @@ provided check the input and raise on negative or out of bound input.") "Defines the signature for time-related operations for MirageOS.") (license license:isc))) +(define-public ocaml-mirage-clock + (package + (name "ocaml-mirage-clock") + (version "4.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mirage-clock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rkara9i3dvnzrb8jl2vkx8hgamvxnksin67wmhbv9d4i758amjy")))) + (build-system dune-build-system) + (home-page "https://github.com/mirage/mirage-clock") + (synopsis "Libraries and module types for portable clocks") + (description + "This library implements portable support for an operating system +timesource that is compatible with the MirageOS library interfaces. It +implements an @code{MCLOCK} module that represents a monotonic timesource +since an arbitrary point, and @code{PCLOCK} which counts time since the Unix +epoch.") + (license license:isc))) + (define-public ocaml-mirage-unix (package (name "ocaml-mirage-unix") -- cgit 1.4.1 From 2af65d1b5d6ea9ca0f536f82a131c52ce90f2eb4 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:08 +0100 Subject: gnu: Add ocaml-ptime. * gnu/packages/ocaml.scm (ocaml-ptime): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3c77cbfa9b..1f41af848a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3849,6 +3849,36 @@ since an arbitrary point, and @code{PCLOCK} which counts time since the Unix epoch.") (license license:isc))) +(define-public ocaml-ptime + (package + (name "ocaml-ptime") + ;; TODO 1.1.0 has some issues, so for now we are stuck with 0.8.5 + (version "0.8.5") + (source (origin + (method url-fetch) + (uri + "https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz") + (sha256 + (base32 + "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27")))) + (build-system ocaml-build-system) + (arguments + `(#:build-flags (list "build" "--with-js_of_ocaml" "true" "--tests" + "true") + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (propagated-inputs (list ocaml-result js-of-ocaml)) + (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam)) + (home-page "https://erratique.ch/software/ptime") + (synopsis "POSIX time for OCaml") + (description + "Ptime offers platform independent POSIX time support in pure OCaml. It +provides a type to represent a well-defined range of POSIX timestamps with +picosecond precision, conversion with date-time values, conversion with RFC +3339 timestamps and pretty printing to a human-readable, locale-independent +representation.") + (license license:isc))) + (define-public ocaml-mirage-unix (package (name "ocaml-mirage-unix") -- cgit 1.4.1 From 34958ee1b6cc4a829320c286a3c85d978b69d466 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:09 +0100 Subject: gnu: Add ocaml-mirage-logs. * gnu/packages/ocaml.scm (ocaml-mirage-logs): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1f41af848a..83954cfd86 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3952,6 +3952,34 @@ non-profiling case.") ocaml-mirage-profile-unix) (append ocaml-mirage-profile-unix))))) +(define-public ocaml-mirage-logs + (package + (name "ocaml-mirage-logs") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mirage-logs/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wv2hz1dj38jzc8nabin9p8im43ghy8f3crv7rf9szyyzyrdanp2")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-logs ocaml-ptime ocaml-mirage-clock + ocaml-mirage-profile ocaml-lwt)) + (native-inputs (list ocaml-alcotest)) + (home-page "https://github.com/mirage/mirage-logs") + (synopsis + "Reporter for the Logs library that writes to stderr with timestamps") + (description + "Uses a Mirage @code{CLOCK} to write timestamped log messages. It can +also log only important messages to the console, while writing all received +messages to a ring buffer which is displayed if an exception occurs. If +tracing is enabled (via mirage-profile), it also writes each log message to +the trace buffer.") + (license license:isc))) + (define-public ocaml-ocurl (package (name "ocaml-ocurl") -- cgit 1.4.1 From bd15c8fc3a4f0d3601f229d686ac8d75068b2725 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:10 +0100 Subject: gnu: Add ocaml-sexp-pretty. * gnu/packages/ocaml.scm (ocaml-sexp-pretty): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 83954cfd86..82cada5a46 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6148,6 +6148,29 @@ functionality for parsing and pretty-printing s-expressions.") "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) (properties '())))) +(define-public ocaml-sexp-pretty + (package + (name "ocaml-sexp-pretty") + (version "0.15.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/sexp_pretty") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08z9jpvgag5f029ns0a06lcdymg00vwi232xsy1rdv82zvc0x4ah")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base ocaml-ppx-base ocaml-sexplib ocaml-re)) + (properties `((upstream-name . "sexp_pretty"))) + (home-page "https://github.com/janestreet/sexp_pretty") + (synopsis "S-expression pretty-printer") + (description + "Library for pretty-printing s-expressions, using better indentation +rules than the default pretty printer in Sexplib.") + (license license:expat))) + (define-public ocaml-base (package (name "ocaml-base") -- cgit 1.4.1 From f52c3fb9ee7169df2f9c2c819cf2c70c2149f865 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:11 +0100 Subject: gnu: Add ocaml-expect-test-helpers-core. * gnu/packages/ocaml.scm (ocaml-expect-test-helpers-core): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 82cada5a46..9cd2256d09 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2636,6 +2636,34 @@ simple (yet expressive) query language to select the tests to run.") `(#:package "alcotest")) (properties '())))) +(define-public ocaml-expect-test-helpers-core + (package + (name "ocaml-expect-test-helpers-core") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/janestreet/expect_test_helpers_core") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bxs3g0zzym8agfcbpg5lmrh6hcb86z861bq40xhhfwqf4pzdbfa")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base + ocaml-base-quickcheck + ocaml-core + ocaml-ppx-jane + ocaml-sexp-pretty + ocaml-stdio + ocaml-re)) + (properties `((upstream-name . "expect_test_helpers_core"))) + (home-page "https://github.com/janestreet/expect_test_helpers_core") + (synopsis "Helpers for writing expectation tests") + (description "Helper functions for writing expect tests.") + (license license:expat))) + (define-public ocaml-ppx-tools (package (name "ocaml-ppx-tools") -- cgit 1.4.1 From 3831cdad63d8b93f7b1e904811e0adce6d55bd63 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:12 +0100 Subject: gnu: Add ocaml-intrinsics. * gnu/packages/ocaml.scm (ocaml-intrinsics): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9cd2256d09..d4240162e8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -9219,6 +9219,35 @@ between Bigstrings and other string-like types. @code{bigstringaf} provides these missing pieces.") (license license:bsd-3))) +(define-public ocaml-intrinsics + (package + (name "ocaml-intrinsics") + (version "0.15.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ocaml_intrinsics") + (commit (string-append "v" version)))) + (file-name name) + (sha256 + (base32 + "1mazr1ka2zlm2s8bw5i555cnhi1bmr9yxvpn29d3v4m8lsnfm73z")))) + (build-system dune-build-system) + ;; TODO figure out how to get around this error: + ;; No rule found for alias test/runtime-deps-of-tests + (arguments + '(#:tests? #f)) + (propagated-inputs (list dune-configurator)) + (native-inputs (list ocaml-expect-test-helpers-core ocaml-core)) + (properties `((upstream-name . "ocaml_intrinsics"))) + (home-page "https://github.com/janestreet/ocaml_intrinsics") + (synopsis "AMD64 intrinsics with emulated fallbacks") + (description + "Provides an OCaml interface to operations that have dedicated hardware +instructions on some micro-architectures, with default implementations using C +stubs for all targets.") + (license license:expat))) + (define-public ocaml-trie (package (name "ocaml-trie") -- cgit 1.4.1 From 5f0d2ed20b31d58a53e907ff54342d0c72ef4198 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:13 +0100 Subject: gnu: Add ocaml-core-unix. * gnu/packages/ocaml.scm (ocaml-core-unix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d4240162e8..521a98e583 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8357,6 +8357,38 @@ the full Core is not available, such as in Javascript.") ;; MLton and sjs license:expat))))) +(define-public ocaml-core-unix + (package + (name "ocaml-core-unix") + (version "0.15.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_unix") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h6lqaxpp4r06a63k8yr0g9y7wc8r35v2xzqgvkiiq1ypa48zzgm")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core + ocaml-core-kernel + ocaml-expect-test-helpers-core + ocaml-jane-street-headers + ocaml-jst-config + ocaml-intrinsics + ocaml-ppx-jane + ocaml-sexplib + ocaml-timezone + ocaml-spawn)) + (properties `((upstream-name . "core_unix"))) + (home-page "https://github.com/janestreet/core_unix") + (synopsis "Unix-specific portions of Core") + (description + "Unix-specific extensions to some of the modules defined in core and +core_kernel.") + (license license:expat))) + (define-public ocaml-timezone (package (name "ocaml-timezone") -- cgit 1.4.1 From 419023489e9ba39cf115fcdfbdbc109633bf09c9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:14 +0100 Subject: gnu: Add ocaml-async-kernel. * gnu/packages/ocaml.scm (ocaml-async-kernel): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 521a98e583..304c900af5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8389,6 +8389,30 @@ the full Core is not available, such as in Javascript.") core_kernel.") (license license:expat))) +(define-public ocaml-async-kernel + (package + (name "ocaml-async-kernel") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/async_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01if6c8l2h64v7sk56xr8acnmj6g9whxcjrzzzvczspq88hq2bfh")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core ocaml-core-kernel ocaml-ppx-jane)) + (properties `((upstream-name . "async_kernel"))) + (home-page "https://github.com/janestreet/async_kernel") + (synopsis "Monadic concurrency library") + (description + "Contains @code{Async}'s core data structures, like +@code{Deferred}. @code{Async_kernel} is portable, and so can be used in +JavaScript using @code{Async_js}.") + (license license:expat))) + (define-public ocaml-timezone (package (name "ocaml-timezone") -- cgit 1.4.1 From 3f84fbd2f17b3907f35492ab93765c8ad2760801 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:15 +0100 Subject: gnu: Add ocaml-async-unix. * gnu/packages/ocaml.scm (ocaml-async-unix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 304c900af5..4333782f86 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8413,6 +8413,32 @@ core_kernel.") JavaScript using @code{Async_js}.") (license license:expat))) +(define-public ocaml-async-unix + (package + (name "ocaml-async-unix") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/async_unix") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z4fgpn93iw0abd7l9kac28qgzgc5qr2x0s1n2zh49lsdn02n6ys")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-async-kernel ocaml-core ocaml-core-kernel + ocaml-core-unix ocaml-ppx-jane)) + (properties `((upstream-name . "async_unix"))) + (home-page "https://github.com/janestreet/async_unix") + (synopsis "Monadic concurrency library") + (description + "Unix-related dependencies for things like system calls and +threads. Using these, it hooks the Async_kernel scheduler up to either epoll +or select, depending on availability, and manages a thread pool that blocking +system calls run in.") + (license license:expat))) + (define-public ocaml-timezone (package (name "ocaml-timezone") -- cgit 1.4.1 From c91f8f9b7b2160e514d985faf94aeceac8feb25f Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:16 +0100 Subject: gnu: Add ocaml-textutils-kernel. * gnu/packages/ocaml.scm (ocaml-textutils-kernel): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4333782f86..890fdfda9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8439,6 +8439,29 @@ or select, depending on availability, and manages a thread pool that blocking system calls run in.") (license license:expat))) +(define-public ocaml-textutils-kernel + (package + (name "ocaml-textutils-kernel") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/textutils_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "068g11d98wsb5a6ds0p5xybdmx5nx9bxa0k11dmh3l57kn4c169x")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core ocaml-ppx-jane ocaml-uutf)) + (properties `((upstream-name . "textutils_kernel"))) + (home-page "https://github.com/janestreet/textutils_kernel") + (synopsis "Text output utilities") + (description + "The subset of textutils using only core_kernel and working in +javascript.") + (license license:expat))) + (define-public ocaml-timezone (package (name "ocaml-timezone") -- cgit 1.4.1 From 47bc3fc7436d7e84e7f983b8519cf98351a2ca19 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:17 +0100 Subject: gnu: Add ocaml-textutils. * gnu/packages/ocaml.scm (ocaml-textutils): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 890fdfda9c..68ecdcc736 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8462,6 +8462,32 @@ system calls run in.") javascript.") (license license:expat))) +(define-public ocaml-textutils + (package + (name "ocaml-textutils") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/textutils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wass49h645wql9b7nck2iqlkf4648dkxvlvxixr7z80zcnb5rxr")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core + ocaml-core-kernel + ocaml-core-unix + ocaml-ppx-jane + ocaml-textutils-kernel + ocaml-uutf)) + (home-page "https://github.com/janestreet/textutils") + (synopsis "Text output utilities") + (description + "Utilities for working with terminal output, such as color printing.") + (license license:expat))) + (define-public ocaml-timezone (package (name "ocaml-timezone") -- cgit 1.4.1 From 7fbe38d7bf90dacc90ec514ddb3a0274fa880d40 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:18 +0100 Subject: gnu: Add ocaml-protocol-version-header. * gnu/packages/ocaml.scm (ocaml-protocol-version-header): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 68ecdcc736..10655923d0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6865,6 +6865,32 @@ storage of large amounts of data.") license:asl2.0 license:bsd-3))))) +(define-public ocaml-protocol-version-header + (package + (name "ocaml-protocol-version-header") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/janestreet/protocol_version_header") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s638cwf1357gg754rc4306654hhrhzqaqm2lp3yv5vj3ml8p4qy")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core ocaml-ppx-jane)) + (properties `((upstream-name . "protocol_version_header"))) + (home-page "https://github.com/janestreet/protocol_version_header") + (synopsis "Protocol versioning") + (description + "This library offers a lightweight way for applications protocols to +version themselves. The more protocols that add themselves to +@code{Known_protocol}, the nicer error messages we will get when connecting to +a service while using the wrong protocol.") + (license license:expat))) + (define-public ocaml-octavius (package (name "ocaml-octavius") -- cgit 1.4.1 From 3e15ad0329a9036d34dd147414f430be5d7db6ab Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:19 +0100 Subject: gnu: Add ocaml-async-rpc-kernel. * gnu/packages/ocaml.scm (ocaml-async-rpc-kernel): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 10655923d0..87a62805fd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8465,6 +8465,31 @@ or select, depending on availability, and manages a thread pool that blocking system calls run in.") (license license:expat))) +(define-public ocaml-async-rpc-kernel + (package + (name "ocaml-async-rpc-kernel") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/async_rpc_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1b5rp5yam03ir4f1sixpzjg1zdqmkb7lvnaa82kac4fzk80gfrfr")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-async-kernel ocaml-core ocaml-ppx-jane + ocaml-protocol-version-header)) + (properties `((upstream-name . "async_rpc_kernel"))) + (home-page "https://github.com/janestreet/async_rpc_kernel") + (synopsis "Platform-independent core of Async RPC library") + (description + "Library for building RPC-style protocols. This library is the portable +part of the Unix-oriented Async_rpc library, and is actively used in +JavaScript.") + (license license:expat))) + (define-public ocaml-textutils-kernel (package (name "ocaml-textutils-kernel") -- cgit 1.4.1 From 5bb2dc0ca2a4e4bdad674f30cfd68c2c436f488a Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:20 +0100 Subject: gnu: Add ocaml-async. * gnu/packages/ocaml.scm (ocaml-async): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 87a62805fd..df9ad35006 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8490,6 +8490,41 @@ part of the Unix-oriented Async_rpc library, and is actively used in JavaScript.") (license license:expat))) +(define-public ocaml-async + (package + (name "ocaml-async") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/async") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pykmnsil754jsnr8gss91ykyjvivngx4ii0ih3nsg1x2jl9xmy2")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-async-kernel + ocaml-async-rpc-kernel + ocaml-async-unix + ocaml-core + ocaml-core-kernel + ocaml-core-unix + ocaml-ppx-jane + ocaml-ppx-log + ocaml-textutils)) + ;; TODO one test dependency is deprecated, the other is nowhere to be found + (arguments + '(#:tests? #f)) + ;; (native-inputs (list ocaml-netkit-sockets ocaml-qtest-deprecated)) + (home-page "https://github.com/janestreet/async") + (synopsis "Asynchronous execution library") + (description + "Library for asynchronous programming, i.e., programming where some part +of the program must wait for things that happen at times determined by some +external entity (like a human or another program).") + (license license:expat))) + (define-public ocaml-textutils-kernel (package (name "ocaml-textutils-kernel") -- cgit 1.4.1 From 1e324abac03770623fbaafa1bfd1fccf51b0cb4e Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:21 +0100 Subject: gnu: Add ocaml-shared-memory-ring. * gnu/packages/ocaml.scm (ocaml-shared-memory-ring): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index df9ad35006..7aea1776fd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3017,6 +3017,34 @@ locks or other synchronization primitives.") doubly-linked list with Lwt iterators.") (license license:expat))) + +(define-public ocaml-shared-memory-ring + (package + (name "ocaml-shared-memory-ring") + (version "3.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/shared-memory-ring") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12cpbia39aifnd8rxpsra0lhssqj5qw0zygb5fd8kg58zy2clmrr")))) + (build-system dune-build-system) + (arguments + '(#:package "shared-memory-ring")) + (propagated-inputs (list ocaml-cstruct ocaml-ppx-cstruct ocaml-lwt-dllist + ocaml-mirage-profile)) + (native-inputs (list ocaml-ounit)) + (home-page "https://github.com/mirage/shared-memory-ring") + (synopsis "Xen-style shared memory rings") + (description + "Libraries for creating shared memory producer/consumer rings. The rings +follow the Xen ABI and may be used to create or implement Xen virtual +devices.") + (license license:isc))) + (define-public ocaml-luv (package (name "ocaml-luv") -- cgit 1.4.1 From 3b2ca07ed616527f5a6faf2db0845d5f94385cf6 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:22 +0100 Subject: gnu: Add ocaml-shared-memory-ring-lwt. * gnu/packages/ocaml.scm (ocaml-shared-memory-ring-lwt): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7aea1776fd..3492db3778 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3045,6 +3045,16 @@ follow the Xen ABI and may be used to create or implement Xen virtual devices.") (license license:isc))) +(define-public ocaml-shared-memory-ring-lwt + (package + (inherit ocaml-shared-memory-ring) + (name "ocaml-shared-memory-ring-lwt") + (arguments + '(#:package "shared-memory-ring-lwt")) + (propagated-inputs (modify-inputs (package-propagated-inputs + ocaml-shared-memory-ring) + (append ocaml-shared-memory-ring))))) + (define-public ocaml-luv (package (name "ocaml-luv") -- cgit 1.4.1 From 9c6809a6c41a5a3dd20f03d84b51ae13dbf08fe0 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:23 +0100 Subject: gnu: Add ocaml-xenstore. * gnu/packages/ocaml.scm (ocaml-xenstore): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3492db3778..8ea2827ae2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3055,6 +3055,35 @@ devices.") ocaml-shared-memory-ring) (append ocaml-shared-memory-ring))))) +(define-public ocaml-xenstore + (package + (name "ocaml-xenstore") + (version "2.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/ocaml-xenstore") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1acld5gxmvnhl5iyyy5ancpm7fv9d6ns1x32krcmb62p2czd00ky")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-cstruct ocaml-ppx-cstruct ocaml-lwt)) + (native-inputs (list ocaml-ounit2)) + (home-page "https://github.com/mirage/ocaml-xenstore") + (synopsis "Xenstore protocol in pure OCaml") + (description "Repository contents: +@itemize +@item client library, a merge of the Mirage and XCP ones +@item server library +@item server instance which runs under Unix with libxc +@item server instance which runs on mirage. +@end itemize +The client and the server libraries have sets of unit-tests.") + ;; Has a linking exception, see LICENSE.md. + (license license:lgpl2.1))) + (define-public ocaml-luv (package (name "ocaml-luv") -- cgit 1.4.1 From 1276f9da9a2bce286da6cdda5d1e4d3d1870b3c3 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:24 +0100 Subject: gnu: Add ocaml-io-page. * gnu/packages/ocaml.scm (ocaml-io-page): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ea2827ae2..5b915a532a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3084,6 +3084,29 @@ The client and the server libraries have sets of unit-tests.") ;; Has a linking exception, see LICENSE.md. (license license:lgpl2.1))) +(define-public ocaml-io-page + (package + (name "ocaml-io-page") + (version "3.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/io-page") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lmvm1whdw5s7rvi7jnjzicrp2j919dkjl856jwyjlq38f7qn0zm")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-cstruct)) + (native-inputs (list pkg-config ocaml-ounit)) + (home-page "https://github.com/mirage/io-page") + (synopsis "Support for efficient handling of I/O memory pages") + (description + "IO pages are page-aligned, and wrapped in the @code{Cstruct} library to +avoid copying the data contained within the page.") + (license license:isc))) + (define-public ocaml-luv (package (name "ocaml-luv") -- cgit 1.4.1 From 991a289a023c1f466564c5a878f98d7f3ae6a8b9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:25 +0100 Subject: gnu: Add ocaml-bheap. * gnu/packages/ocaml.scm (ocaml-bheap): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5b915a532a..a1f691c655 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3107,6 +3107,28 @@ The client and the server libraries have sets of unit-tests.") avoid copying the data contained within the page.") (license license:isc))) +(define-public ocaml-bheap + (package + (name "ocaml-bheap") + (version "2.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/backtracking/bheap") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b8md5zl4yz7j62jz0bf7lwyl0pyqkxqx36ghkgkbkxb4zzggfj1")))) + (build-system dune-build-system) + (native-inputs (list ocaml-stdlib-shims)) + (home-page "https://github.com/backtracking/bheap") + (synopsis "Priority queues") + (description + "Traditional implementation of priority queues using a binary heap +encoded in a resizable array.") + (license license:lgpl2.1))) + (define-public ocaml-luv (package (name "ocaml-luv") -- cgit 1.4.1 From 9658d29ab875e4c0ab60ba8399b5d237e5a2ff9f Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:26 +0100 Subject: gnu: Add ocaml-mirage-xen. * gnu/packages/ocaml.scm (ocaml-mirage-xen): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a1f691c655..2219ec72c0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3084,6 +3084,40 @@ The client and the server libraries have sets of unit-tests.") ;; Has a linking exception, see LICENSE.md. (license license:lgpl2.1))) +(define-public ocaml-mirage-xen + (package + (name "ocaml-mirage-xen") + (version "8.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mirage-xen") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qydg92dbw8hj4b809apj0f51cjgmamq3zdf34a4wyn5jv85yzyx")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-cstruct + ocaml-lwt + ocaml-shared-memory-ring-lwt + ocaml-xenstore + ocaml-lwt-dllist + ;; ocaml-mirage-profile dependency cycle + ocaml-io-page + ocaml-mirage-runtime + ocaml-logs + ocaml-fmt + ocaml-bheap + ocaml-duration)) + (home-page "https://github.com/mirage/mirage-xen") + (synopsis "Xen core platform libraries for MirageOS") + (description + "MirageOS OS library for Xen targets, which handles the main +loop and timers. It also provides the low level C startup code and C stubs +required by the OCaml code.") + (license license:isc))) + (define-public ocaml-io-page (package (name "ocaml-io-page") -- cgit 1.4.1 From 34589fe587f70a8e37dacc3d077d17a9a5f0bfb9 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:27 +0100 Subject: gnu: Add ocaml-parse-argv. * gnu/packages/ocaml.scm (ocaml-parse-argv): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2219ec72c0..79e71ebba1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3854,6 +3854,27 @@ RFC5321 and RFC6532. It handles UTF-8 email addresses and encoded-word according RFC2047.") (license license:expat))) +(define-public ocaml-parse-argv + (package + (name "ocaml-parse-argv") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/parse-argv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16n18zik6vkfnhv8jaigr90fwp1ykg23p61aqchym0jil4i4yq01")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-astring)) + (native-inputs (list ocaml-ounit)) + (home-page "https://github.com/mirage/parse-argv") + (synopsis "Process strings into sets of command-line arguments") + (description "Small implementation of a simple argv parser.") + (license license:isc))) + (define-public ocaml-functoria-runtime (package (name "ocaml-functoria-runtime") -- cgit 1.4.1 From 48724a66422e02995e62e2f707dcd9087d43bee5 Mon Sep 17 00:00:00 2001 From: raingloom Date: Wed, 15 Feb 2023 23:00:28 +0100 Subject: gnu: Add ocaml-mirage-bootvar-unix. * gnu/packages/ocaml.scm (ocaml-mirage-bootvar-unix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 79e71ebba1..dae050af50 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3976,6 +3976,26 @@ mobile platforms. Code can be developed on a normal OS and then compiled into a fully-standalone, specialised unikernel.") (license license:isc))) +(define-public ocaml-mirage-bootvar-unix + (package + (name "ocaml-mirage-bootvar-unix") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/mirage-bootvar-unix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vi13q0z5ffv5hf4q5lfvkia6j2s5520px0s2x4dbjgd52icizrz")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-lwt ocaml-parse-argv)) + (home-page "https://github.com/mirage/mirage-bootvar-unix") + (synopsis "Unix implementation of MirageOS Bootvar interface") + (description "Library for passing boot parameters from Solo5 to MirageOS.") + (license license:isc))) + (define-public ocaml-duration (package (name "ocaml-duration") -- cgit 1.4.1 From 95f481b33167cd231fda080c76eb980550fd1eae Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 6 Jan 2023 23:48:21 +0100 Subject: gnu: p11-kit-next: Switch to meson-build-system. README.md says to use meson to build. * gnu/packages/tls.scm (p11-kit-next)[build-system]: Use meson-build-system. [arguments]: Adjust accordingly. Signed-off-by: Christopher Baines --- gnu/packages/tls.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9eaa859a57..59e0e28feb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -51,6 +51,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system trivial) + #:use-module (guix build-system meson) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages compression) #:use-module (gnu packages) @@ -207,12 +208,16 @@ living in the same process.") "download/" version "/p11-kit-" version ".tar.xz")) (sha256 (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) + (build-system meson-build-system) (arguments ;; Use the default certificates so that users such as flatpak find them. ;; See . (substitute-keyword-arguments (package-arguments p11-kit) ((#:configure-flags flags ''()) - ''("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt")))))) + ''("-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt")) + ;; p11-kit is still on gnu-build-system. + ((#:phases gnu-phases) + '%standard-phases))))) (define-public gnutls (package -- cgit 1.4.1 From 395c4aa880c2b666d10abe2ceeda6abf3fe15390 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 8 Jan 2023 19:11:07 -0600 Subject: gnu: Add go-gopkg-in-irc-v3. * gnu/packages/irc.scm (go-gopkg-in-irc-v3): New variable. Co-authored-by: ( Signed-off-by: Christopher Baines --- gnu/packages/irc.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index b102619b2d..1b2af63383 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -39,6 +39,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system qt) @@ -62,10 +63,12 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages lua) #:use-module (gnu packages lxqt) + #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) #:use-module (gnu packages kde) @@ -584,6 +587,34 @@ interface for those who are accustomed to the ircII way of doing things.") ;; distribute binaries. (license:non-copyleft "http://epicsol.org/copyright"))))) +(define-public go-gopkg-in-irc-v3 + (package + (name "go-gopkg-in-irc-v3") + (version "3.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gopkg.in/irc.v3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f2vv947yf9ygy8ylwqkd9yshybfdsbsp9pffjyvm7l7rnq5da60")))) + (build-system go-build-system) + (arguments + '(;; TODO 3 tests fail because of missing files + ;; https://paste.sr.ht/~whereiseveryone/784d068887a65c1b869caa7d7c2077d28a2b2187 + #:tests? #f + #:import-path "gopkg.in/irc.v3" #:unpack-path "gopkg.in/irc.v3")) + (propagated-inputs + `(("go-gopkg-in-yaml-v2" ,go-gopkg-in-yaml-v2) + ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://gopkg.in/irc.v3") + (synopsis "Low-level IRC library for Go") + (description "Package irc provides a simple IRC library meant as a +building block for other projects.") + (license license:expat))) + (define-public litterbox (package (name "litterbox") -- cgit 1.4.1 From a558998f7dabb2c0672abe3aaac89fb9b652cbb1 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 8 Jan 2023 19:11:08 -0600 Subject: gnu: Add chathistorysync. * gnu/packages/irc.scm (chathistorysync): New variable. Co-authored-by: ( Signed-off-by: Christopher Baines --- gnu/packages/irc.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 1b2af63383..4bce2d2d47 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -615,6 +615,51 @@ interface for those who are accustomed to the ircII way of doing things.") building block for other projects.") (license license:expat))) +(define-public chathistorysync + (package + (name "chathistorysync") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/chathistorysync") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03dxr178wnicggx0k95wvyzgyk4s4g0adbi2z0md517a5qd1lh23")))) + (build-system go-build-system) + (arguments + (list #:import-path "git.sr.ht/~emersion/chathistorysync" + #:install-source? #f ; chathistorysync is an end-user application. + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'doc + (lambda _ + (with-directory-excursion + "src/git.sr.ht/~emersion/chathistorysync" + (invoke "sh" "-c" + "scdoc chathistorysync.1")))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-directory-excursion + "src/git.sr.ht/~emersion/chathistorysync" + (install-file + "chathistorysync.1" + (string-append out "/share/man/man1"))))))))) + (inputs + (list go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-crypto + go-gopkg-in-irc-v3)) + (native-inputs (list scdoc)) + (home-page "https://git.sr.ht/~emersion/chathistorysync") + (synopsis "Synchronization tool for IRC chat history") + (description + "This package provides a synchronization tool for IRC chat history.") + (license license:agpl3))) + (define-public litterbox (package (name "litterbox") -- cgit 1.4.1 From fc36ea0a0a40c618ee3488d8432ebb6d27b56fa3 Mon Sep 17 00:00:00 2001 From: Steve George Date: Wed, 11 Jan 2023 22:39:29 +0000 Subject: gnu: Add python-virtualenv-clone. * gnu/packages/python-xyz.scm (python-virtualenv-clone): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac09edcc98..cfeb37eea1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4277,6 +4277,40 @@ modules. It creates a special virtual environment such that @command{pip} or work on your part.") (license license:expat))) +(define-public python-virtualenv-clone + (package + (name "python-virtualenv-clone") + (version "0.5.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edwardgeorge/virtualenv-clone") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p0d1y3axvjfnxlgwjx2374gikc8bmc82g0m7yashihbikh7pcxa")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (delete-file "tox.ini") + (invoke "pytest" "-vvv" "tests"))))))) + (native-inputs (list python-pytest + python-tox + python-virtualenv + python-coverage + python-wheel + python-tomli + python-hypothesis)) + (home-page "https://github.com/edwardgeorge/virtualenv-clone") + (synopsis "Clone a non-relocatable virtualenv cleanly") + (description + "Clone non-relocatable virtualenvs without breaking site-packages.") + (license license:expat))) + (define-public python-uc-micro-py (package (name "python-uc-micro-py") -- cgit 1.4.1 From 46013fccb701ebd6d55a9be3374e4fbbf877e3a2 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 14 Jan 2023 19:26:00 +0100 Subject: gnu: Add docker-registry. * gnu/packages/docker.scm (docker-registry): New variable. Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Christopher Baines --- gnu/packages/docker.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7d109dc94c..44e9ddd2e8 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -724,3 +724,85 @@ containers. It manages a single child process and ensures that any zombie processes produced from it are reaped and that signals are properly forwarded. Tini is integrated with Docker.") (license license:expat))) + +(define-public docker-registry + (package + (name "docker-registry") + (version "2.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/distribution") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w8zr97p2c62gm1lrdwqa704ivjsy25ylznrddbbpv63idwdbi9k")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/docker/distribution" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-src + (lambda _ (chdir "src/github.com/docker/distribution"))) + (add-after 'chdir-to-src 'fix-versioning + (lambda _ + ;; The Makefile use git to compute the version and the + ;; revision. This requires the .git directory that we don't have + ;; anymore in the unpacked source. + (substitute* "Makefile" + (("^VERSION=\\$\\(.*\\)") + (string-append "VERSION=v" #$version)) + ;; The revision originally used the git hash with .m appended + ;; if there was any local modifications. + (("^REVISION=\\$\\(.*\\)") "REVISION=0")))) + (replace 'build + (lambda _ + (invoke "make" "binaries"))) + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (for-each + (lambda (file) + (install-file (string-append "bin/" file) bin)) + '("digest" + "registry" + "registry-api-descriptor-template"))) + (let ((doc (string-append + #$output "/share/doc/" #$name "-" #$version))) + (mkdir-p doc) + (for-each + (lambda (file) + (install-file file doc)) + '("BUILDING.md" + "CONTRIBUTING.md" + "LICENSE" + "MAINTAINERS" + "README.md" + "ROADMAP.md")) + (copy-recursively "docs/" (string-append doc "/docs"))) + (let ((examples + (string-append + #$output "/share/doc/" #$name "-" #$version + "/registry-example-configs"))) + (mkdir-p examples) + (for-each + (lambda (file) + (install-file (string-append "cmd/registry/" file) examples)) + '("config-cache.yml" + "config-example.yml" + "config-dev.yml"))))) + (delete 'install-license-files)))) + (home-page "https://github.com/docker/distribution") + (synopsis "Docker registry server and associated tools") + (description "The Docker registry server enable you to host your own +docker registry. With it, there is also two other utilities: +@itemize +@item The digest utility is a tool that generates checksums compatibles with +various docker manifest files. +@item The registry-api-descriptor-template is a tool for generating API +specifications from the docs/spec/api.md.tmpl file. +@end itemize") + (license license:asl2.0))) -- cgit 1.4.1 From c3dd743b9a7bc9bb72718957680dfe9a618cb138 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Sat, 14 Jan 2023 01:50:12 -0600 Subject: gnu: Add clipman. * gnu/packages/xdisorg.scm (clipman): New variable. Signed-off-by: Christopher Baines --- gnu/packages/xdisorg.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2ebeb4e013..a92456f9e4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -77,6 +77,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system go) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) @@ -107,6 +108,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -128,6 +130,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages syncthing) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages xml) @@ -2922,6 +2925,48 @@ depending on the value of @code{CM_LAUNCHER}) to let the user select a clip. After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.") (license license:public-domain)))) +(define-public clipman + (package + (name "clipman") + (version "1.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/yory8/" name "/")) + (commit (string-append "v" version)))) + (sha256 (base32 + "0b9kvj0dif4221dy6c1npknhhjxvbc4kygzhwxjirpwjws0yv6v9")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/yory8/clipman" + #:install-source? #f + #:phases #~(modify-phases %standard-phases + (add-before 'build 'patch + (lambda _ + (substitute* "src/github.com/yory8/clipman/main.go" + (("gopkg.in/alecthomas/kingpin.v2") + "github.com/alecthomas/kingpin") + (("\"wl-copy\"") + (string-append "\"" (which "wl-copy") "\""))))) + (delete 'install-license-files)))) + (native-inputs (list go-github-com-alecthomas-template + go-github-com-alecthomas-units)) + (inputs (list go-github-com-kballard-go-shellquote + go-github-com-alecthomas-kingpin + libnotify + wl-clipboard)) + (synopsis "Basic clipboard manager with support for persisting copy buffers") + (description + "A clipboard manager for Wayland that relies on an external selector, +such as @code{wofi}, @code{bemenu}, @code{dmenu}, or @code{rofi}. + +Run the binary in your session by adding @command{exec wl-paste -t text --watch +clipman store} (or @command{exec wl-paste -t text --watch clipman store 1>> +PATH/TO/LOGFILE 2>&1 &} to log errors) at the beginning of wherever you +initialize programs.") + (home-page "https://github.com/yory8/clipman") + (license license:gpl3))) + (define-public kbdd (package (name "kbdd") -- cgit 1.4.1 From 246a3d90eac82966b691bdca4660ab9c5d802631 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 04:49:58 +0100 Subject: gnu: nss-next: Update to 3.88.1 [fixes CVE-2023-0767]. * gnu/packages/nss.scm (nss-next): Update to 3.88.1 Co-spirited-by: Tobias Geerinckx-Rice --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index c1d9966fd7..c06807c808 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -246,7 +246,7 @@ security standards.") (define-public nss-next (package (inherit nss) - (version "3.83") + (version "3.88.1") (source (origin (inherit (package-source nss)) (uri (let ((version-with-underscores @@ -257,5 +257,5 @@ security standards.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0a01xwfrr334mibj1agbykjkc72ph906f2n8ff5hn2b4z5kyl8xb")))) + "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7")))) (propagated-inputs (list nspr-next)))) ;required by nss.pc -- cgit 1.4.1 From 5302cfab43ed5e1b9f41a00663564dabb35503d2 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 16:36:55 +0100 Subject: gnu: Add cl-variates. * gnu/packages/lisp-xyz.scm (cl-variates, ecl-cl-variates, sbcl-cl-variates): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7684ee6e48..00b0846a8d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2021 Cameron Chaparro ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2021, 2022 Foo Chuan Wei -;;; Copyright © 2021, 2022 jgart +;;; Copyright © 2021, 2022, 2023 jgart ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2021 Jacob MacDonald ;;; Copyright © 2022 Jai Vetrivelan @@ -26884,6 +26884,39 @@ descent parsers without funky syntax or impenetrable macrology.") (define-public ecl-smug (sbcl-package->ecl-package sbcl-smug)) +(define-public sbcl-cl-variates + (let ((commit "4e7548754d8a8731a42487fae31174db4bf36d47") + (revision "0")) + (package + (name "sbcl-cl-variates") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/cl-variates/cl-variates") + (commit commit))) + (file-name (git-file-name "cl-variates" version)) + (sha256 + (base32 "03wnvfi3yfflpvi0mr732r834msij4vrwdbgf6csh0b8kqxl47zn")))) + (build-system asdf-build-system/sbcl) + ;; USE-PACKAGE # causes name-conflicts in + ;; # between the following symbols: + ;; CL-VARIATES:RANDOM-ELEMENT, LIFT:RANDOM-ELEMENT + (arguments (list #:tests? #f)) + (native-inputs (list sbcl-lift)) + (home-page "https://gitlab.common-lisp.net/cl-variates/cl-variates") + (synopsis "Portable Common Lisp Random Number Generation") + (description "The variates package provides portable random number +generation as well as numerous distributions.") + (license license:expat)))) + +(define-public cl-variates + (sbcl-package->cl-source-package sbcl-cl-variates)) + +(define-public ecl-cl-variates + (sbcl-package->ecl-package sbcl-cl-variates)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From 7679b8e89572d469eea464b9a1ba23ca7b38fcf3 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 17:43:55 +0100 Subject: gnu: Add cl-cephes. * gnu/packages/lisp-xyz.scm (cl-cephes, ecl-cephes, sbcl-cephes): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 00b0846a8d..c768ea7832 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -26917,6 +26917,50 @@ generation as well as numerous distributions.") (define-public ecl-cl-variates (sbcl-package->ecl-package sbcl-cl-variates)) +(define-public sbcl-cephes + (let ((commit "d87146fa38c8425ffb5fe425eee5eb3e818bacd4") + (revision "0")) + (package + (name "sbcl-cephes") + (version (git-version "1.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/cephes.cl") + (commit commit))) + (file-name (git-file-name "cl-cephes" version)) + (sha256 + (base32 "09adls1lwwzwm1jmvhf11arwlsy5w0bi2rmniahas824mysv77lr")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-cffi)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; ECL has issues making the shared library automatically, + ;; so we make it explicitly. + (add-before 'build 'build-shared-library + (lambda _ + (with-directory-excursion + (string-append #$output "/share/common-lisp/" + (%lisp-type) "/cephes/scipy-cephes") + (invoke "make") + ;; Remove temporary object files. + (for-each delete-file (find-files "." "\\.o$")))))))) + (home-page "https://lisp-stat.github.io/cephes.cl/") + (synopsis "Common Lisp wrapper for the Cephes Mathematical Library") + (description + "This package provides a common lisp CFFI wrapper for the SciPy version +of Cephes special functions.") + (license license:ms-pl)))) + +(define-public cl-cephes + (sbcl-package->cl-source-package sbcl-cephes)) + +(define-public ecl-cephes + (sbcl-package->ecl-package sbcl-cephes)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From 17e46bdf66acee5191ba212ef86557f38c5b9d62 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 18:25:17 +0100 Subject: gnu: Add cl-special-functions. * gnu/packages/lisp-xyz.scm (cl-special-functions, ecl-special-functions, sbcl-special-functions): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c768ea7832..135569efd0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -26961,6 +26961,48 @@ of Cephes special functions.") (define-public ecl-cephes (sbcl-package->ecl-package sbcl-cephes)) +(define-public sbcl-special-functions + (let ((commit "f3ca2792ff3f8351839c366413da6b1bb2965a58") + (revision "0")) + (package + (name "sbcl-special-functions") + (version (git-version "1.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/special-functions") + (commit commit))) + (file-name (git-file-name "cl-special-functions" version)) + (sha256 + (base32 "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiveam + sbcl-select + sbcl-cl-variates)) + (inputs + (list sbcl-alexandria-plus + sbcl-float-features + sbcl-let-plus + sbcl-numerical-utilities)) + (home-page "https://lisp-stat.dev/docs/resources/special-functions/") + (synopsis "Special functions in Common Lisp") + (description "This library implements +@url{http://specialfunctionswiki.org/index.php/Main_Page, special +functions} and has a focus on high accuracy double-float calculations +using the latest algorithms.") + (license license:ms-pl)))) + +(define-public cl-special-functions + (sbcl-package->cl-source-package sbcl-special-functions)) + +(define-public ecl-special-functions + (package + (inherit (sbcl-package->ecl-package sbcl-special-functions)) + ;; https://github.com/Lisp-Stat/special-functions/issues/4 + (arguments (list #:tests? #f)))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From b9d22cae3a3ec0f7091035d67b37e83b2585aa9b Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 18:34:05 +0100 Subject: gnu: Add cl-distributions. * gnu/packages/lisp-xyz.scm (cl-distributions, ecl-distributions, sbcl-distributions): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 135569efd0..05a7e3cb54 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27003,6 +27003,46 @@ using the latest algorithms.") ;; https://github.com/Lisp-Stat/special-functions/issues/4 (arguments (list #:tests? #f)))) +(define-public sbcl-distributions + (let ((commit "ea72622073ee7e005dfdc621ce1e5a83b22bb39e") + (revision "0")) + (package + (name "sbcl-distributions") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/distributions") + (commit commit))) + (file-name (git-file-name "cl-distributions" version)) + (sha256 + (base32 "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk")))) + (build-system asdf-build-system/sbcl) + ;; https://github.com/Lisp-Stat/distributions/issues/1 + (arguments (list #:tests? #f)) + (native-inputs (list sbcl-fiveam)) + (inputs + (list sbcl-alexandria + sbcl-anaphora + sbcl-array-operations + sbcl-cephes + sbcl-float-features + sbcl-let-plus + sbcl-numerical-utilities + sbcl-special-functions)) + (home-page "https://lisp-stat.dev/docs/manuals/distributions/") + (synopsis "Statistical distributions for Common Lisp") + (description "The Distributions package provides a collection of +probabilistic distributions and related functions") + (license license:ms-pl)))) + +(define-public cl-distributions + (sbcl-package->cl-source-package sbcl-distributions)) + +(define-public ecl-distributions + (sbcl-package->ecl-package sbcl-distributions)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From 81de0d7af1e7a2f2f415791d608af34d296c6cc6 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 18:39:38 +0100 Subject: gnu: Add cl-statistics. * gnu/packages/lisp-xyz.scm (cl-statistics, ecl-statistics, sbcl-statistics): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 05a7e3cb54..20f044b5f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27043,6 +27043,42 @@ probabilistic distributions and related functions") (define-public ecl-distributions (sbcl-package->ecl-package sbcl-distributions)) +(define-public sbcl-statistics + (let ((commit "94fc87a2bf81355a40ce3730b4ed77710ecfabaf") + (revision "0")) + (package + (name "sbcl-statistics") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/statistics") + (commit commit))) + (file-name (git-file-name "cl-statistics" version)) + (sha256 + (base32 "0is69w6iwh4hyzc5ndgb3i2331f677sa7kw5wy8pmx6hawbkgyir")))) + (build-system asdf-build-system/sbcl) + (native-inputs (list sbcl-clunit2)) + (inputs + (list sbcl-alexandria + sbcl-anaphora + sbcl-conduit-packages + sbcl-distributions + sbcl-let-plus + sbcl-numerical-utilities)) + (home-page "https://lisp-stat.dev/docs/") + (synopsis "Statistical functions in Common Lisp") + (description "This package provides a consolidation of Common Lisp +statistics libraries.") + (license (list license:expat license:ms-pl))))) + +(define-public cl-statistics + (sbcl-package->cl-source-package sbcl-statistics)) + +(define-public ecl-statistics + (sbcl-package->ecl-package sbcl-statistics)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From 30850a3626b96e138519a8500aaa7c2262bebc84 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 18:48:15 +0100 Subject: gnu: Add cl-data-frame. * gnu/packages/lisp-xyz.scm (cl-data-frame, sbcl-data-frame): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 20f044b5f9..2a865656a8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27079,6 +27079,49 @@ statistics libraries.") (define-public ecl-statistics (sbcl-package->ecl-package sbcl-statistics)) +(define-public sbcl-data-frame + (let ((commit "6f02e58312654ddf19d686f234dcf699fc4cd0f5") + (revision "0")) + (package + (name "sbcl-data-frame") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/data-frame") + (commit commit))) + (file-name (git-file-name "cl-data-frame" version)) + (sha256 + (base32 "0bs1jh66bml25bj1lxdzz8cjhj3g060yyd5ggqsnsr4l2j0zyszv")))) + (build-system asdf-build-system/sbcl) + (native-inputs (list sbcl-clunit2)) + (inputs + (list sbcl-alexandria + sbcl-alexandria-plus + sbcl-anaphora + sbcl-array-operations + sbcl-duologue + sbcl-let-plus + sbcl-numerical-utilities + sbcl-select + sbcl-serapeum + sbcl-statistics)) + (home-page "https://lisp-stat.dev/docs/manuals/data-frame/") + (synopsis "Data frames for Common Lisp") + (description "This package provides data frames for Common Lisp, a +two-dimensional array-like structure in which each column contains values +of one variable and each row contains one set of values from each column.") + (license license:ms-pl)))) + +(define-public cl-data-frame + (sbcl-package->cl-source-package sbcl-data-frame)) + +;; The data-frame system depends on the sb-cltl2 system, which is only +;; available with SBCL. +;; (define-public ecl-data-frame +;; (sbcl-package->ecl-package sbcl-data-frame)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From e93171b26327d20766dba2d1e51b2353a6ca9c28 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 19:05:46 +0100 Subject: gnu: Add cl-dfio. * gnu/packages/lisp-xyz.scm (cl-dfio, sbcl-dfio): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2a865656a8..14f5b56da2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27122,6 +27122,45 @@ of one variable and each row contains one set of values from each column.") ;; (define-public ecl-data-frame ;; (sbcl-package->ecl-package sbcl-data-frame)) +(define-public sbcl-dfio + (let ((commit "5caf473acb9bc464839e87395724cbd941167915") + (revision "0")) + (package + (name "sbcl-dfio") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/dfio") + (commit commit))) + (file-name (git-file-name "cl-dfio" version)) + (sha256 + (base32 "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-alexandria + sbcl-anaphora + sbcl-data-frame + sbcl-dexador + sbcl-fare-csv + sbcl-let-plus + sbcl-yason)) + (native-inputs + (list sbcl-clunit2)) + (home-page "https://lisp-stat.dev/docs/manuals/data-frame/") + (synopsis "Read data to and from data frames") + (description "This package provides tools for manipulating data +in files using data frames.") + (license license:ms-pl)))) + +(define-public cl-dfio + (sbcl-package->cl-source-package sbcl-dfio)) + +;; This depends on ecl-data-frame, which doesn't work yet. +;; (define-public ecl-dfio +;; (sbcl-package->ecl-package sbcl-dfio)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From 2921394c25883a91a541c6b3ba6a75ecfe97a01f Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 17 Feb 2023 19:14:26 +0100 Subject: gnu: Add cl-lisp-stat. * gnu/packages/lisp-xyz.scm (cl-lisp-stat, sbcl-lisp-stat): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 14f5b56da2..bb5855c7b7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -27161,6 +27161,50 @@ in files using data frames.") ;; (define-public ecl-dfio ;; (sbcl-package->ecl-package sbcl-dfio)) +(define-public sbcl-lisp-stat + (let ((commit "357a0d2b5f68a5ff925776235c2b7455e12b78ba") + (revision "0")) + (package + (name "sbcl-lisp-stat") + (version (git-version "1.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lisp-Stat/lisp-stat") + (commit commit))) + (file-name (git-file-name "cl-lisp-stat" version)) + (sha256 + (base32 "0qwlxrbwj884mr67sf6aj0zwrndv33aiiid4bqrkji41kjhqfcz5")))) + (build-system asdf-build-system/sbcl) + ;; https://github.com/Lisp-Stat/lisp-stat/issues/22 + (arguments (list #:tests? #f)) + (native-inputs (list sbcl-parachute)) + (inputs + (list sbcl-alexandria + sbcl-alexandria-plus + sbcl-array-operations + sbcl-conduit-packages + sbcl-data-frame + sbcl-dexador + sbcl-dfio + sbcl-distributions + sbcl-numerical-utilities + sbcl-select + sbcl-statistics)) + (home-page "https://lisp-stat.github.io/lisp-stat/") + (synopsis "Statistical Computing in Common Lisp") + (description "This package provides a statistical computing +environment for Common Lisp.") + (license license:ms-pl)))) + +(define-public cl-lisp-stat + (sbcl-package->cl-source-package sbcl-lisp-stat)) + +;; This depends on ecl-data-frame and ecl-dfio, which don't work yet. +;; (define-public ecl-lisp-stat +;; (sbcl-package->ecl-package sbcl-lisp-stat)) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit 1.4.1 From ac2ed2e1d74b39de74af275b3743ef7a569ee3f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Feb 2023 16:39:56 -0500 Subject: gnu: dream: Remove dependency on QtWebKit. This is required for . * gnu/packages/radio.scm (dream)[inputs]: Remove qtwebkit. --- gnu/packages/radio.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index ae0da298f7..06011b03de 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2042,7 +2042,6 @@ Compatible hardware/software: pulseaudio qtbase-5 qtsvg-5 - qtwebkit qwt speexdsp zlib)) -- cgit 1.4.1 From b9ecefd1dee2f5947f24db9701b06e05f7e1ae37 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Feb 2023 16:42:22 -0500 Subject: gnu: aseba: Remove dependency on QtWebKit. This is required for . * gnu/packages/robotics.scm (aseba)[inputs]: Remove qtwebkit. --- gnu/packages/robotics.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 0b0ecaf027..949978d5dd 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -120,7 +120,6 @@ hundred times faster than real-time.") qtbase-5 qtsvg-5 qttools-5 ;for libQt5Help, needed by "studio" - qtwebkit qtx11extras eudev libxml2 -- cgit 1.4.1 From 7eb3eec4dacc414a6680a97bc6ef38c1f76b947e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Feb 2023 17:30:07 -0500 Subject: gnu: psi: Replace with psi-plus. This is required for . * gnu/packages/messaging.scm (psi): Deprecate in favor of psi-plus. --- gnu/packages/messaging.scm | 59 +++------------------------------------------- 1 file changed, 3 insertions(+), 56 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3027d56907..b6e7bc7cf1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -193,62 +193,6 @@ by @acronym{OMEMO, OMEMO Multi-End Message and Object Encryption}, during XMPP-based sessions.") (license license:lgpl3+))) -(define-public psi - (package - (name "psi") - (version "1.5") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/psi/Psi/" - version "/psi-" version ".tar.xz")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "3rdparty"))) - (sha256 - (base32 "1dxmm1d1zr0pfs51lba732ipm6hm2357jlfb934lvarzsh7karri")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DUSE_ENCHANT=ON" - "-DUSE_CCACHE=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "cmake/modules/FindHunspell.cmake" - (("hunspell-1.6") - "hunspell-1.7")) - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("ruby" ,ruby))) - (inputs - `(("aspell" ,aspell) - ("enchant" ,enchant-1.6) - ("hunspell" ,hunspell) - ("libidn" ,libidn) - ("qca" ,qca) - ("qtbase" ,qtbase-5) - ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsvg-5" ,qtsvg-5) - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("x11" ,libx11) - ("xext" ,libxext) - ("xcb" ,libxcb) - ("zlib" ,zlib))) - (synopsis "Qt-based XMPP Client") - (description "Psi is a capable XMPP client aimed at experienced users. -Its design goals are simplicity and stability.") - (home-page "https://psi-im.org") - (license license:gpl2+))) - (define-public libgnt (package (name "libgnt") @@ -3142,6 +3086,9 @@ social and chat platform.") designed for experienced users.") (license license:gpl2+))) +(define-public psi + (deprecated-package "psi" psi-plus)) + (define-public python-zulip (package (name "python-zulip") -- cgit 1.4.1 From abe7afb17ced298743f3eca2fa156d480fdd038d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 17 Feb 2023 14:17:55 -0500 Subject: gnu: Make nothing depend on QtWebKit. This is required for . * gnu/packages/qt.scm (python-pyqt)[inputs]: Remove qtwebkit. (python-pyqt-without-qtwebkit): Remove variable. (python-pyqtwebengine)[inputs]: Replace python-pyqt-without-qtwebkit with python-pyqt. * gnu/packages/backup.scm (vorta)[inputs]: Likewise. * gnu/packages/ebook.scm (calibre)[inputs]: Likewise. [arguments]: Adjust accordingly. * gnu/packages/education.scm (anki)[inputs]: Replace python-pyqt-without-qtwebkit with python-pyqt. * gnu/packages/kde-games.scm (kajongg)[inputs]: Likewise. * gnu/packages/maths.scm (veusz)[inputs]: Likewise. * gnu/packages/music.scm (frescobaldi)[inputs]: Likewise. (picard)[inputs]: Likewise. * gnu/packages/orange.scm (orange)[inputs]: Likewise. * gnu/packages/pdf.scm (flyer-composer)[inputs]: Likewise. * gnu/packages/python-check.scm (python-pytest-qt)[propagated-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-qtconsole)[propagated-inputs]: Likewise. (python-pyqtgraph)[propagated-inputs]: Likewise. * gnu/packages/radio.scm (gnuradio)[inputs]: Likewise. * gnu/packages/video.scm (openshot)[inputs]: Likewise. * gnu/packages/vpn.scm (openconnect-sso)[inputs]: Likewise. * gnu/packages/web-browsers.scm (qutebrowser)[inputs]: Likewise. --- gnu/packages/backup.scm | 2 +- gnu/packages/ebook.scm | 4 ++-- gnu/packages/education.scm | 2 +- gnu/packages/kde-games.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/orange.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/qt.scm | 14 +------------- gnu/packages/radio.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- 15 files changed, 18 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5841c894d1..8a25d0d116 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1343,7 +1343,7 @@ borgmatic is powered by borg.") python-paramiko python-peewee python-psutil - python-pyqt-without-qtwebkit + python-pyqt python-secretstorage ;; This is included so that the qt-wrap phase picks it up. qtsvg-5)) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b21fcfdc9a..6d645fba38 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -200,7 +200,7 @@ with Microsoft Compiled HTML (CHM) files") python-pychm python-pycryptodome python-pygments - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-regex speech-dispatcher @@ -246,7 +246,7 @@ tags = [\"WS_X11\"]") (string-append "[tool.sip.project] sip-include-dirs = [\"" #$(this-package-input - "python-pyqt-without-qtwebkit") + "python-pyqt") "/share/sip\"]"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 62c4d2352d..53710f424e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -805,7 +805,7 @@ stored and user can review his performance in any time.") ("python-pyaudio" ,python-pyaudio) ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH. ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt) ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) ("python-sip" ,python-sip) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index b0df2cf3d2..9be889f6aa 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -322,7 +322,7 @@ This package is part of the KDE games module.") ki18n libkmahjongg python - python-pyqt-without-qtwebkit + python-pyqt python-twisted python-qtpy python-zope-interface diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0da47943fd..ceb2f14a80 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3184,7 +3184,7 @@ ASCII text files using Gmsh's own scripting language.") (list ghostscript ;optional, for EPS/PS output python-dbus python-h5py ;optional, for HDF5 data - python-pyqt-without-qtwebkit + python-pyqt qtbase-5 qtsvg-5)) (propagated-inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6fb2824483..59f295cc14 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2967,7 +2967,7 @@ using a system-independent interface.") python-ly python-poppler-qt5 python-pyportmidi - python-pyqt-without-qtwebkit + python-pyqt python-sip)) (home-page "https://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") @@ -3709,7 +3709,7 @@ event-based scripts for scrobbling, notifications, etc.") (inputs (list chromaprint python-discid - python-pyqt-without-qtwebkit + python-pyqt python-mutagen python-fasteners python-pyyaml diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 0b8a642014..2a66fe429e 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -160,7 +160,7 @@ GUI based workflow. It is primarily used in the Orange framework.") python-orange-widget-base python-pandas python-pygments - python-pyqt-without-qtwebkit + python-pyqt python-pyqtgraph python-pyqtwebengine python-pyyaml diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 378b1b2411..f0aefb39e8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -185,7 +185,7 @@ information.") (inputs (list python-poppler-qt5 python-pypdf2 - python-pyqt-without-qtwebkit + python-pyqt qtbase-5)) (home-page "http://crazy-compilers.com/flyer-composer") (synopsis "Rearrange PDF pages to print as flyers on one sheet") diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 41ed6e9a73..04c369b482 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1678,7 +1678,7 @@ libraries.") (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (propagated-inputs - (list python-pyqt-without-qtwebkit)) + (list python-pyqt)) (native-inputs (list python-pytest python-pytest-runner python-setuptools-scm)) (home-page "https://github.com/pytest-dev/pytest-qt") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cfeb37eea1..f97faefc65 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14227,7 +14227,7 @@ Jupyter kernels such as IJulia and IRKernel.") (("def test_other_output") "def _test_other_output"))))))) (propagated-inputs (list python-ipykernel python-ipython-genutils python-jupyter-client - python-jupyter-core python-pygments python-pyqt-without-qtwebkit + python-jupyter-core python-pygments python-pyqt python-pyzmq python-qtpy python-traitlets)) (native-inputs (list python-flaky python-pytest python-pytest-qt)) @@ -16198,7 +16198,7 @@ ISO 8859, etc.).") (list qtbase-5)) (propagated-inputs (list python-h5py python-numpy python-pyopengl python-scipy - python-pyqt-without-qtwebkit)) + python-pyqt)) (home-page "https://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index da18395efc..cad07ea19d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3270,7 +3270,6 @@ module provides support functions to the automatically generated code.") ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) @@ -3367,7 +3366,7 @@ contain over 620 classes.") (inputs `(("python" ,python-wrapper) ("python-sip" ,python-sip) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) @@ -3425,17 +3424,6 @@ set of three modules. Prior to v5.12 these bindings were part of PyQt itself.") (license license:gpl3))) -;; XXX: This is useful for removing qtwebkit from other packages' dependency -;; graphs, as well as for preventing python-pyqtwebengine from transitively -;; depending on qtwebkit. -;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* -;; packages that could be used together. -(define-public python-pyqt-without-qtwebkit - (package/inherit python-pyqt - (name "python-pyqt-without-qtwebkit") - (inputs - (alist-delete "qtwebkit" (package-inputs python-pyqt))))) - (define-public python-pyqt-builder (package (name "python-pyqt-builder") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 06011b03de..b9612ffd56 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -687,7 +687,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") python-numpy python-pycairo python-pygobject - python-pyqt-without-qtwebkit + python-pyqt python-pyqtgraph python-pyyaml qtbase-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index df70ed6473..0697b18f3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4872,7 +4872,7 @@ API. It includes bindings for Python, Ruby, and other languages.") font-dejavu libopenshot python - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-pyzmq python-requests diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index f38fd28cea..500461fecf 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -750,7 +750,7 @@ and probably others.") python-lxml python-prompt-toolkit python-requests - python-pyqt-without-qtwebkit + python-pyqt python-pyqtwebengine python-pysocks python-pyxdg diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ec60df0bc0..a1c2294f7a 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -491,7 +491,7 @@ interface.") ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so ;; that it's __init__.py is used first. python-pyqtwebengine - python-pyqt-without-qtwebkit + python-pyqt ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. qtwebengine-5)) -- cgit 1.4.1 From 861d6fa92c465920e65db47ee4fac531156500ec Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 17 Feb 2023 14:30:01 -0500 Subject: gnu: Remove QtWebKit. This fixes . * gnu/packages/qt.scm (qtwebkit): Remove variable. * gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch, gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch, gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch, gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch, gnu/packages/patches/qtwebkit-pbutils-include.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/education.scm (openboard): Adjust code comment. --- gnu/local.mk | 5 - gnu/packages/education.scm | 2 +- .../qtwebkit-fix-building-with-bison-3.7.patch | 54 -------- .../qtwebkit-fix-building-with-glib-2.68.patch | 21 --- .../qtwebkit-fix-building-with-icu-68.patch | 152 --------------------- .../qtwebkit-fix-building-with-python-3.9.patch | 35 ----- .../patches/qtwebkit-pbutils-include.patch | 15 -- gnu/packages/qt.scm | 83 ----------- 8 files changed, 1 insertion(+), 366 deletions(-) delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch delete mode 100644 gnu/packages/patches/qtwebkit-pbutils-include.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 5fcbdd4586..aaf125ce7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1779,11 +1779,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtwayland-gcc-11.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ - %D%/packages/patches/qtwebkit-pbutils-include.patch \ - %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \ - %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \ - %D%/packages/patches/qtwebkit-fix-building-with-icu-68.patch \ - %D%/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch \ %D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/range-v3-build-with-gcc10.patch \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 53710f424e..c1b6c19508 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -449,7 +449,7 @@ specialized device.") (license license:gpl3))) (define-public openboard - ;; The last release builds from qtwebkit, which is planned for removal in + ;; The last release builds from qtwebkit, which has been removed from ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with ;; qtwebengine-5. (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311 diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch b/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch deleted file mode 100644 index ddaf8e2849..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix build with Bison 3.7 - -https://bugs.gentoo.org/736499 - -Patch copied from upstream source repository: - -https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 - -From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Tue, 4 Aug 2020 21:04:06 +0300 -Subject: [PATCH] Let Bison generate the header directly, to fix build with - Bison 3.7 - -Starting with Bison 3.7, the generated C++ file #include's the header -by default, instead of duplicating it. So we should not delete it. - -Remove the code to add #ifdef guards to the header, since Bison adds -them itself since version 2.6.3. ---- - Source/WebCore/css/makegrammar.pl | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 5d63b08102eb5..9435701c70612 100644 ---- a/Source/WebCore/css/makegrammar.pl -+++ b/Source/WebCore/css/makegrammar.pl -@@ -73,25 +73,6 @@ - } - - my $fileBase = File::Spec->join($outputDir, $filename); --my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); -+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); - push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. - system(@bisonCommand) == 0 or die; -- --open HEADER, ">$fileBase.h" or die; --print HEADER << "EOF"; --#ifndef CSSGRAMMAR_H --#define CSSGRAMMAR_H --EOF -- --open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; --while () { -- print HEADER; --} --close HPP; -- --print HEADER "#endif\n"; --close HEADER; -- --unlink("$fileBase.cpp.h"); --unlink("$fileBase.hpp"); -- diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch b/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch deleted file mode 100644 index 63840f4bbc..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix building with glib 2.68: - -https://github.com/qtwebkit/qtwebkit/issues/1057 - -Patch copied from upstream pull request: - -https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b - -diff -aurN qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h ---- qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h 2020-03-04 18:16:37.000000000 +0100 -+++ qtwebkit-5.212.0-alpha4-mod/Source/WTF/wtf/glib/GRefPtr.h 2021-04-05 06:58:44.763328636 +0200 -@@ -29,9 +29,6 @@ - #include - #include - --extern "C" void g_object_unref(gpointer); --extern "C" gpointer g_object_ref_sink(gpointer); -- - namespace WTF { - - enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch b/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch deleted file mode 100644 index acbfc4c4c8..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch +++ /dev/null @@ -1,152 +0,0 @@ -Fix building with ICU > 68. - -https://bugs.gentoo.org/753260 - -Patch adapted from Gentoo: - -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335f29d266c5b169ff1e781f9851a3a203f3198c - -From 335f29d266c5b169ff1e781f9851a3a203f3198c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Fri, 6 Nov 2020 09:22:15 +0100 -Subject: dev-qt/qtwebkit: Fix build with ICU-68 - -Thanks-to: Lars Wendler -Closes: https://bugs.gentoo.org/753260 -Package-Manager: Portage-3.0.9, Repoman-3.0.2 -Signed-off-by: Andreas Sturmlechner ---- - .../qtwebkit-5.212.0_pre20200309-icu-68.patch | 120 +++++++++++++++++++++ - 1 file changed, 120 insertions(+) - create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch - -(limited to 'dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch') - -diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index dd6ff06..e0f4bd7 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) -diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h -index c254fc4..6d1e1cb 100644 ---- a/Source/WebCore/platform/text/icu/UTextProvider.h -+++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits::max()); - text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } -diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -index cd6852c..6a864b1 100644 ---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) -diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -index 7aaac48..9ae0d36 100644 ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch b/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch deleted file mode 100644 index 9f9674de33..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix building with Python 3.9: - -https://github.com/qtwebkit/qtwebkit/issues/993 - -Patch copied from upstream source repository: - -https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd - -From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Wed, 3 Jun 2020 15:01:42 +0300 -Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to - json.load() - -In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument -is not supported. - -Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 ---- - Source/JavaScriptCore/generate-bytecode-files | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files -index c5dab429c7b0f..af3431275ecf9 100644 ---- a/Source/JavaScriptCore/generate-bytecode-files -+++ b/Source/JavaScriptCore/generate-bytecode-files -@@ -163,7 +163,7 @@ if __name__ == "__main__": - initBytecodesFile = openOrExit(initASMFileName, "w") - - try: -- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") -+ bytecodeSections = json.load(bytecodeFile) - except: - print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) - diff --git a/gnu/packages/patches/qtwebkit-pbutils-include.patch b/gnu/packages/patches/qtwebkit-pbutils-include.patch deleted file mode 100644 index 57961e7a51..0000000000 --- a/gnu/packages/patches/qtwebkit-pbutils-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch taken from Nix: - https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch - -diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake ---- a/Source/WebKit2/PlatformQt.cmake -+++ b/Source/WebKit2/PlatformQt.cmake -@@ -261,6 +261,7 @@ - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cad07ea19d..b32a78085d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3803,89 +3803,6 @@ different kinds of sliders, and much more.") ;; textengines/mathml/qwt_mml_document.{cpp,h} is dual LGPL2.1/GPL3 (either). license:lgpl2.1 license:gpl3)))) -(define-public qtwebkit - (package - (name "qtwebkit") - (version "5.212.0-alpha4") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/annulen/webkit/releases/download/" - "qtwebkit-" version "/qtwebkit-" version ".tar.xz")) - (sha256 - (base32 - "1rm9sjkabxna67dl7myx9d9vpdyfxfdhrk9w7b94srkkjbd2d8cw")) - (patches (search-patches "qtwebkit-pbutils-include.patch" - "qtwebkit-fix-building-with-bison-3.7.patch" - "qtwebkit-fix-building-with-glib-2.68.patch" - "qtwebkit-fix-building-with-icu-68.patch" - "qtwebkit-fix-building-with-python-3.9.patch")))) - (build-system cmake-build-system) - (native-inputs - (list perl - python - ruby - bison - flex - gperf - pkg-config)) - (inputs - `(("icu" ,icu4c) - ("glib" ,glib) - ("gst-plugins-base" ,gst-plugins-base) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libwebp" ,libwebp) - ("sqlite" ,sqlite) - ("fontconfig" ,fontconfig) - ("libxrender" ,libxrender) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtlocation" ,qtlocation) - ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) - ("qtwebchannel-5" ,qtwebchannel-5) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite))) - (arguments - `(#:tests? #f ; no apparent tests; it might be necessary to set - ; ENABLE_API_TESTS, see CMakeLists.txt - - ;; Parallel builds fail due to a race condition: - ;; . - #:parallel-build? #f - - #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" - "-DPORT=Qt" - "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON" - ;; XXX: relative dir installs to build dir? - (string-append "-DECM_MKSPECS_INSTALL_DIR=" - %output "/lib/qt5/mkspecs/modules") - ;; Sacrifice a little speed in order to link - ;; libraries and test executables in a - ;; reasonable amount of memory. - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) - (home-page "https://www.webkit.org") - (synopsis "Web browser engine and classes to render and interact with web -content") - (description "QtWebKit provides a Web browser engine that makes it easy to -embed content from the World Wide Web into your Qt application. At the same -time Web content can be enhanced with native controls.") - ;; Building QtWebKit takes around 13 hours on an AArch64 machine. Give some - ;; room for slower or busy hardware. - (properties '((timeout . 64800))) ;18 hours - - ;; XXX: This consumes too much RAM to successfully build on AArch64 (e.g., - ;; SoftIron OverDrive with 8 GiB of RAM), so instead of wasting resources, - ;; disable it on non-Intel platforms. - (supported-systems '("x86_64-linux" "i686-linux")) - - (license license:lgpl2.1+))) - (define-public dotherside (package (name "dotherside") -- cgit 1.4.1 From 7b4b2713786d7d29b0435fa3e4557d898ad95cb5 Mon Sep 17 00:00:00 2001 From: André Batista Date: Fri, 17 Feb 2023 16:06:07 -0300 Subject: gnu: libgit2-1.1: Remove it. There are no remaining packages which depend on this older version. * gnu/packages/version-control.scm (libgit2-1.1): Remove variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/version-control.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5de344e549..e72c560928 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -894,22 +894,6 @@ write native speed custom Git applications in any language with bindings.") ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%")))))))))) -(define-public libgit2-1.1 - (package - (inherit libgit2-1.3) - (version "1.1.0") - (source (origin - (inherit (package-source libgit2-1.3)) - (file-name #f) ;use the default name - (method url-fetch) - (uri (string-append "https://github.com/libgit2/libgit2/" - "releases/download/v" version - "/libgit2-" version ".tar.gz")) - (sha256 - (base32 - "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) - (patches (search-patches "libgit2-mtime-0.patch")))))) - (define-public git-crypt (package (name "git-crypt") -- cgit 1.4.1 From 8d8e1438ae5a2e50005b500dacd0a26be540fe69 Mon Sep 17 00:00:00 2001 From: André Batista Date: Fri, 17 Feb 2023 16:07:10 -0300 Subject: gnu: libgit2: Update to 1.5.1 [security fixes]. Fixes CVE-2023-22742. Follows up on fixes to CVE-2022-24765. Provides compatibility with git changes to address CVE-2022-29187. * gnu/packages/version-control.scm (libgit2): Update to 1.5.1. [source]: Remove snippet to comment out the "10 years ago" test, which was removed on newer versions. (libgit2-1.4): New variable. Update to 1.4.5. (libgit2-1.3): Inherit from 'libgit2-1.4'. Update to 1.3.2. Signed-off-by: Maxim Cournoyer --- gnu/packages/version-control.scm | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e72c560928..49dc96d454 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -804,7 +804,7 @@ to GitHub contributions calendar.") (define-public libgit2 (package (name "libgit2") - (version "1.4.3") + (version "1.5.1") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -815,18 +815,11 @@ to GitHub contributions calendar.") (file-name (git-file-name name version)) (sha256 (base32 - "02x1a4zrzpzjd0yxnsi8njh5hgihc1iy1v4r0fnl8m4ckcgp6x2s")) + "04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "deps") - - ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" matches a specific commit. - ;; See . - (substitute* "tests/refs/revparse.c" - (("test_object.*10 years ago.*" all) - (string-append "// " all "\n"))))))) + (delete-file-recursively "deps"))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -868,10 +861,10 @@ write native speed custom Git applications in any language with bindings.") ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.3 +(define-public libgit2-1.4 (package (inherit libgit2) - (version "1.3.0") + (version "1.4.5") (source (origin (inherit (package-source libgit2)) (method git-fetch) @@ -881,7 +874,22 @@ write native speed custom Git applications in any language with bindings.") (file-name (git-file-name "libgit2" version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")))) + "0q754ipc6skagszi93lcy6qr09ibavivm2q5i5fhpdblvlnv2p7x")))))) + +(define-public libgit2-1.3 + (package + (inherit libgit2-1.4) + (version "1.3.2") + (source (origin + (inherit (package-source libgit2-1.4)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name "libgit2" version)) + (sha256 + (base32 + "1dngga8jq419z6ps65wpmh2jihcf70k6r98pb1m1yiwj7qqh9792")))) (arguments (substitute-keyword-arguments (package-arguments libgit2) ((#:phases _ '%standard-phases) -- cgit 1.4.1 From b6fea89ad6571c07158abd93847a27cb2478641a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:03 +0100 Subject: gnu: nmap: Update to 7.93. * gnu/packages/admin.scm (nmap): Update to 7.93. [inputs]: Use OpenSSL 3.0. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 055be32972..555932b197 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3312,14 +3312,14 @@ rules is done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.92") + (version "7.93") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "18bifn67kz2wxkbnfwcrin2xrhc6qf4p2bvxfqb2a2vbi8pryix5")) + "0lb6s4nmmicfnc221mzgx2w51dcd4b2dhx22pabcqnp2jd3zxg2m")) (modules '((guix build utils))) (snippet '(begin @@ -3333,7 +3333,7 @@ rules is done with the @code{auditctl} utility.") "mswin32")))))) (build-system gnu-build-system) (inputs - `(("openssl" ,openssl) + `(("openssl" ,openssl-3.0) ("libpcap" ,libpcap) ("pcre" ,pcre) ("lua" ,lua) @@ -3394,7 +3394,7 @@ tool. It is also useful for tasks such as network inventory, managing service upgrade schedules, and monitoring host or service uptime. It also provides an advanced netcat implementation (ncat), a utility for comparing scan results (ndiff), and a packet generation and response analysis tool (nping).") - ;; See . + ;; See . ;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; both use a 3-clause BSD license. (license (list license:nmap license:bsd-3)))) -- cgit 1.4.1 From 3286a38c42d8c88a6ac1e869d12d8e77357246e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:02 +0100 Subject: gnu: nmap: Remove input labels. * gnu/packages/admin.scm (nmap)[inputs]: Move to conventional location, remove input labels, and order sortabetically. --- gnu/packages/admin.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 555932b197..3bf03aeec6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3332,18 +3332,7 @@ rules is done with the @code{auditctl} utility.") ;; Remove pre-compiled binares. "mswin32")))))) (build-system gnu-build-system) - (inputs - `(("openssl" ,openssl-3.0) - ("libpcap" ,libpcap) - ("pcre" ,pcre) - ("lua" ,lua) - ("zlib" ,zlib) ;for NSE compression support - - ;; For 'ndiff'. - ("python" ,python-2))) - - ;; TODO Add zenmap output. - (outputs '("out" "ndiff")) + (outputs '("out" "ndiff")) ; TODO Add zenmap output (arguments `(#:configure-flags '("--without-zenmap") #:phases @@ -3386,6 +3375,13 @@ rules is done with the @code{auditctl} utility.") "check-dns"))))) ;; Nmap can't cope with out-of-source building. #:out-of-source? #f)) + (inputs + (list libpcap + lua + openssl-3.0 + pcre + zlib ; for NSE compression + python-2)) ; for ndiff (home-page "https://nmap.org/") (synopsis "Network discovery and security auditing tool") (description -- cgit 1.4.1 From 19d58dbc24d8bc74b0a4c786c377409166421497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:03 +0100 Subject: gnu: htop: Update to 3.2.2. * gnu/packages/admin.scm (htop): Update to 3.2.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3bf03aeec6..5ea65862a2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -769,7 +769,7 @@ on memory usage on GNU/Linux systems.") (define-public htop (package (name "htop") - (version "3.2.1") + (version "3.2.2") (source (origin (method git-fetch) @@ -777,7 +777,7 @@ on memory usage on GNU/Linux systems.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "0yfmkw3y4qyd42svhpiijif7krvmnb8z88y6h9g4fwf7sfynq2rk")) + (base32 "0cyaprgnhfrc7rqq053903bjylaplvxkb65b04bsxmiva09lvf9s")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 78ebd3408a1a4e9e26a3d5f95d28921c0bd37f7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:03 +0100 Subject: gnu: igt-gpu-tools: Update to 1.27.1. * gnu/packages/admin.scm (igt-gpu-tools): Update to 1.27.1. [arguments]: Remove 'fix-meson.build phase. --- gnu/packages/admin.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5ea65862a2..a6204b0704 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3839,17 +3839,16 @@ buffers.") (define-public igt-gpu-tools (package (name "igt-gpu-tools") - ;; You should very likely remove the 'fix-meson.build phase when upgrading. - (version "1.26") + (version "1.27.1") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.freedesktop.org/drm/igt-gpu-tools.git") - (commit (string-append "igt-gpu-tools-" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m124pqv7zna25jnvk566c4kk628jr0w8mgnp8mr5xqz9cprgczm")))) + (base32 "0d6jsj77qddccv0vfmqmbw3k2prvxzvmgc8zdi83gdi3wpp5i7zd")))) (build-system meson-build-system) (arguments `(#:tests? #f ; many of the tests try to load kernel modules @@ -3858,13 +3857,7 @@ buffers.") (add-after 'unpack 'find-rst2man.py (lambda _ (substitute* "man/meson.build" - (("'rst2man'") "'rst2man.py'")))) - (add-after 'unpack 'fix-meson.build - ;; Fix ‘ERROR: Function does not take positional arguments.’ - (lambda _ - (substitute* "lib/meson.build" - (("f\\.underscorify\\(f\\)") - "f.underscorify()"))))))) + (("'rst2man'") "'rst2man.py'"))))))) (inputs (list cairo elfutils ; libdw -- cgit 1.4.1 From 8e3e748bbeb6d6ba7200c9c27d60896bd3ad51c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:02 +0100 Subject: gnu: sudo: Update to 1.9.13p1. * gnu/packages/admin.scm (sudo): Update to 1.9.13p1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a6204b0704..3517d9a47d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1969,7 +1969,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.13") + (version "1.9.13p1") (source (origin (method url-fetch) (uri @@ -1979,7 +1979,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0dp4fy0nrqby06vcl34dnxzpqbzifacw7p15v4ls3c7d8rdlam9z")) + "0hxxagc2v35rzf8jgjdyf92axxbm3mvxm2bx5jhmysz5mj1knak7")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From b6edac40a1f38b917efd03d53e04b58dd02e7feb Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Fri, 17 Feb 2023 15:37:47 -0500 Subject: gnu: yt-dlp: Update to 2023.02.17. * gnu/packages/video.scm (yt-dlp): Update to 2023.02.17. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0697b18f3b..fcbafdb846 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2565,7 +2565,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2023.01.06") + (version "2023.02.17") (source (origin (method git-fetch) @@ -2574,7 +2574,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13kg6zsc0js4smqj6v4qpiycl9jlijj3pvp49wif6ilgv87sq7v3")))) + (base32 "08m626ij0jij5vbvfbbalwr97jdhl1n2w2cwwgbj5a4s7vhvp84x")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) -- cgit 1.4.1 From 3d6c420a304ecc847a4325bedf254eecb1967b48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:20:24 +0100 Subject: gnu: emacs-compat: Update to 29.1.3.4. * gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.3.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6047bbe393..d4a8d3c2d5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7918,14 +7918,14 @@ variables, and so on. The mode also allows you to execute Tup commands.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.3.3") + (version "29.1.3.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "0jzdax1pi068bd9ly2svwyigk6x46gwj27lgdipjkx6jnx4323nw")))) + "16j7b18iwsdynb2w4x2hficz0g060r52lsg5ly9kb20zfrq2yvw0")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") -- cgit 1.4.1 From 0c20d3dc87f8ddc1d4b429957d9319fe5eb5a18f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:20:48 +0100 Subject: gnu: emacs-posframe: Update to 1.3.3. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 1.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d4a8d3c2d5..80f3cdd771 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16976,14 +16976,14 @@ the center of the screen and not at the bottom.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "05qkwb3ys05chn0maz7q19kp539m7p5acb8di4rni4vjjlkpx2bj")))) + (base32 "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From 7278eb4005e6d7dbc7ba8a4a991d3579e46eaf60 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:21:11 +0100 Subject: gnu: emacs-load-relative: Update to 1.3.2. * gnu/packages/emacs-xyz.scm (emacs-load-relative): Update to 1.3.2. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 80f3cdd771..f04c424c13 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10930,14 +10930,14 @@ test tags. It supports both interactive and non-interactive use.") (define-public emacs-load-relative (package (name "emacs-load-relative") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/load-relative-" - version ".el")) + version ".tar")) (sha256 - (base32 "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj")))) + (base32 "1fwa51jp0sq5l69y98l2zyj0iq9s6rj1rnqrmvncif61smma8fd7")))) (build-system emacs-build-system) (home-page "https://github.com/rocky/emacs-load-relative") (synopsis "Emacs Lisp relative file loading related functions") -- cgit 1.4.1 From 7741a3efc826fdef618eb9fcfe7cd90f6bdec12d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:22:59 +0100 Subject: gnu: emacs-alarm-clock: Update to 1.0.4. * gnu/packages/emacs-xyz.scm (emacs-alarm-clock): Update to 1.0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f04c424c13..ffcc478e68 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2330,7 +2330,7 @@ Distributed @acronym{Source Control Management, SCM} system.") (define-public emacs-alarm-clock (package (name "emacs-alarm-clock") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -2339,7 +2339,7 @@ Distributed @acronym{Source Control Management, SCM} system.") (file-name (git-file-name name version)) (sha256 (base32 - "02gr5scf50js00xa1chvd0j7agr8bys5madzk96fwg0s4gfdmyqa")))) + "0vdwvrbj79ylaz5ffa2bpfy4kzi1s6hf6bxijvyw7h8y6bd196av")))) (build-system emacs-build-system) (arguments (list #:include #~(cons "alarm.mp3" %default-include) -- cgit 1.4.1 From 2c6f38c985483fed22490986026600d716b0bfcf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:27:46 +0100 Subject: gnu: emacs-cape: Update to 0.13. * gnu/packages/emacs-xyz.scm (emacs-cape): Update to 0.13. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ffcc478e68..c7cb9b90cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3840,7 +3840,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) @@ -3849,8 +3849,10 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1855wi6ghi42ngjq3qyjr3p1nc57s257v9c98wqmb2n6vca5p2lp")))) + (base32 "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya")))) (build-system emacs-build-system) + (propagated-inputs + (list emacs-compat)) (home-page "https://github.com/minad/cape") (synopsis "Completion at point extensions for Emacs") (description -- cgit 1.4.1 From 0bd39d12946172779e56265ff5cf842e848cca16 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:33:35 +0100 Subject: gnu: emacs-citar: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-citar): Update to 1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c7cb9b90cc..2a93d2b6c6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21287,7 +21287,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (define-public emacs-citar (package (name "emacs-citar") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) (uri (git-reference @@ -21296,7 +21296,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (file-name (git-file-name name version)) (sha256 (base32 - "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9")))) + "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry")))) (build-system emacs-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 6f975f22b3c81d51a0c7d77be7ca02de8613d1a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:35:09 +0100 Subject: gnu: emacs-inspector: Update to 0.20. * gnu/packages/emacs-xyz.scm (emacs-inspector): Update to 0.20. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a93d2b6c6..b4719dc608 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -560,10 +560,10 @@ configuration language which makes it trivial to write your own themes.") (license license:gpl3+)))) (define-public emacs-inspector - (let ((commit "0766ce48dfbf193df73a1fd343a84a9d41ded8ba")) ;version bump + (let ((commit "61fd1dc7e321525cca11a5a899c631f745b2cf31")) ;version bump (package (name "emacs-inspector") - (version "0.19") + (version "0.20") (source (origin (uri (git-reference @@ -571,7 +571,7 @@ configuration language which makes it trivial to write your own themes.") (commit commit))) (method git-fetch) (sha256 - (base32 "0wi8j3r5lz9ww54jdjb6dv4f2rgjv41v8cb5k652skpxllr4cfwy")) + (base32 "18r7s36m75d5gnh8hcj0nkq3pr10z2v56jsgqsxz2lsyxl03c5sc")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From 830550698344f194cf1a7587ea46420b33d75302 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:36:25 +0100 Subject: gnu: emacs-osm: Update to 0.10. * gnu/packages/emacs-xyz.scm (emacs-osm): Update to 0.10. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b4719dc608..e71dbfc074 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35166,7 +35166,7 @@ hacker.") (define-public emacs-osm (package (name "emacs-osm") - (version "0.9") + (version "0.10") (home-page "https://github.com/minad/osm") (source (origin (method git-fetch) @@ -35176,7 +35176,7 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "0iacf3mqjq8vfhd0nyzry0spishyvn92zgd55ivqxb9xfdr3lx9x")))) + "07caffh30sgmcbhxqk3wfpml3310ldvwkqbh19czq7nx4llynixc")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -35201,6 +35201,7 @@ hacker.") "/share/info"))))))) (inputs (list curl)) (native-inputs (list texinfo)) + (propagated-inputs (list emacs-compat)) (synopsis "OpenStreetMap viewer for Emacs") (description "This package provides an OpenStreetMap viewer for Emacs, featuring -- cgit 1.4.1 From 957d104a5317e684305961f02f2abbba37598c7a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Feb 2023 23:39:06 +0100 Subject: gnu: emacs-tempel: Update to 0.7. * gnu/packages/emacs-xyz.scm (emacs-tempel): Update to 0.7. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e71dbfc074..4839bb92a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15801,7 +15801,7 @@ been adapted to also work with mu4e.") (define-public emacs-tempel (package (name "emacs-tempel") - (version "0.6") + (version "0.7") (source (origin (method git-fetch) (uri (git-reference @@ -15810,8 +15810,10 @@ been adapted to also work with mu4e.") (file-name (git-file-name name version)) (sha256 (base32 - "1jgsjhrfdd72a0na4s1qp8yc24mbgrpxkv8yqac0vgqipg98cdg6")))) + "1qhy9rp0k74hbqns67iwyzk86x7rriqyd4l48j5qqmfvr3v5sg1m")))) (build-system emacs-build-system) + (propagated-inputs + (list emacs-compat)) (home-page "https://github.com/minad/tempel") (synopsis "Simple templates for Emacs") (description -- cgit 1.4.1 From 2f87c51ca5af495f2e252fe23e2a96c48fbcad5a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 10:21:22 +0100 Subject: gnu: musescore: Update to 4.0.1. * gnu/packages/music.scm (musescore): Update to 4.0.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 59f295cc14..42171ce127 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4874,7 +4874,7 @@ includes LV2 plugins and a JACK standalone client.") (define-public musescore (package (name "musescore") - (version "4.0") + (version "4.0.1") (source (origin (method git-fetch) @@ -4883,7 +4883,7 @@ includes LV2 plugins and a JACK standalone client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16rcwr6fzghv8100syzicabqg8jqvng3zzsi6h3ja4zkp9hcbkcr")) + (base32 "0x1aahpbvss3sjydcq6xdh198fmslgypixmd2gckfwjqzady662y")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 46c06fedbc155e52f9f5173846d531130ab8c8fc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 17:31:55 +0100 Subject: gnu: Add coucal. * gnu/packages/datastructures.scm (coucal): New variable. --- gnu/packages/datastructures.scm | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index d40051506f..9f4514a247 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019, 2020, 2022 Efraim Flashner ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020, 2022 Marius Bakke +;;; Copyright © 2023 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,56 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson)) +(define-public coucal + (let ((commit "73ada075553b7607d083037a87cb9c73b3683bfc") + (revision "1")) + (package + (name "coucal") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xroche/coucal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01996vda3wj5ywpwg9yhysaq6cyi44xnkyhihbwwi43hrj1ic2vm")))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-run-tests-early + (lambda _ + (substitute* "Makefile" + (("(all: ).*" _ lead) (string-append lead "gcc"))))) + (add-after 'unpack 'remove-Werror + ;; Prevent "this statement may fall through + ;; [-Wimplicit-fallthrough=]" errors from "murmurhash3.h" file. + (lambda _ + (substitute* "Makefile" + (("-Werror ") "")))) + (delete 'configure) ;no configure script + (replace 'install ;no install target + (lambda _ + (let ((doc (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "README.md" doc)) + (for-each (lambda (f) (install-file f #$output)) + (find-files "." "(coucal|murmurhash)")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "tests" "runtests"))))))) + (home-page "https://github.com/xroche/coucal") + (synopsis "Cuckoo-hashing-based hashtable with stash area C library") + (description "Coucal is an implementation of the Cuckoo hashing +algorithm with a stash area using by default the MurmurHash hash function.") + ;; Library is released under Expat terms, but the source includes + ;; "murmurhash3.h", which is placed in the public domain. + (license (list license:expat license:public-domain))))) + (define-public gdsl (package (name "gdsl") -- cgit 1.4.1 From 6dce27abbba01cb4e249c9bdb3c132cecc0a5c51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Feb 2023 17:32:43 +0100 Subject: gnu: httrack: Update to 3.49.4. * gnu/packages/web.scm (httrack): Update to 3.49.4. [source]: Switch to GtiHub. [arguments]: Add phases to prevent retrieving Coucal submodule and unbundle it, although it is still compiled. [native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL. [inputs]: Add COUCAL. --- gnu/packages/web.scm | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 271c6ffa81..98db004482 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019, 2020, 2021 Nicolas Goaziou +;;; Copyright © 2019, 2020-2021, 2023 Nicolas Goaziou ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel @@ -121,6 +121,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages docbook) + #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages emacs-xyz) @@ -7890,17 +7891,41 @@ instructions on how to use Guix in a shared HPC environment.") (define-public httrack (package (name "httrack") - (version "3.49.2") - (source (origin - (method url-fetch) - (uri (string-append "https://mirror.httrack.com/historical/" - "httrack-" version ".tar.gz")) - (sha256 - (base32 - "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl")))) + (version "3.49.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xroche/httrack") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1izn1h7gaxb2barclm2pj5kaz1mmddx2c35n70m0552q8ms4lvks")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'autogen + ;; Force reconfiguration to generate "test-driver". + (lambda _ + (substitute* "configure.ac" + ;; Fix errors when running "configure" script. + (("AX_CHECK_(COMPILE|LINK)_FLAG\\(.*") "") + (("AX_CHECK_ALIGNED_ACCESS_REQUIRED") "") + (("gl_VISIBILITY") "")) + (invoke "autoreconf" "-vif"))) + (add-after 'unpack 'copy-coucal-source + ;; Install Coucal source to work around missing submodule. + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (f) (install-file f "src/coucal")) + (find-files #$(this-package-input "coucal") + "\\.(c|h|diff|orig)$"))))))) + (native-inputs + (list autoconf automake libtool)) (inputs - (list libressl zlib)) + (list coucal libressl zlib)) (home-page "https://www.httrack.com/") (synopsis "Easy-to-use offline browser utility") (description "HTTrack allows you to download a World Wide Web site from -- cgit 1.4.1 From 6ba101d9accccd3d35431d61f9541e03cc9c65f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:02 +0100 Subject: gnu: fdupes: Update to 2.2.1. * gnu/packages/admin.scm (fdupes): Update to 2.2.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3517d9a47d..3a79997f83 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2771,7 +2771,7 @@ degradation and failure.") (define-public fdupes (package (name "fdupes") - (version "2.1.2") + (version "2.2.1") (source (origin (method url-fetch) @@ -2779,7 +2779,7 @@ degradation and failure.") "releases/download/v" version "/" "fdupes-" version ".tar.gz")) (sha256 - (base32 "1g9p50xhi2sp0hqxml4w2k0kq9jv988q2yxm347z5349dlxvap6d")))) + (base32 "13b9qph8nmxwns9n28im3f7bdzhpjas51vckm9b7h5ghlffbfsw4")))) (build-system gnu-build-system) (inputs (list ncurses pcre2)) -- cgit 1.4.1 From f414c99068c62934eef95e78710bed7d05003846 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:01 +0100 Subject: gnu: inxi-minimal: Update to 3.3.25-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.25-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3a79997f83..568c6ce650 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4347,7 +4347,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.3.24-1") + (version "3.3.25-1") (source (origin (method git-fetch) @@ -4356,7 +4356,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1nai43251r791qvc1c4hhvcaa6hq7zcjlww7k3ip7br6zgxqjaxm")))) + (base32 "0mak2f06xzalccgaij9fsi20600sg05v0pmg0blvy6hvq5kh97k3")))) (build-system trivial-build-system) (inputs (list bash-minimal -- cgit 1.4.1 From bef8593ded839bbe795ff3cfdde1389d43519777 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:01 +0100 Subject: gnu: dnsmasq: Update to 2.89. * gnu/packages/dns.scm (dnsmasq): Update to 2.89. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 8865d16a1a..621278b354 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -294,7 +294,7 @@ prompt the user with the option to go with insecure DNS only.") (define-public dnsmasq (package (name "dnsmasq") - (version "2.88") + (version "2.89") (source (origin (method url-fetch) (uri (string-append @@ -302,7 +302,7 @@ prompt the user with the option to go with insecure DNS only.") version ".tar.xz")) (sha256 (base32 - "1cy1zci6vyhzczy6ncc5m9d7zsnnzs9mmwd6pr9w0h03l7nlsm13")))) + "02dnxfnman38armn3sw56w80f9wb2vgm3qgm15crs2yg8q1j7g82")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 09d34401b92b0ef5fb37aaafd0a0731bf402a1d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: knot: Update to 3.2.5. * gnu/packages/dns.scm (knot): Update to 3.2.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 621278b354..1a4099dc8e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -875,7 +875,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.2.4") + (version "3.2.5") (source (origin (method git-fetch) @@ -884,7 +884,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b6fnrdy5zqn3mnn5cl92j0m7k9l6hh4gnr92qpirqf54bl2lfm2")) + (base32 "0xhr6i5qq0yhxqj50hsm51lb1v5lj4vfkzdcsvh7lw8wg6j1d03b")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 94fb170bfbb84062509dd3f04a39075a3fe292a9 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 17 Feb 2023 21:48:21 +0000 Subject: gnu: mympd: Update to 10.2.3. * gnu/packages/mpd.scm (mympd): Update to 10.2.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0e8f5e616b..74f43ecbb3 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -597,7 +597,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "10.2.2") + (version "10.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -606,7 +606,7 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "04nq2gwqs99iivb7xkqh6bi8rwfx9krgxfn8xiwyfwmzcbq7hyp0")))) + "001lnsva7rxyp0xk3xm2pcr5d4y3k5ikll6i4rrp9gqw9qs5yj52")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no test target -- cgit 1.4.1 From 89a1d52821c1d8f7accb812ca371738fab577227 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: memtest86+: Update to 6.10. * gnu/packages/hardware.scm (memtest86+): Update to 6.10. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 0b78436017..c00a6e2d91 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -824,7 +824,7 @@ specific SMBIOS tables.") (define-public memtest86+ (package (name "memtest86+") - (version "6.01") + (version "6.10") (source (origin (method git-fetch) @@ -833,7 +833,7 @@ specific SMBIOS tables.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1axf8y3nppyskcysypqpkjl0sxz39f1x0v4syplx35qj3y2kq1h4")) + (base32 "1igb648rsmbp0s95790qib6mhdsvbsrpigl91gk7yfkz32bip3bz")) (patches (search-patches "memtest86+-build-reproducibly.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From b04ee227a47419291391a2b6e857e41ed1c32155 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:04 +0100 Subject: gnu: nss: Graft to fix CVE-2023-0767. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/nss.scm (nss-next): Update to 3.88.1. (nss): Add a replacement field pointing to… (nss/fixed): …this new variable, based on nss-next. --- gnu/packages/nss.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index c06807c808..60247f34a2 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -123,6 +123,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") + (replacement nss/fixed) ;; Also update and test the nss-certs package, which duplicates version and ;; source to avoid a top-level variable reference & module cycle. (version "3.81") @@ -259,3 +260,8 @@ security standards.") (base32 "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7")))) (propagated-inputs (list nspr-next)))) ;required by nss.pc + +(define nss/fixed + (package + (inherit nss-next) + (version "3.88"))) ; slight inaccuracy to allow grafting -- cgit 1.4.1 From 644d51a10e86ce47eda1c46b3dfa309d3620ecbf Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 18 Feb 2023 10:37:06 +0100 Subject: gnu: stumpwm: Update to 22.11. * gnu/packages/wm.scm (stumpwm): Update to 22.11. --- gnu/packages/wm.scm | 130 +++++++++++++++++++++++++--------------------------- 1 file changed, 63 insertions(+), 67 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f2149b5be5..c0ccf2bdd7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020, 2022 Guillaume Le Vaillant +;;; Copyright © 2020, 2022, 2023 Guillaume Le Vaillant ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Robert Smith @@ -1957,59 +1957,55 @@ Wayland compositors supporting the wlr-output-management protocol.") (license license:expat))) ; MIT license (define-public stumpwm - ;; Some fixes to make stumpwm work with sbcl>=2.2.7 are not in a release - ;; yet, so we use a commit directly. - (let ((commit "ff6cb73f48f0df4285948f1009ef3b285c78b351") - (revision "1")) - (package - (name "stumpwm") - (version (git-version "22.05" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm") - (commit commit))) - (file-name (git-file-name "stumpwm" version)) - (sha256 - (base32 "0gvr136fv5zs61017gns3kbkz00837n0b52fif9vany5fslx3aj2")))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-fiasco - texinfo + (package + (name "stumpwm") + (version "22.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stumpwm/stumpwm") + (commit version))) + (file-name (git-file-name "stumpwm" version)) + (sha256 + (base32 "1wxgddmkgmpml44a3m6bd8y529b13jz14apxxipmij10wzpgay6d")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiasco + texinfo - ;; To build the manual. - autoconf - automake)) - (inputs - (list sbcl-alexandria - sbcl-cl-ppcre - sbcl-clx)) - (outputs '("out" "lib")) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "stumpwm-tests.asd" - (("\"ALL-TESTS\"") - "\"RUN-PACKAGE-TESTS\" :package")))) - (add-after 'create-asdf-configuration 'build-program - (lambda* (#:key outputs #:allow-other-keys) - (build-program - (string-append (assoc-ref outputs "out") "/bin/stumpwm") - outputs - #:entry-program '((stumpwm:stumpwm) 0)))) - (add-after 'build-program 'create-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xsessions (string-append out "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/stumpwm.desktop") - (lambda (file) - (format file + ;; To build the manual. + autoconf + automake)) + (inputs + (list sbcl-alexandria + sbcl-cl-ppcre + sbcl-clx)) + (outputs '("out" "lib")) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "stumpwm-tests.asd" + (("\"ALL-TESTS\"") + "\"RUN-PACKAGE-TESTS\" :package")))) + (add-after 'create-asdf-configuration 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/stumpwm") + outputs + #:entry-program '((stumpwm:stumpwm) 0)))) + (add-after 'build-program 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/stumpwm.desktop") + (lambda (file) + (format file "[Desktop Entry]~@ Name=stumpwm~@ Comment=The Stump Window Manager~@ @@ -2018,23 +2014,23 @@ Wayland compositors supporting the wlr-output-management protocol.") Icon=~@ Type=Application~%" out)))))) - (add-after 'install 'install-manual - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (invoke "./autogen.sh") - (invoke "sh" "./configure" "SHELL=sh") - (apply invoke "make" "stumpwm.info" make-flags) - (install-file "stumpwm.info" info))))))) - (synopsis "Window manager written in Common Lisp") - (description - "Stumpwm is a window manager written entirely in Common Lisp. + (add-after 'install 'install-manual + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (invoke "./autogen.sh") + (invoke "sh" "./configure" "SHELL=sh") + (apply invoke "make" "stumpwm.info" make-flags) + (install-file "stumpwm.info" info))))))) + (synopsis "Window manager written in Common Lisp") + (description + "Stumpwm is a window manager written entirely in Common Lisp. It attempts to be highly customizable while relying entirely on the keyboard for input. These design decisions reflect the growing popularity of productive, customizable lisp based systems.") - (home-page "https://github.com/stumpwm/stumpwm") - (license license:gpl2+) - (properties `((cl-source-variant . ,(delay cl-stumpwm))))))) + (home-page "https://github.com/stumpwm/stumpwm") + (license license:gpl2+) + (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) (define-public sbcl-stumpwm (deprecated-package "sbcl-stumpwm" stumpwm)) -- cgit 1.4.1 From 7b9725ed65d22bf7bfb9dcd2076c802955a5ace7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 18 Feb 2023 10:46:41 +0100 Subject: gnu: stumpwm-contrib: Update to 0.0.1-5.4613a95. * gnu/packages/wm.scm (stumpwm-contrib): Update to 0.0.1-5.4613a95. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c0ccf2bdd7..2f102a9a9f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2070,8 +2070,8 @@ productive, customizable lisp based systems.") (delete 'cleanup))))))) (define stumpwm-contrib - (let ((commit "d0c05077eca5257d33083de949c10bca4aac4242") - (revision "4")) + (let ((commit "4613a956add7a17986a3b26c341229466cd13f1d") + (revision "5")) (package (name "stumpwm-contrib") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -2083,7 +2083,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0zxhqh9wjfk7zas67kmwfx0a47y8rxmh8f1a5rcs300bv1083lkb")))) + (base32 "1g8h2vd5qsmaiz6ixlx9ykrv6a08izmkf0js18fvljvznpyhsznz")))) (build-system asdf-build-system/sbcl) (inputs `(("stumpwm" ,stumpwm "lib"))) -- cgit 1.4.1 From f447ce08faee87ab90885e51964401671f4ff710 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 18 Feb 2023 10:49:40 +0100 Subject: gnu: Remove deprecated sbcl-stumpwm aliases. * gnu/packages/wm.scm (sbcl-stumpwm, sbcl-stumpwm+slynk): Remove variables. --- gnu/packages/wm.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2f102a9a9f..5c391f5e1b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2032,9 +2032,6 @@ productive, customizable lisp based systems.") (license license:gpl2+) (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) -(define-public sbcl-stumpwm - (deprecated-package "sbcl-stumpwm" stumpwm)) - (define-public cl-stumpwm (package (inherit (sbcl-package->cl-source-package stumpwm)) @@ -2151,9 +2148,6 @@ productive, customizable lisp based systems.") control module for StumpWM.") (license license:gpl3)))) -(define-public sbcl-stumpwm+slynk - (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) - (define-public sbcl-stumpwm-ttf-fonts (package (inherit stumpwm-contrib) -- cgit 1.4.1 From 224bcf4f1d9995440cbd899496b9d9be02c1d49c Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Mon, 13 Feb 2023 13:08:55 -0500 Subject: gnu: kicad: Update to 7.0.0. * gnu/packages/engineering.scm (kicad): Update to 7.0.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9db6e26a02..bf741245bf 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) + #:use-module (gnu packages databases) #:use-module (gnu packages gawk) #:use-module (gnu packages dejagnu) #:use-module (gnu packages digest) @@ -946,7 +947,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "6.0.11") + (version "7.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -954,7 +955,7 @@ Emacs).") (commit version))) (sha256 (base32 - "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq")) + "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1015,6 +1016,7 @@ Emacs).") gettext-minimal pkg-config swig + unixodbc zlib)) (inputs (list bash-minimal cairo @@ -1053,7 +1055,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "0f191ifzgl2k196ph7ljip97s17gq8bsfkn1s3aza1qaafhg7acd")))) + "0xsj3fl6gkvyr97gx3nvy4ylcr6sc4byj4hbgcdwl2zx3wm02ifz")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1087,7 +1089,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp")))) + "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1116,7 +1118,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h")))) + "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1133,7 +1135,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz")))) + "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) @@ -1150,7 +1152,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v")))) + "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv")))) (synopsis "Official KiCad project and worksheet templates") (description "This package contains the official KiCad project and worksheet templates."))) -- cgit 1.4.1 From 64f94de1456971e254e062e5e3837238ae48d17b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Feb 2023 10:55:04 +0100 Subject: gnu: emacs-mew: Update to 6.9-1.35772ee. * gnu/packages/mail.scm (emacs-mew): Update to 6.9-1.35772ee. [source]: Set upstream to GitHub as the release tarball is missing from home page. --- gnu/packages/mail.scm | 99 +++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c8bf77f8c2..f7f41a58fb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1112,55 +1112,60 @@ repository and Maildir/IMAP as LOCAL repository.") (deprecated-package "offlineimap" offlineimap3)) (define-public emacs-mew - (package - (name "emacs-mew") - (version "6.8") - (source (origin - (method url-fetch) - (uri (string-append "https://mew.org/Release/mew-" - version ".tar.gz")) - (sha256 - (base32 - "0ixzyq33l6j34410kqav3lwn2wx171zvqd3irvns2jvhrbww8i6g")))) - (native-inputs - (list emacs)) - (propagated-inputs - (list ruby-sqlite3 ; optional for the database of messages - ruby)) ; to set GEM_PATH so ruby-sqlite3 is found at runtime - (build-system gnu-build-system) - (arguments - (let ((elisp-dir "/share/emacs/site-lisp") - (icon-dir "/share/mew")) - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:configure-flags - (list (string-append "--with-elispdir=" %output ,elisp-dir) - (string-append "--with-etcdir=" %output ,icon-dir)) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-mew-icon-directory - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-sexps "mew-key.el" - ("(def.* mew-icon-directory" - `(progn - (add-to-list 'image-load-path 'mew-icon-directory) - ,(string-append (assoc-ref outputs "out") ,icon-dir)))) - #t)) - (add-after 'install 'generate-autoloads - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "mew" (string-append (assoc-ref outputs "out") ,elisp-dir)) - #t))) - #:tests? #f))) - (home-page "https://mew.org") - (synopsis "Emacs e-mail client") - (description "Mew (Messaging in the Emacs World) is a user interface + (let ((commit "35772ee0b44dd7e56b0f3899b27fa545b2bc6f03") + (revision "1")) + (package + (name "emacs-mew") + (version (git-version "6.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kazu-yamamoto/Mew") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xazygwdc328m5l31rxjazq9giv2xrygp2p2q455lf3jhdxwq1km")))) + (native-inputs + (list emacs)) + (propagated-inputs + (list ruby-sqlite3 ; optional for the database of messages + ruby)) ; to set GEM_PATH so ruby-sqlite3 is found at runtime + (build-system gnu-build-system) + (arguments + (let ((elisp-dir "/share/emacs/site-lisp") + (icon-dir "/share/mew")) + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-utils)) + #:configure-flags + (list (string-append "--with-elispdir=" %output ,elisp-dir) + (string-append "--with-etcdir=" %output ,icon-dir)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-mew-icon-directory + (lambda* (#:key outputs #:allow-other-keys) + (emacs-substitute-sexps "elisp/mew-key.el" + ("(def.* mew-icon-directory" + `(progn + (add-to-list 'image-load-path 'mew-icon-directory) + ,(string-append (assoc-ref outputs "out") ,icon-dir)))) + #t)) + (add-after 'install 'generate-autoloads + (lambda* (#:key outputs #:allow-other-keys) + (emacs-generate-autoloads + "mew" (string-append (assoc-ref outputs "out") ,elisp-dir)) + #t))) + #:tests? #f))) + (home-page "https://mew.org") + (synopsis "Emacs e-mail client") + (description "Mew (Messaging in the Emacs World) is a user interface for text messages, multimedia messages (MIME), news articles and security functionality including PGP, S/MIME, SSH, and SSL.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public mu (package -- cgit 1.4.1 From bc3354a8821f365e692abf04006e3e5a61c44e28 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Feb 2023 11:27:17 +0100 Subject: gnu: emacs-mew: Improve package style. * gnu/packages/mail.scm (emacs-mew)[arguments]: Use G-expressions. Remove trailing #T from phases. [propagated-inputs]: Re-order inputs alphabetically. --- gnu/packages/mail.scm | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f7f41a58fb..4c36e05fe0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1127,39 +1127,37 @@ repository and Maildir/IMAP as LOCAL repository.") (sha256 (base32 "0xazygwdc328m5l31rxjazq9giv2xrygp2p2q455lf3jhdxwq1km")))) - (native-inputs - (list emacs)) - (propagated-inputs - (list ruby-sqlite3 ; optional for the database of messages - ruby)) ; to set GEM_PATH so ruby-sqlite3 is found at runtime (build-system gnu-build-system) (arguments - (let ((elisp-dir "/share/emacs/site-lisp") - (icon-dir "/share/mew")) - `(#:modules ((guix build gnu-build-system) + (let ((elisp-dir #~(string-append #$output "/share/emacs/site-lisp")) + (icon-dir #~(string-append #$output "/share/mew"))) + (list + #:modules '((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules `(,@%gnu-build-system-modules (guix build emacs-utils)) - #:configure-flags - (list (string-append "--with-elispdir=" %output ,elisp-dir) - (string-append "--with-etcdir=" %output ,icon-dir)) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-mew-icon-directory - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-sexps "elisp/mew-key.el" - ("(def.* mew-icon-directory" - `(progn - (add-to-list 'image-load-path 'mew-icon-directory) - ,(string-append (assoc-ref outputs "out") ,icon-dir)))) - #t)) - (add-after 'install 'generate-autoloads - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "mew" (string-append (assoc-ref outputs "out") ,elisp-dir)) - #t))) - #:tests? #f))) + #:tests? #f + #:configure-flags + #~(list (string-append "--with-elispdir=" #$elisp-dir) + (string-append "--with-etcdir=" #$icon-dir)) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'patch-mew-icon-directory + (lambda _ + (emacs-substitute-sexps "elisp/mew-key.el" + ("(def.* mew-icon-directory" + `(progn + (add-to-list 'image-load-path 'mew-icon-directory) + ,#$icon-dir))))) + (add-after 'install 'generate-autoloads + (lambda _ + (emacs-generate-autoloads "mew" #$elisp-dir))))))) + (native-inputs + (list emacs)) + (propagated-inputs + (list ruby ; to set GEM_PATH so ruby-sqlite3 is found at runtime + ruby-sqlite3)) ; optional for the database of messages (home-page "https://mew.org") (synopsis "Emacs e-mail client") (description "Mew (Messaging in the Emacs World) is a user interface -- cgit 1.4.1 From 53daa23b2e07add2a2bbdf099d2c768102c18fa5 Mon Sep 17 00:00:00 2001 From: Skylar Hill Date: Mon, 13 Feb 2023 03:16:49 +0000 Subject: gnu: Add opentaxsolver. * gnu/packages/finance.scm (opentaxsolver): New variable. * gnu/packages/patches/opentaxsolver-file-browser-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/finance.scm | 65 ++++++++++++++++++++++ .../patches/opentaxsolver-file-browser-fix.patch | 58 +++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 gnu/packages/patches/opentaxsolver-file-browser-fix.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index aaf125ce7b..5504dad8e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1617,6 +1617,7 @@ dist_patch_DATA = \ %D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \ + %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c9c8e9b823..4fd6b11ffb 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Collin J. Doering ;;; Copyright © 2022 Justin Veilleux ;;; Copyright © 2023 Frank Pursel +;;; Copyright © 2023 Skylar Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -2271,3 +2272,67 @@ combines the advantages of pool and solo mining; you still fully control your Monero node and what it mines, but you get frequent payouts like on a regular pool.") (license license:gpl3))) + +(define-public opentaxsolver + ;; The OTS version is formatted like tax-year_version. So, at time of + ;; writing, the version is 2022_20.00. Each part of this is used in + ;; different places in the source uri, so it's convenient to have them + ;; separately like this. + (let ((tax-year "2022") + (ots-version "20.00")) + (package + (name "opentaxsolver") + (version (string-append tax-year "_" ots-version)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/opentaxsolver/OTS_" + tax-year "/v" ots-version + "_linux/OpenTaxSolver" version "_linux64.tgz")) + (sha256 + (base32 + "06k0a72bmwdmr71dvrp8b4vl8vilnggsh92hrp7wjdgcjj9m074w")) + (patches (search-patches "opentaxsolver-file-browser-fix.patch")))) + (build-system glib-or-gtk-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + ;; OTS does provide a shellscript that does exactly this, but we + ;; need to do it ourselves to specify the correct compiler and to + ;; delete the GUI binaries. + (replace 'build + (lambda _ + (delete-file "Run_taxsolve_GUI") + (delete-file-recursively "bin") + (mkdir "bin") + (chdir "src/Gui_gtk") + (invoke "make" + (string-append "CC=" #$(cc-for-target))) + (chdir "..") + (invoke "make" + (string-append "CC=" #$(cc-for-target))))) + ;; OTS doesn't provide a `make install` target, because it assumes + ;; it'll be run from the tarball. So, we do it ourselves, making + ;; sure to replicate the directory structure of the tarball. + (replace 'install + (lambda _ + (copy-recursively "../bin" + (string-append #$output "/bin")) + (symlink (string-append #$output "/bin/ots_gui2") + (string-append #$output "/bin/Run_taxsolve_GUI")) + (copy-recursively "../tax_form_files" + (string-append #$output "/tax_form_files")) + (copy-recursively "formdata" + (string-append #$output "/src/formdata"))))))) + (native-inputs (list pkg-config)) + (inputs (list gtk+-2)) + (synopsis "Yearly tax preparation tool") + (description + "OpenTaxSolver is a program for calculating tax form entries for +federal and state personal income taxes. It automatically fills out and +prints your forms for mailing.") + (home-page "https://opentaxsolver.sourceforge.net/") + (license license:gpl2+)))) diff --git a/gnu/packages/patches/opentaxsolver-file-browser-fix.patch b/gnu/packages/patches/opentaxsolver-file-browser-fix.patch new file mode 100644 index 0000000000..0e6be74f85 --- /dev/null +++ b/gnu/packages/patches/opentaxsolver-file-browser-fix.patch @@ -0,0 +1,58 @@ +From 96fda11a53a89c6647031f2c05ef12f1a9df6a08 Mon Sep 17 00:00:00 2001 +From: Skylar Hill +Date: Tue, 31 Jan 2023 21:02:18 -0600 +Subject: [PATCH] Change default directory in file browser + +--- + src/Gui_gtk/ots_gui2.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/Gui_gtk/ots_gui2.c b/src/Gui_gtk/ots_gui2.c +index ff3366b..1247933 100644 +--- a/src/Gui_gtk/ots_gui2.c ++++ b/src/Gui_gtk/ots_gui2.c +@@ -82,6 +82,7 @@ char ots_release_package[]="20.00"; + #include + #include + #include ++#include + #include + // #include "backcompat.c" + #include "gtk_utils.c" /* Include the graphics library. */ +@@ -109,6 +110,7 @@ char toolpath[MaxFname]="", *start_cmd; + int pending_compute=0, supported_pdf_form=1; + int filingstatus_mfj=1; + int round_to_whole_nums=0; ++char *working_dir[MaxFname+512]; + + void pick_file( GtkWidget *wdg, void *data ); /* Prototype */ + void consume_leading_trailing_whitespace( char *line ); +@@ -2364,7 +2366,7 @@ void save_taxfile( GtkWidget *wdg, void *data ) + if (cpt != 0) + strcpy( cpt, "_xxxx.txt" ); + // printf("OTS_save_taxfile: dir='%s', wc='%s', fname='%s'\n", directory_dat, wildcards_fb, filename_fb ); +- Browse_Files( "File to Save As:", 2048, directory_dat, wildcards_fb, filename_fb, Save_Tax_File ); ++ Browse_Files( "File to Save As:", 2048, working_dir, wildcards_fb, filename_fb, Save_Tax_File ); + } + + +@@ -3878,7 +3880,7 @@ void pick_file( GtkWidget *wdg, void *data ) + strcpy( wildcards_fb, ".txt" ); + strcpy( filename_fb, "" ); + // printf("OTS_pick_file: dir='%s', wc='%s', fname='%s'\n", directory_dat, wildcards_fb, filename_fb ); +- Browse_Files( "Select File", 2048, directory_dat, wildcards_fb, filename_fb, receive_filename ); ++ Browse_Files( "Select File", 2048, working_dir, wildcards_fb, filename_fb, receive_filename ); + } + + +@@ -4019,6 +4021,7 @@ int main(int argc, char *argv[] ) + invocation_path[k] = '\0'; + // printf("Invocation path = '%s'\n", invocation_path); + set_ots_path(); ++ getcwd(working_dir, MaxFname+512); + + /* Decode any command-line arguments. */ + argn = 1; k=1; +-- +2.38.1 + -- cgit 1.4.1 From 3235b4f0ca4fcd0cca0dddbffbaf2f3b9800f713 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Feb 2023 11:49:02 +0100 Subject: gnu: emacs-corfu: Update to 0.35. * gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 0.35. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4839bb92a5..c627f603d5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3783,7 +3783,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.34") + (version "0.35") (source (origin (method git-fetch) @@ -3792,7 +3792,7 @@ of bibliographic references.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0cv0hcgsw4l8lk3gqwqlw91m4kc2dd80ndx06rg6czd22qdrd68m")))) + (base32 "1xqg796844wk6kvn3xw4bqlxn9ra6jlwk7rsc5gy4j77l0gwl441")))) (build-system emacs-build-system) (arguments `(#:phases @@ -3805,6 +3805,8 @@ of bibliographic references.") (for-each (lambda (f) (rename-file f (basename f))) el-files))))))) + (propagated-inputs + (list emacs-compat)) (home-page "https://github.com/minad/corfu") (synopsis "Completion overlay region function") (description -- cgit 1.4.1 From ecafebe21c555ffd6c07d37722a80c4ae3ea36d3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Feb 2023 11:50:55 +0100 Subject: gnu: emacs-marginalia: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 1.1. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c627f603d5..e11ac1ed06 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10664,7 +10664,7 @@ expansion and overwriting the marked region with a new snippet completion.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -10673,8 +10673,10 @@ expansion and overwriting the marked region with a new snippet completion.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rf4xgb82j1g6ybrzz7ak9hlk86d4r0hcprbqz05hvjnb8nyfa4c")))) + (base32 "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q")))) (build-system emacs-build-system) + (propagated-inputs + (list emacs-compat)) (home-page "https://github.com/minad/marginalia") (synopsis "Marginalia in the minibuffer completions") (description -- cgit 1.4.1 From 58cb4e28d30a06f831e047909314cb5820372bda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 18 Feb 2023 11:53:27 +0100 Subject: gnu: emacs-vertico: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 1.1. [propagated-inputs]: Add EMACS-COMPAT. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e11ac1ed06..4592a9c3ae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34431,7 +34431,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -34440,13 +34440,13 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g2zy70gks24g7i4qj1ijx57g016svbymb8l493j81c4bhc88mjl")))) + (base32 "0djc1im6caa67aq0bi8d607ycb1lq4lsirfqsx8kqbfl46852f60")))) (build-system emacs-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Move the extensions source files to the top level, which is included in - ;; the EMACSLOADPATH. + ;; Move the extensions source files to the top level, which is + ;; included in the EMACSLOADPATH. (add-after 'unpack 'move-source-files (lambda _ (let ((el-files (find-files "./extensions" ".*\\.el$"))) @@ -34455,6 +34455,8 @@ and preferred services can easily be configured.") el-files))))))) (native-inputs (list texinfo)) + (propagated-inputs + (list emacs-compat)) (home-page "https://github.com/minad/vertico") (synopsis "Vertical interactive completion") (description -- cgit 1.4.1 From 39c50eb49540bbc90b20152520be4fd095d5f979 Mon Sep 17 00:00:00 2001 From: Sughosha via Guix-patches via Date: Fri, 27 Jan 2023 16:44:38 +0000 Subject: gnu: Add nwg-launchers. * gnu/packages/xdisorg.scm (nwg-launchers): New variable. Co-authored-by: florhizome Signed-off-by: Nicolas Goaziou --- gnu/packages/xdisorg.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a92456f9e4..ddb70bd817 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -98,6 +98,7 @@ #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -3099,6 +3100,29 @@ such as sway, similar to @command{rofi}.") (home-page "https://hg.sr.ht/~scoopta/wofi") (license license:gpl3+))) +(define-public nwg-launchers + (package + (name "nwg-launchers") + (version "0.7.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nwg-piotr/nwg-launchers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hq2qiqxvrw3g515ywcb676ljc8mdw3pyslgxr3vahizfljah1pv")))) + (build-system meson-build-system) + (native-inputs (list json-modern-cxx pkg-config)) + (inputs (list gtk-layer-shell gtkmm-3 librsvg)) + (home-page "https://github.com/nwg-piotr/nwg-launchers") + (synopsis "Application launchers for wlroots") + (description + "This package provides an application grid, button bar, and dmenu +applications for Sway and other wlroots-based Wayland compositors.") + (license license:gpl3+))) + (define-public dex (package (name "dex") -- cgit 1.4.1 From a4b5876a77ba736f1dd1dccdc5eb333b0f54e47a Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Tue, 14 Feb 2023 20:37:01 +0200 Subject: gnu: openttd-engine: Update to 13.0. * gnu/packages/games.scm (openttd-engine): Update to 13.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f9b4505ffe..e1639a8c64 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -68,7 +68,7 @@ ;;; Copyright © 2021, 2022 Brendan Tildesley ;;; Copyright © 2021 Christopher Baines ;;; Copyright © 2021 Foo Chuan Wei -;;; Copyright © 2022 Yovan Naumovski +;;; Copyright © 2022, 2023 Yovan Naumovski ;;; Copyright © 2022 Roman Riabenko ;;; Copyright © 2022 zamfofex ;;; Copyright © 2022 Gabriel Arazas @@ -4410,14 +4410,14 @@ world}, @uref{http://evolonline.org, Evol Online} and (define openttd-engine (package (name "openttd-engine") - (version "12.2") + (version "13.0") (source (origin (method url-fetch) (uri (string-append "https://cdn.openttd.org/openttd-releases/" version "/openttd-" version "-source.tar.xz")) (sha256 (base32 - "0p79mi6hnj9138911l56zxxzy7rqz02nmxbf455jc31sx46qyl41")))) + "0rxbsymfirkw2d9hn2lmi8yhlfx7qvpzhy7y7b48fw42w3hgi79k")))) (build-system cmake-build-system) (inputs (list allegro -- cgit 1.4.1 From d292a63cdbf482e74dd6ec76c90696fff2a42305 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 15 Feb 2023 06:01:56 +0100 Subject: gnu: distrobox: Skip substitution in man pages. * gnu/packages/containers.scm (distrobox)[arguments]: Change refer-to-inputs phase to not substitute in man pages. Signed-off-by: Nicolas Goaziou --- gnu/packages/containers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 3982f4f059..272b67c38d 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -176,7 +176,7 @@ runtime (like runc or crun) for a single container.") #~(modify-phases %standard-phases (add-before 'install 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "^distrobox.*") + (substitute* (find-files "." "^distrobox.*[^1]$") (("podman") (search-input-file inputs "/bin/podman")) (("wget") (search-input-file inputs "/bin/wget")) (("command -v") "test -x")))) -- cgit 1.4.1 From 2fb42567ebd37cb63c431100021e1a895a2ff4b6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 12 Feb 2023 09:12:01 +0100 Subject: gnu: komikku: Update to 1.11.1. * gnu/packages/gnome.scm (komikku): Update to 1.11.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4698b883af..851b715283 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13270,7 +13270,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.10.1") + (version "1.11.1") (source (origin (method git-fetch) @@ -13280,7 +13280,7 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "17nyfpg15i87204017as2dq491bq3dy261flwx71b2z4f4k6q83b")))) + "0wvz7ca427x16vrjqzq7b9k1xlgdyhykdix41f48b1m3ry4wcqp2")))) (build-system meson-build-system) (arguments (list -- cgit 1.4.1 From 7ce9fe86a2e97d4bdec96b8a9ed8035ed7531aa1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:01 +0100 Subject: gnu: corefreq: Update to 1.95.2. * gnu/packages/linux.scm (corefreq): Update to 1.95.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 33faf8920d..9917f5d135 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1354,7 +1354,7 @@ and should be used with caution, especially on untested models.") (define-public corefreq (package (name "corefreq") - (version "1.90.1") + (version "1.95.2") (source (origin (method git-fetch) @@ -1363,7 +1363,7 @@ and should be used with caution, especially on untested models.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1fpmrqjwxvjbs23r73agjs322fbi4v1013cncbfyk6lcjghxab76")))) + (base32 "108fr056zmbipiv1nsrjccn3ky0jbcwan43big34nyq1c9dqjq1x")))) (build-system linux-module-build-system) (outputs (list "out" "linux-module")) (arguments -- cgit 1.4.1 From 0fbff222c49b1807fae2089b1462fa6e9aefb79f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: julia: Fix build. This follows up on commit 8d8e1438ae5a2e50005b500dacd0a26be540fe69. * gnu/packages/julia.scm (julia)[arguments]: Substitute* libgit2 version. Reported by francismb . --- gnu/packages/julia.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 12ff63905b..906cb4b94c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -319,6 +319,8 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (("4.1.0") ,(package-version (this-package-input "mpfr")))) (substitute* "stdlib/GMP_jll/test/runtests.jl" (("6.2.1") ,(package-version (this-package-input "gmp")))) + (substitute* "stdlib/LibGit2_jll/test/runtests.jl" + (("1.3.0") ,(package-version (this-package-input "libgit2")))) (substitute* "stdlib/nghttp2_jll/test/runtests.jl" (("1.48.0") ,(package-version (this-package-input "libnghttp2")))) (substitute* "stdlib/Zlib_jll/test/runtests.jl" -- cgit 1.4.1 From b795976778fa9e9a4e5b34161b526236057625eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2022 01:00:00 +0100 Subject: gnu: bcachefs-tools: Update to 0.1-16.46a6b92. * gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-16.46a6b92. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 471f943754..bbf308186c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -461,8 +461,8 @@ from a mounted file system.") (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "494421ee6e85514f90bb316d77e1dd4f7dad3420") - (revision "15")) + (let ((commit "46a6b9210c927ab46fd1227cb6f641be0b4a7505") + (revision "16")) (package (name "bcachefs-tools") (version (git-version "0.1" revision commit)) @@ -474,7 +474,7 @@ from a mounted file system.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1sdh9rl8ydnb28646773lsxpdy5jysvjbxs2nwr3hsv4qyv93vc4")))) + (base32 "0jblpwz8mxrx0pa2gc5bwj60qjj2c0zmd8r06f2bhgzs75avpkj3")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From ab0e14c41a76b0a512d909a58a2b981913b792e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Feb 2023 20:06:16 +0100 Subject: gnu: r-liger: Rename to r-rliger. Upstream changed the name to avoid a conflict with the liger package in CRAN. * gnu/packages/cran.scm (r-liger): Define as a deprecated alias for... (r-rliger): ...this new variable. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6cea202519..3b25b161f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23023,9 +23023,9 @@ complex composition of plots by providing mathematical operators for combining multiple plots.") (license license:expat))) -(define-public r-liger +(define-public r-rliger (package - (name "r-liger") + (name "r-rliger") (version "0.4.2") (source (origin @@ -23097,6 +23097,9 @@ integrative non-negative matrix factorization to identify shared and dataset-specific factors.") (license license:gpl3))) +(define-public r-liger + (deprecated-package "r-liger" r-rliger)) + (define-public r-harmony (package (name "r-harmony") -- cgit 1.4.1 From ce7e4b99f9748c38ba8985819a4060a7126ca2eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Feb 2023 20:11:35 +0100 Subject: gnu: r-readods: Update to 1.8.0. * gnu/packages/cran.scm (r-readods): Update to 1.8.0. [propagated-inputs]: Add r-purrr. [description]: Use complete sentences. --- gnu/packages/cran.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3b25b161f2..1dc046acbb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33905,25 +33905,25 @@ user streams, and to parse the output into data frames.") (define-public r-readods (package (name "r-readods") - (version "1.7.0") + (version "1.8.0") (source - (origin - (method url-fetch) - (uri (cran-uri "readODS" version)) - (sha256 - (base32 - "1hi217ab7hp15jsbzi5ak57cqf8jn2rv78bnn74q72gn9mrfra7n")))) + (origin + (method url-fetch) + (uri (cran-uri "readODS" version)) + (sha256 + (base32 + "1jdgp9vnm3sg4n34fl9ll7pkpac2lw7dg85mjkjwm1c63dfgrm0i")))) (properties `((upstream-name . "readODS"))) (build-system r-build-system) (propagated-inputs - (list r-cellranger r-readr r-stringi r-xml2)) + (list r-cellranger r-purrr r-readr r-stringi r-xml2)) (native-inputs (list r-knitr)) (home-page - "https://cran.r-project.org/package=readODS") + "https://cran.r-project.org/package=readODS") (synopsis "Read and Write ODS Files") (description - "Import @dfn{OpenDocument Spreadsheet} (ODS) into R as a data frame. -Also support writing data frame into ODS file.") + "This package lets you import @dfn{OpenDocument Spreadsheet} (ODS) into R +as a data frame. It also supports writing data frames to an ODS file.") (license license:gpl3))) (define-public r-qpdf -- cgit 1.4.1 From 16e0c98df7ebbda130c297578da07b9977fe93bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Feb 2023 22:41:29 +0100 Subject: gnu: r-flexdashboard: Update to 0.6.1. * gnu/packages/cran.scm (r-flexdashboard): Update to 0.6.1. [source]: Simplify and reformat snippet. [arguments]: Remove unnecessary module import; use esbuild in 'process-javascript phase. [native-inputs]: Replace node-uglify-js with esbuild. --- gnu/packages/cran.scm | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1dc046acbb..79c2c474b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21556,30 +21556,29 @@ interface for editing @code{ggplot2} theme elements.") (define-public r-flexdashboard (package (name "r-flexdashboard") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "flexdashboard" version)) (sha256 (base32 - "0bvw2ca6xxscia4hvq505qvjf6zkgpsqv86f1s78aknzwr9jsikm")) + "1lxlai4s3qdg2w36xx61idn67zidz9n5mmbz72i0zvcpxr25v5xl")) (modules '((guix build utils))) + ;; Delete bundled minified JavaScript files (snippet - '(begin - ;; Delete bundled minified JavaScript files - (delete-file "inst/htmlwidgets/lib/raphael/raphael-2.1.4.min.js") - (delete-file "inst/www/sly/sly.min.js") - (delete-file "inst/www/stickytableheaders/jquery.stickytableheaders.min.js") - (delete-file "inst/www/prism/prism.js") - (delete-file "inst/www/featherlight/featherlight.min.js"))))) + '(for-each delete-file + '("inst/htmlwidgets/lib/raphael/raphael-2.1.4.min.js" + "inst/www/featherlight/featherlight.min.js" + "inst/www/prism/prism.js" + "inst/www/sly/sly.min.js" + "inst/www/stickytableheaders/jquery.stickytableheaders.min.js"))))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) (guix build r-build-system) (srfi srfi-1) (srfi srfi-26) - (ice-9 popen) (ice-9 textual-ports)) #:phases (modify-phases %standard-phases @@ -21613,12 +21612,10 @@ interface for editing @code{ggplot2} theme elements.") "www/featherlight/featherlight.min.js")))) (lambda (sources targets) (for-each (lambda (source target) - (format #t "Processing ~a --> ~a~%" + (format #true "Processing ~a --> ~a~%" source target) - (let ((minified (open-pipe* OPEN_READ "uglifyjs" source))) - (call-with-output-file target - (lambda (port) - (dump-port minified port))))) + (invoke "esbuild" source "--minify" + (string-append "--outfile=" target))) sources targets))))))))) (propagated-inputs (list r-bslib @@ -21631,7 +21628,7 @@ interface for editing @code{ggplot2} theme elements.") r-scales r-shiny)) (native-inputs - `(("uglifyjs" ,node-uglify-js) + `(("uglifyjs" ,esbuild) ("js-raphael" ,(origin (method url-fetch) -- cgit 1.4.1 From 344f448d1dd0d262297e18850d04db52e3c00abd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 00:03:22 +0100 Subject: gnu: liblantern: Update to 0.9.1. * gnu/packages/machine-learning.scm (liblantern): Update to 0.9.1. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 162bdcb74f..449335174f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3407,7 +3407,7 @@ of Hidden Markov Models.") (define-public liblantern (package (name "liblantern") - (version "0.9.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -3416,7 +3416,7 @@ of Hidden Markov Models.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bjd0ym547k46ci8xnwsry7x8w5k65cl86snlcrfn4vs3fald2y9")))) + (base32 "1rycs7fgm03fxp8lxj8ljrdwy5whxd4554xzklbcmn4mcwbxgg57")))) (build-system cmake-build-system) (arguments (list -- cgit 1.4.1 From 2b9cb13796d953764800f349a5ed3775c22629c6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 00:03:53 +0100 Subject: gnu: r-torch: Update to 0.9.1. * gnu/packages/cran.scm (r-torch): Update to 0.9.1. [propagated-inputs]: Add r-glue. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 79c2c474b8..52af3c7b63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26179,13 +26179,13 @@ Visualizations are also available for most of these settings.") (define-public r-torch (package (name "r-torch") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) (uri (cran-uri "torch" version)) (sha256 - (base32 "1iylnz0hsi00q7hngi2h24kg3nvjjg10z6iarqhp3wylsasgjs1f")))) + (base32 "03qbdws6j5v2vmdgdnwfd0248s2qirnxpm9v4302vqlq3c0i83c2")))) (properties `((upstream-name . "torch"))) (build-system r-build-system) (arguments @@ -26217,6 +26217,7 @@ Visualizations are also available for most of these settings.") r-cli r-coro r-ellipsis + r-glue r-magrittr r-r6 r-rcpp -- cgit 1.4.1 From 6a3144bd27df38ce1538a42a7977df25ba655eda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 13:01:54 +0100 Subject: gnu: Add r-gfonts. * gnu/packages/cran.scm (r-gfonts): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 52af3c7b63..b110cee0ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -541,6 +541,34 @@ by Luis Torgo, published by CRC Press.") Distance (EMD).") (license license:expat))) +(define-public r-gfonts + (package + (name "r-gfonts") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (cran-uri "gfonts" version)) + (sha256 + (base32 + "19ja087k767bq71v2w4jcpynd62ysrqmjf6rpfnmmd40aanyxqkj")))) + (properties `((upstream-name . "gfonts"))) + (build-system r-build-system) + (propagated-inputs + (list r-crayon + r-crul + r-glue + r-htmltools + r-jsonlite + r-shiny)) + (native-inputs (list r-knitr)) + (home-page "https://dreamrs.github.io/gfonts/") + (synopsis "Offline Google fonts for Markdown and Shiny") + (description + "This package lets you download Google fonts and generate CSS to use in +rmarkdown documents and Shiny applications. Some popular fonts are included +and ready to use.") + (license license:gpl3))) + (define-public r-ggalt (package (name "r-ggalt") -- cgit 1.4.1 From 41c41e9f81685ea1edabb7f88542cfb725adac87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 15:51:09 +0100 Subject: gnu: r-sendmailr: Update to 1.4-0. * gnu/packages/statistics.scm (r-sendmailr): Update to 1.4-0. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b41e89075f..58b933f033 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1138,20 +1138,20 @@ designed by Cynthia Brewer as described at http://colorbrewer2.org") (define-public r-sendmailr (package (name "r-sendmailr") - (version "1.3-2") + (version "1.4-0") (source (origin (method url-fetch) (uri (cran-uri "sendmailR" version)) (sha256 (base32 - "0yyxxzhm88xipk68vzqxcckcpjgl9lajnqyxxbkp1i29jcpfgdfa")))) + "1balci88r2ci51xdh5zaqm3ss3vnry8pbkx2qngppc7n2gy932sv")))) (properties `((upstream-name . "sendmailR"))) (build-system r-build-system) (propagated-inputs (list r-base64enc)) - (home-page - "https://cran.r-project.org/web/packages/sendmailR") + (native-inputs (list r-knitr)) + (home-page "https://cran.r-project.org/web/packages/sendmailR") (synopsis "Send email using R") (description "This package contains a simple SMTP client which provides a portable -- cgit 1.4.1 From 7d01489a9fee99d32235dbad2d4d9150787ec6cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 15:53:09 +0100 Subject: gnu: r-d3r: Update to 1.0.1. * gnu/packages/cran.scm (r-d3r): Update to 1.0.1. [source]: Delete minified JavaScript in snippet. [arguments]: Do not delete minified JavaScript here. [native-inputs]: Update hash for d3.v7.js. --- gnu/packages/cran.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b110cee0ca..c6ae66ea48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3817,14 +3817,21 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (define-public r-d3r (package (name "r-d3r") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "d3r" version)) (sha256 (base32 - "1qijkllfaaw0lb29j8mappm8jz9kg8gkihxq5wqhb4gabsazdwva")))) + "07n92x047l6savy8s5r3rj15nmjgswl1shl1dyzrzhgpa5jrpxf3")) + (snippet + '(for-each delete-file + '("inst/www/d3/v3/dist/d3.min.js" + "inst/www/d3/v4/dist/d3.min.js" + "inst/www/d3/v5/dist/d3.min.js" + "inst/www/d3/v6/dist/d3.min.js" + "inst/www/d3/v7/dist/d3.min.js"))))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) @@ -3852,7 +3859,6 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (for-each (lambda (source target) (format #t "Processing ~a --> ~a~%" source target) - (delete-file target) (invoke "esbuild" source "--minify" (string-append "--outfile=" target))) sources targets))))))))) @@ -3894,7 +3900,7 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (uri "https://d3js.org/d3.v7.js") (sha256 (base32 - "1hif1phswlkkpvcf1hbqmfsxdb5s5gr5g2frcwbh0rh8g6nbkyqi")))))) + "1m4i3kqzkz7w06sp9zqcy9f88xpdhi7cqih3phdrf4yjmfk1pfjg")))))) (home-page "https://github.com/timelyportfolio/d3r") (synopsis "d3.js utilities for R") (description -- cgit 1.4.1 From 854fea4618551aa5e14001cc079e41ef59c4ca12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:04 +0100 Subject: gnu: r-wgcna: Update to 1.72-1. * gnu/packages/bioconductor.scm (r-wgcna): Update to 1.72-1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d2eb9a0daf..1a9218d5b6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16855,14 +16855,14 @@ S4Vectors package itself.") (define-public r-wgcna (package (name "r-wgcna") - (version "1.71") + (version "1.72-1") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "027pkc4pyn9bifqbjs05318gvlm06mffw016j50n59wfi2g39x91")))) + "1p3zsl5r6l5r6ylnrxmbxjpim5qgmncgdjcgn5j69rzk3rv85gqx")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0b781446886403100a27ab0dead6e6dd15f7e1ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:11 +0100 Subject: gnu: r-abn: Update to 2.7-3. * gnu/packages/bioconductor.scm (r-abn): Update to 2.7-3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a9218d5b6..4b5ec7db28 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -18211,14 +18211,14 @@ on the plot.") (define-public r-abn (package (name "r-abn") - (version "2.7-1") + (version "2.7-3") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "1w3jns96m8b9scvaa4hcla3i88a0cfh9qis2l04yixvda5q91gpr")))) + "02qmp3ky671fkpjq1vcb083zzvfn5gkf69rhvdlvg7siy5wrjll3")))) (build-system r-build-system) (inputs (list gsl)) -- cgit 1.4.1 From d7ac85d4e3d8f064d0a8fedf04f6ca7974864a55 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:11 +0100 Subject: gnu: r-fontawesome: Update to 0.5.0. * gnu/packages/cran.scm (r-fontawesome): Update to 0.5.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c6ae66ea48..580ffd8629 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1452,13 +1452,13 @@ series of numeric vectors/matrices and factors.") (define-public r-fontawesome (package (name "r-fontawesome") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "fontawesome" version)) (sha256 - (base32 "0br4sjl2z5av5kf42mnp35sichk3syrz68xic08wxnqdnp2hn2kn")))) + (base32 "02z9jqvwn8bhwbkxlx9f42x4qlz7akmmjw0xi0kdd0iylcbv85s1")))) (properties `((upstream-name . "fontawesome"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 1ff96c7db3684ad11da0f5235222614f5ac26717 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:12 +0100 Subject: gnu: r-ggalluvial: Update to 0.12.4. * gnu/packages/cran.scm (r-ggalluvial): Update to 0.12.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 580ffd8629..6e2ba61ca1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1524,13 +1524,13 @@ in good performances with large files.") (define-public r-ggalluvial (package (name "r-ggalluvial") - (version "0.12.3") + (version "0.12.4") (source (origin (method url-fetch) (uri (cran-uri "ggalluvial" version)) (sha256 (base32 - "0mkan9gxg3yxjism22yxbhvlh2lh7wpbrqpb355za790prcmjbh3")))) + "0x2njwgsjrcl4g9md32a2l5b7cvisj5g93jjzm7kr3g7l9gwbzz3")))) (properties `((upstream-name . "ggalluvial"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From e78754a7ca50d9e0933da28246a1ae0f70390a4e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:12 +0100 Subject: gnu: r-ggpp: Update to 0.5.1. * gnu/packages/cran.scm (r-ggpp): Update to 0.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6e2ba61ca1..a414497116 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1553,14 +1553,14 @@ variables.") (define-public r-ggpp (package (name "r-ggpp") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "ggpp" version)) (sha256 (base32 - "0zmxnzsdmwv9v77fifgiknalwif59261kslq8848x1xch8f82l77")))) + "0cbv09gvwrxj5k8ffh4v537cf4hx3z2zgs8yy0ssglslibfgd3ka")))) (properties `((upstream-name . "ggpp"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 31e137465db81d920425bcf70dcb4f4697ecfb88 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:13 +0100 Subject: gnu: r-astsa: Update to 2.0. * gnu/packages/cran.scm (r-astsa): Update to 2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a414497116..deda86ead0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2483,13 +2483,13 @@ read a protected key.") (define-public r-astsa (package (name "r-astsa") - (version "1.16") + (version "2.0") (source (origin (method url-fetch) (uri (cran-uri "astsa" version)) (sha256 - (base32 "09872vkqb180cwprdfr3cn85jhazlc4vjdj6pjc70s06bh834f3w")))) + (base32 "0rv4fnz5bbd6f8b6fwa2ljdjq5yx0qi7hcbhrgvrbibl2pzfm7w7")))) (properties `((upstream-name . "astsa"))) (build-system r-build-system) (home-page "https://github.com/nickpoison/astsa/") -- cgit 1.4.1 From 9c308e864e8c042fdc664a76cfee49907e350db2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:13 +0100 Subject: gnu: r-httpuv: Update to 1.6.8. * gnu/packages/cran.scm (r-httpuv): Update to 1.6.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index deda86ead0..d84c5ccb31 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2887,13 +2887,13 @@ Zucchini.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.6.7") + (version "1.6.8") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "0jjb2w59x8a4k24j9rc4rjm37h1ccrfq1nzd40inbnd6kcqf3lkm")) + "0fljspgdiihn736s8wj6ri28sggw1sd3zfi5qav3gzrsqm2z29xz")) ;; Unvendor bundled libraries. As of 1.5.4 the vendored libuv ;; only contains fixes for building on Solaris. (patches (search-patches "r-httpuv-1.6.6-unvendor-libuv.patch")) -- cgit 1.4.1 From 3d3c264ac551ce94567b2a29b6e2b78d2ce53021 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:13 +0100 Subject: gnu: r-curl: Update to 5.0.0. * gnu/packages/cran.scm (r-curl): Update to 5.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d84c5ccb31..eb6f710449 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3114,13 +3114,13 @@ LaTeX.") (define-public r-curl (package (name "r-curl") - (version "4.3.3") + (version "5.0.0") (source (origin (method url-fetch) (uri (cran-uri "curl" version)) (sha256 (base32 - "17kwc7njblfndnlij0m5a7a3jj42ag412xg0ry5ddnj0mnnbcrrm")))) + "1cn9b6xcc6xp2q66pkla6xrq4v6rbpxfcr3gizx4z48knp4wmwyp")))) (build-system r-build-system) (arguments `(#:phases -- cgit 1.4.1 From 8fadc29d3d89371578541aa04f2ab53ca9a5b786 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:14 +0100 Subject: gnu: r-sass: Update to 0.4.5. * gnu/packages/cran.scm (r-sass): Update to 0.4.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb6f710449..2f9747d81b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3358,14 +3358,14 @@ conditionals and comparisons, and more.") (define-public r-sass (package (name "r-sass") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "sass" version)) (sha256 (base32 - "0hk5svmpbhx9q3ni3qll2pa7q3pfc0zxv616kp62r6vakn1az16j")))) + "143s030qicvsacwwrirhqkg3l3d285myqq8bij611nyjhbcn38gb")))) (properties `((upstream-name . "sass"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 2674b554464252b564bc3744a115c3db12cfbf45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:14 +0100 Subject: gnu: r-mapproj: Update to 1.2.11. * gnu/packages/cran.scm (r-mapproj): Update to 1.2.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2f9747d81b..3e2d26280e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4303,14 +4303,14 @@ Projection code and larger maps are in separate packages (@code{mapproj} and (define-public r-mapproj (package (name "r-mapproj") - (version "1.2.9") + (version "1.2.11") (source (origin (method url-fetch) (uri (cran-uri "mapproj" version)) (sha256 (base32 - "10nzfbyfkc545qxf51i33g0f8iiidcnhj971ylphnbh7j2sgla6s")))) + "0z9lhv006pw4mwqlghvgvv66ga958bs6n1k6fmqjdpirr4f20bfv")))) (build-system r-build-system) (propagated-inputs (list r-maps)) (home-page "https://cran.r-project.org/web/packages/mapproj") -- cgit 1.4.1 From b51965e445dbf8457af917f249ab1211ec477b3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:14 +0100 Subject: gnu: r-colorspace: Update to 2.1-0. * gnu/packages/cran.scm (r-colorspace): Update to 2.1-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3e2d26280e..2e74d16f0d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4570,13 +4570,13 @@ XML. To learn more about the Abbyy OCR API, see @url{http://ocrsdk.com/}.") (define-public r-colorspace (package (name "r-colorspace") - (version "2.0-3") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "colorspace" version)) (sha256 - (base32 "0zw52s8g2gxp8i1ax96azxmxqrbhb7aad5px0c1vgr6n9p682mp7")))) + (base32 "0k31hazd2rq5lyg3y89y2v5jqadz2qlxd1bhvj89q4aldfxql1q4")))) (build-system r-build-system) (native-inputs (list r-knitr)) -- cgit 1.4.1 From 0adddb6afdb8f672c04d066225e18fa0d2b829da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:14 +0100 Subject: gnu: r-rcpp: Update to 1.0.10. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2e74d16f0d..69fef5e166 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4887,13 +4887,13 @@ value for each cluster in a dendrogram.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "0xli48y9nsj8x8p5vkhisiz4l23g8r2623rn0i4xb5javh3fqz40")))) + (base32 "0inmnmi0pqmbqnl00d5yal1bmd7awigxd7sgzjsil9c1k55f4r8y")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") -- cgit 1.4.1 From 34be3e5a0627af3de2cd6fdb74f2a16234cb776d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:15 +0100 Subject: gnu: r-ff: Update to 4.0.9. * gnu/packages/cran.scm (r-ff): Update to 4.0.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 69fef5e166..f607cf697f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5318,14 +5318,14 @@ any subsequent lookup as it keeps the hash table in memory.") (define-public r-ff (package (name "r-ff") - (version "4.0.7") + (version "4.0.9") (source (origin (method url-fetch) (uri (cran-uri "ff" version)) (sha256 (base32 - "1yl3ipzz9bjkfy9bbna7xz5n7iz4lchnw5l7agww7by764yk6iqa")))) + "0krwxq4985x3n5mzx8i9smwpkd5sifbfgy9z7ikwk84734km683j")))) (build-system r-build-system) (propagated-inputs (list r-bit)) (home-page "http://ff.r-forge.r-project.org/") -- cgit 1.4.1 From 82a684e538cd48f96b97bf17478242bd81d5b01a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:15 +0100 Subject: gnu: r-sp: Update to 1.6-0. * gnu/packages/cran.scm (r-sp): Update to 1.6-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f607cf697f..9013bcb443 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5554,13 +5554,13 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "1.5-1") + (version "1.6-0") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "1pr9yb2wqapyizdfpi7zqd4a5b40q58czbfj6svvp2fkh6sfmfb9")))) + (base32 "1npwz49qmlqz46jrwlmv4929hb3wv3whxzj1bplyipp7h2z7z5zm")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) -- cgit 1.4.1 From 19353560c5410db8256353c4712b39eade55f498 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:15 +0100 Subject: gnu: r-lpsolve: Update to 5.6.18. * gnu/packages/cran.scm (r-lpsolve): Update to 5.6.18. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9013bcb443..81239062a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5959,14 +5959,14 @@ topics for ecologists (ISBN 978-0-691-12522-0).") (define-public r-lpsolve (package (name "r-lpsolve") - (version "5.6.17") + (version "5.6.18") (source (origin (method url-fetch) (uri (cran-uri "lpSolve" version)) (sha256 (base32 - "124jdjvxi1kqfd10jv85jqllvba1hi2z4j5g7n8wc1fwv4mq09gp")))) + "04p71mcpksighyvl74ffvgxzc7iiv7nafphddhmqa6yqzhk1j7km")))) (properties `((upstream-name . "lpSolve"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/lpSolve") -- cgit 1.4.1 From 76f2fbeae0feab21887fed133a33d01c2b785186 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:16 +0100 Subject: gnu: r-progressr: Update to 0.13.0. * gnu/packages/cran.scm (r-progressr): Update to 0.13.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81239062a8..1834fe8b1e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6212,13 +6212,13 @@ available in a vignette.") (define-public r-progressr (package (name "r-progressr") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "progressr" version)) (sha256 - (base32 "0nahvfcnx45n0q24r4j9cjqmmgh302ra3207izs6fzfda7sqn25q")))) + (base32 "1qd4yn6hhqxjpd7ckkrrqcpmx9ha01fy1y8gmldikk70vp53vyqg")))) (properties `((upstream-name . "progressr"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 485bdfd7d088fcc1178d7eaa9305500105befbef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:16 +0100 Subject: gnu: r-timechange: Update to 0.2.0. * gnu/packages/cran.scm (r-timechange): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1834fe8b1e..c0766213f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6329,13 +6329,13 @@ methods.") (define-public r-timechange (package (name "r-timechange") - (version "0.1.1") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "timechange" version)) (sha256 (base32 - "0w3zbmzhg3zr5d9aa83kmr6gyhk75l7jysa7zs0pnz9x4ffr20w5")))) + "1wgpab9dvmvkfb1p1arj0knb8qal9hazbhx5jkpxl8r10l420q1x")))) (properties `((upstream-name . "timechange"))) (build-system r-build-system) (propagated-inputs (list r-cpp11)) -- cgit 1.4.1 From 61f15b7f4813ebb9d5940f0d40a73c48bbd6eb62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:16 +0100 Subject: gnu: r-rpostgres: Update to 1.4.5. * gnu/packages/cran.scm (r-rpostgres): Update to 1.4.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c0766213f0..f4b23f74d7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6450,14 +6450,14 @@ to access PostgreSQL database systems.") (define-public r-rpostgres (package (name "r-rpostgres") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "RPostgres" version)) (sha256 (base32 - "1z6diaq4kwinl97d1v9cb96j8mrkj2s2v4ml1vykgy1jqi40dk69")))) + "15y732ylnq1h1hw16nh1ichnygh3l76h23m2893avpaipa689zvh")))) (properties `((upstream-name . "RPostgres"))) (build-system r-build-system) (inputs (list postgresql)) -- cgit 1.4.1 From 0114596dae70eb9a77009779e83abddadacf973b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:17 +0100 Subject: gnu: r-geometry: Update to 0.4.7. * gnu/packages/cran.scm (r-geometry): Update to 0.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f4b23f74d7..9246e34fbb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6502,14 +6502,14 @@ Optimization problems by using the simplex algorithm.") (define-public r-geometry (package (name "r-geometry") - (version "0.4.6.1") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "geometry" version)) (sha256 (base32 - "0wplszaxi6phxffp3zww5alwnfbh9521qi43h65w057lrm1pmj2j")))) + "0fq1sbjlc02idfsnvily7hgi6zgjvrjh7c57wz166k8vyl2l484n")))) (build-system r-build-system) (propagated-inputs (list r-magic r-linprog r-lpsolve r-rcpp r-rcppprogress)) -- cgit 1.4.1 From b02c6d25838873951c4fbac16214bcc1416bd0bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:17 +0100 Subject: gnu: r-broom: Update to 1.0.3. * gnu/packages/cran.scm (r-broom): Update to 1.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9246e34fbb..e2f6a3c294 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6691,14 +6691,14 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "13hj4y3ajrn7x8hvirp2vfh1c8j2pdrz3dnxc5f0dr7jyfhp4dcy")))) + "0m8akaj72kfvp7wmfp52dx09pfigb9w0knl55bfj8cg0kq6g3cq6")))) (build-system r-build-system) (propagated-inputs (list r-backports -- cgit 1.4.1 From 2a0d4733e3f839a945a43f408043cffc53739bb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:17 +0100 Subject: gnu: r-recipes: Update to 1.0.4. * gnu/packages/cran.scm (r-recipes): Update to 1.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e2f6a3c294..5039d30d7e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6729,14 +6729,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "0pi7j1jj5dmc5kzx6zkm691xya7dw4fn8c8nb2x3gs8mp14spzhg")))) + "16bf9d9kvhvgcs603zz075hwjrzjd81g14p8cp5rs0z4bnrdrcj2")))) (build-system r-build-system) (propagated-inputs (list r-cli -- cgit 1.4.1 From e91463c9acdf9225d909611fcfcd70a6e92838b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:18 +0100 Subject: gnu: r-ggrepel: Update to 0.9.3. * gnu/packages/cran.scm (r-ggrepel): Update to 0.9.3. [propagated-inputs]: Add r-withr. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5039d30d7e..096d3b239e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6800,17 +6800,17 @@ for certain use cases.") (define-public r-ggrepel (package (name "r-ggrepel") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (cran-uri "ggrepel" version)) (sha256 (base32 - "123lh86qs7w1i3v8i1a08jxlwx4sy32bpznyclm8wlkph728hc0a")))) + "0p00kb1x3q0krk5g8mmwqknnjlsznqs4i7mlfq1dp17fxpia1sxr")))) (build-system r-build-system) (propagated-inputs - (list r-ggplot2 r-rcpp r-rlang r-scales)) + (list r-ggplot2 r-rcpp r-rlang r-scales r-withr)) (native-inputs (list r-knitr)) ; for vignettes (home-page "https://github.com/slowkow/ggrepel") -- cgit 1.4.1 From e9048fb20944038bf04f55422f383c59a4502c95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:18 +0100 Subject: gnu: r-smurf: Update to 1.1.4. * gnu/packages/cran.scm (r-smurf): Update to 1.1.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 096d3b239e..268d706543 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7249,13 +7249,13 @@ and density estimation") (define-public r-smurf (package (name "r-smurf") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (cran-uri "smurf" version)) (sha256 (base32 - "0n99dzsb17r0a6d8nkijfg6rdvvc2g4pard2dnmyjq0p69j3f3gb")))) + "09a56ayqnnal1h5xxnh4pcn0zyi1kg2fj40y872n4jcnbl8xcvbi")))) (properties `((upstream-name . "smurf"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0c6d303ae7b6271846ef3b6e4764f0c794061edc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:18 +0100 Subject: gnu: r-vcd: Update to 1.4-11. * gnu/packages/cran.scm (r-vcd): Update to 1.4-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 268d706543..22282885cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7432,14 +7432,14 @@ modeling for empirical income distributions.") (define-public r-vcd (package (name "r-vcd") - (version "1.4-10") + (version "1.4-11") (source (origin (method url-fetch) (uri (cran-uri "vcd" version)) (sha256 (base32 - "0nxkl1x39xf8l0apgvlbr30i8lasix7hyyc93g6514r8z8m1k23i")))) + "0ch9ks25ab4h4fh4y267s0psvc4ndyaplk8ddva2j54yd1ayhm3s")))) (build-system r-build-system) (propagated-inputs (list r-colorspace r-lmtest r-mass)) -- cgit 1.4.1 From 7aaacd3f312f34723517535df732eb1b04f67850 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:19 +0100 Subject: gnu: r-cli: Update to 3.6.0. * gnu/packages/cran.scm (r-cli): Update to 3.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 22282885cf..3f0b24b5cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7665,14 +7665,14 @@ multivariate function estimation using smoothing splines.") (define-public r-cli (package (name "r-cli") - (version "3.5.0") + (version "3.6.0") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "1p3gzq30f7hpr3v2s555z18r0y57zq2h03kijv7rl48lqzbnrjwc")))) + "15mqi8cacj7x588f1a7x805lwqbga2ha62k79qyxahrhh0qq21xn")))) (build-system r-build-system) (home-page "https://github.com/r-lib/cli#readme") (synopsis "Helpers for developing command line interfaces") -- cgit 1.4.1 From 1113985a7758e38cdfc347773db4642e128c3ceb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:19 +0100 Subject: gnu: r-tsp: Update to 1.2-2. * gnu/packages/cran.scm (r-tsp): Update to 1.2-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3f0b24b5cc..3a7858ced1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7821,14 +7821,14 @@ operations and statistical functions are provided.") (define-public r-tsp (package (name "r-tsp") - (version "1.2-1") + (version "1.2-2") (source (origin (method url-fetch) (uri (cran-uri "TSP" version)) (sha256 (base32 - "1pa6pb4qrh2iybpjzjiny6hshj0shjdm0pxqnidcrg5hyfzzxd9b")))) + "08x6kb5nlajlbndzf7mn59gfg0xv6m0pql6jm76g037w4f7qlpca")))) (properties `((upstream-name . "TSP"))) (build-system r-build-system) (propagated-inputs (list r-foreach)) -- cgit 1.4.1 From 214346c609469f8eec0697d4cc7dc554a4222113 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:19 +0100 Subject: gnu: r-xfun: Update to 0.37. * gnu/packages/cran.scm (r-xfun): Update to 0.37. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3a7858ced1..53e8bd557f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7939,13 +7939,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.36") + (version "0.37") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "1vk930bn7rp2qp8yvmd9d3lgi10rgf20n62jr3lfwi6hf7jhs5x8")))) + (base32 "1yg1b21nwpnggb498z0j3lp11w6fwni7q7rd88fnm8xfnbq9yq9v")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit 1.4.1 From 63aa70ffc4105218b2d5bc8c389eb4f1a590edcf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:20 +0100 Subject: gnu: r-utf8: Update to 1.2.3. * gnu/packages/cran.scm (r-utf8): Update to 1.2.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 53e8bd557f..2b50bc1227 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7961,14 +7961,14 @@ packages maintained by Yihui Xie.") (define-public r-utf8 (package (name "r-utf8") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "utf8" version)) (sha256 (base32 - "1x6qg19z4qih9lk3mvnmx0vailm1khp5lylw4hlwz6rssj3yw6m7")))) + "0iv3ppy7sddzl4sm3qlghpc64k6zx5j0jzcia8xx8jhzb638da60")))) (build-system r-build-system) (native-inputs (list r-knitr r-rmarkdown)) ; for vignettes -- cgit 1.4.1 From f66564248c4685ee2cb75c5e9825b86dd2c348f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:20 +0100 Subject: gnu: r-vctrs: Update to 0.5.2. * gnu/packages/cran.scm (r-vctrs): Update to 0.5.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2b50bc1227..651c2b0ebd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8026,14 +8026,14 @@ estimated from a given sample.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "01yv85rjpn9cz4473m768awrcaif51ffjh29p097c7pj2zvq4ya9")))) + "0iy0v00vhb6ldgw8g109wacpcxh1g9ks3npzaqzy4ccv7cj11gvn")))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-lifecycle r-rlang)) -- cgit 1.4.1 From f72edb39377a378577ed31a15d0f20b46cfc53fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:20 +0100 Subject: gnu: r-tinytex: Update to 0.44. * gnu/packages/cran.scm (r-tinytex): Update to 0.44. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 651c2b0ebd..c87a4006fd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8155,14 +8155,14 @@ their own grammars and easily expose them in R packages.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.43") + (version "0.44") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "01183i6z6jyyqmmxri3xmscn7k6hswi2q7r0b5ix0s7pd1cz57jq")))) + "03k26cm5chlysmi416zd506asv0gbmxs5i0j1fc0ygsrfh94r8dg")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) -- cgit 1.4.1 From 11128897fb1b38ea9fd37ee443e063c3b683dbd8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:20 +0100 Subject: gnu: r-network: Update to 1.18.1. * gnu/packages/cran.scm (r-network): Update to 1.18.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c87a4006fd..20232df184 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8214,14 +8214,14 @@ features: (define-public r-network (package (name "r-network") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (cran-uri "network" version)) (sha256 (base32 - "0nyf8i94lnqm4gfjz1szbwvl4c438xg3rjdkqr18fz68fh0v3x2r")))) + "0hyj7h0z6mvf0jq0fb5z9nny4c71pwqjl7w0z864in3754sp03f8")))) (build-system r-build-system) (propagated-inputs (list r-magrittr r-statnet-common r-tibble)) -- cgit 1.4.1 From 9b06a73fad54beffb75a063449baff01e5c629b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:21 +0100 Subject: gnu: r-statnet-common: Update to 4.8.0. * gnu/packages/cran.scm (r-statnet-common): Update to 4.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 20232df184..41c698c8d6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8283,14 +8283,14 @@ vectors.") (define-public r-statnet-common (package (name "r-statnet-common") - (version "4.7.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (cran-uri "statnet.common" version)) (sha256 (base32 - "1cx1h1yzs8jjxk10y2h0wl69caspzgx5wdqp36dp4sxm0sk335xn")))) + "1w26g7nzvmawm8jqd0hsjr8lz1jr4l565wzcbwqwpyvk0q9rkyfy")))) (properties `((upstream-name . "statnet.common"))) (build-system r-build-system) -- cgit 1.4.1 From 9174af0d30ff0fdf7d757a03c60a3eec73a80417 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:21 +0100 Subject: gnu: r-statcheck: Update to 1.4.0. * gnu/packages/cran.scm (r-statcheck): Update to 1.4.0. [propagated-inputs]: Add r-rlang. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 41c698c8d6..fa98caecd7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8305,17 +8305,17 @@ software developed by the Statnet Project.") (define-public r-statcheck (package (name "r-statcheck") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "statcheck" version)) (sha256 (base32 - "0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp")))) + "1hibrynbgsym4hma8isby8kwb8gab9d4bx7m43qj4zayrl6b8scx")))) (build-system r-build-system) (propagated-inputs - (list r-ggplot2 r-plyr r-rmarkdown)) + (list r-ggplot2 r-plyr r-rlang r-rmarkdown)) (home-page "https://cran.r-project.org/web/packages/statcheck/") (synopsis "Extract statistics from articles and recompute p-values") (description "This package can automatically extract statistical -- cgit 1.4.1 From 172e691f34e2d192075fb3da76db8d6870da8ab4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:21 +0100 Subject: gnu: r-sna: Update to 2.7-1. * gnu/packages/cran.scm (r-sna): Update to 2.7-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fa98caecd7..7c32197d43 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8327,14 +8327,14 @@ detect possible inconsistencies.") (define-public r-sna (package (name "r-sna") - (version "2.7") + (version "2.7-1") (source (origin (method url-fetch) (uri (cran-uri "sna" version)) (sha256 (base32 - "0ka319s1w857fj28ja1i1ljgv2h6ji4d69riqy9pwhvvghsa83s4")))) + "1qqaazcc8x925bwa9yllwyv98ddpdqgdq026h0ss6vsvq4bz5nk0")))) (build-system r-build-system) (propagated-inputs (list r-network r-statnet-common)) -- cgit 1.4.1 From d99a717afe239f28453b226c41bbf9a561df7553 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:22 +0100 Subject: gnu: r-tseries: Update to 0.10-53. * gnu/packages/cran.scm (r-tseries): Update to 0.10-53. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7c32197d43..cece554798 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8740,14 +8740,14 @@ financial trading strategies.") (define-public r-tseries (package (name "r-tseries") - (version "0.10-52") + (version "0.10-53") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "0icgmng0dzvfkkn6dam74wvlz8g0cy46wkw57f5lpd5kxpdwi6ck")))) + "0mnazjzi9pldzlzjwgrfk0s3f7ykjgbj5gzcpfz2nx92s3k8wf7c")))) (build-system r-build-system) (propagated-inputs (list r-quadprog r-quantmod r-zoo)) -- cgit 1.4.1 From e08f0541b88e637117f93f293b964758491cf000 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:22 +0100 Subject: gnu: r-cubature: Update to 2.0.4.6. * gnu/packages/cran.scm (r-cubature): Update to 2.0.4.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cece554798..35bde3277d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8931,14 +8931,14 @@ applied econometric analysis.") (define-public r-cubature (package (name "r-cubature") - (version "2.0.4.5") + (version "2.0.4.6") (source (origin (method url-fetch) (uri (cran-uri "cubature" version)) (sha256 (base32 - "08whkhvn218089r930spn97m91vv1njgh2amksia8l3rbf7127x8")))) + "0nprx74mcsw4zz89gc3c53nw2iyyqalfyh7xfda83xlvpv19s31k")))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) -- cgit 1.4.1 From 8f2e4a707d3137aeb05f7a6059d4e220c4f10d55 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:22 +0100 Subject: gnu: r-radiant-data: Update to 1.5.1. * gnu/packages/cran.scm (r-radiant-data): Update to 1.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 35bde3277d..2766368af9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9428,14 +9428,14 @@ local smoothers and many more.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.4.5") + (version "1.5.1") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "1vas0bkpngwxybmpdcaimha2r008prnli4b3lgjbjfkzpgm966d1")) + "1q6v7pkqk8rbxrmbnyj9drqb0p2rk8v4d3fxw1gqmqhzd6qp4yab")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 0ce18fd937ec589ee31a4deb7b257c486ed51ef0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:23 +0100 Subject: gnu: r-openxlsx: Update to 4.2.5.2. * gnu/packages/cran.scm (r-openxlsx): Update to 4.2.5.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2766368af9..ffc0b30f5d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9988,14 +9988,14 @@ additional external tools on any platform.") (define-public r-openxlsx (package (name "r-openxlsx") - (version "4.2.5.1") + (version "4.2.5.2") (source (origin (method url-fetch) (uri (cran-uri "openxlsx" version)) (sha256 (base32 - "1j2516plvlrp7l0mw7xqjhjjcidfdnfsybdhi2bx3n0910w29lk4")))) + "0rwvzhk2brhbf1cdpg5jmwiwx5jhr9ybzvnhw0pg4bl3wpkqjw7f")))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-stringi r-zip)) -- cgit 1.4.1 From 8f9099e1d9cc4b7c3b2835c80c45be1b12821046 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:23 +0100 Subject: gnu: r-fstcore: Update to 0.9.14. * gnu/packages/cran.scm (r-fstcore): Update to 0.9.14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ffc0b30f5d..35471da53f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10147,13 +10147,13 @@ using the @code{snow} package.") (define-public r-fstcore (package (name "r-fstcore") - (version "0.9.12") + (version "0.9.14") (source (origin (method url-fetch) (uri (cran-uri "fstcore" version)) (sha256 - (base32 "1a5m68n2dqhi3r8wf5jwg4vjvl550c7wypcf5j0xmkvl836yg1lg")))) + (base32 "0mhk4l86iypg86l0jjs7szxllcy10h4rh5qy2gsmpmiv003gm3nh")))) (properties `((upstream-name . "fstcore"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) -- cgit 1.4.1 From 111e5f71f5b5a3930a7dabe73a309bdb144585e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:23 +0100 Subject: gnu: r-reticulate: Update to 1.28. * gnu/packages/cran.scm (r-reticulate): Update to 1.28. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 35471da53f..07144e83ac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10661,14 +10661,14 @@ always locate the files relative to your project root.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.27") + (version "1.28") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "19k96g43ll9zp72g9kmf9gg7k9cwwpyxzf2nd6fvx5jal5bq8mlx")))) + "0vsia6rcr4nlvzpnpwy9izhlmrl65g62yx9n97qkzaps33nrk8jq")))) (build-system r-build-system) (arguments (list -- cgit 1.4.1 From 7bfb13e904081df969d407060484b30e31eb34dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:24 +0100 Subject: gnu: r-bibtex: Update to 0.5.1. * gnu/packages/cran.scm (r-bibtex): Update to 0.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 07144e83ac..c8dcf6a628 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10702,14 +10702,14 @@ Python to R they are converted back to R types.") (define-public r-bibtex (package (name "r-bibtex") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "bibtex" version)) (sha256 (base32 - "0rwinwj0kw2872q2whhk03ianl9lcgs6dlhqzm513wj3bgpb90gc")))) + "1l9y945qmpla68rx6dnaxc83vmvkw26cw4zzfgfsvi36wsja1hgk")))) (build-system r-build-system) (propagated-inputs (list r-backports)) (home-page "https://github.com/romainfrancois/bibtex") -- cgit 1.4.1 From 462025f36cefe5e543a1c1cf57872287ff77bc21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:24 +0100 Subject: gnu: r-rstatix: Update to 0.7.2. * gnu/packages/cran.scm (r-rstatix): Update to 0.7.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8dcf6a628..ba3637d305 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10854,14 +10854,14 @@ and adds the annotation to the plot.") (define-public r-rstatix (package (name "r-rstatix") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) (uri (cran-uri "rstatix" version)) (sha256 (base32 - "0c001w1mj8jw7gzmix90wzzb9kj45q173mzl7pmvykm77zpn61ak")))) + "1891a976k2qjrh1vkzfg8icxblxa978wbazg7mqq8pcw3nmzbip0")))) (properties `((upstream-name . "rstatix"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From d1bff2f24ef603a4762789907986037012faed70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:24 +0100 Subject: gnu: r-fansi: Update to 1.0.4. * gnu/packages/cran.scm (r-fansi): Update to 1.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ba3637d305..98913eb3b4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11050,14 +11050,14 @@ steps and provides ggplot2-based elegant data visualization.") (define-public r-fansi (package (name "r-fansi") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "fansi" version)) (sha256 (base32 - "0sn0kflgcn2qrrv646pzqylm02cx8l5ws473ppmvla4xihyvi9w6")))) + "17y4m4yy8d6j6rlql2bpigcyn6yfv2g2aaaj96xjp4j0di722qri")))) (build-system r-build-system) (native-inputs (list r-knitr)) ; for vignettes -- cgit 1.4.1 From d85cd04c18267ac0a4ba93fdca590f7bc610d7d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:25 +0100 Subject: gnu: r-hdf5r: Update to 1.3.8. * gnu/packages/cran.scm (r-hdf5r): Update to 1.3.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 98913eb3b4..cef5d8999e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11092,14 +11092,14 @@ results to the user.") (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.3.7") + (version "1.3.8") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "0nr9iywl2z7hrydvq5z61jvx6ls8wg72lzpr875p1jfi7s2052kf")))) + "0arhs9z3rhqkb3pkhdgf1kgyhzrgvrrfjj4phijpji2przi82cmm")))) (build-system r-build-system) (inputs (list hdf5 zlib)) -- cgit 1.4.1 From ec08e7a533f7298311908a6adb746b0b6ca90be4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:25 +0100 Subject: gnu: r-rbibutils: Update to 2.2.13. * gnu/packages/cran.scm (r-rbibutils): Update to 2.2.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cef5d8999e..fa356d3ac6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11271,14 +11271,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") (define-public r-rbibutils (package (name "r-rbibutils") - (version "2.2.11") + (version "2.2.13") (source (origin (method url-fetch) (uri (cran-uri "rbibutils" version)) (sha256 (base32 - "10g3fv8ninihjldhvh00yrp260dczhz3q519000jm3wp5w47b945")))) + "1hpg76iqnjji9k6cwqvgiybscl7ynbqml14k1f1x26hrpxh5q8xc")))) (properties `((upstream-name . "rbibutils"))) (build-system r-build-system) (home-page "https://geobosh.github.io/rbibutils/") -- cgit 1.4.1 From 256798038aae92424a8eceeb06e60cda4c1493d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:25 +0100 Subject: gnu: r-officer: Update to 0.5.2. * gnu/packages/cran.scm (r-officer): Update to 0.5.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fa356d3ac6..3829721bbd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11319,14 +11319,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1r885h8ma2py3idxkki2bnsbcimrw36qd6km2bhyhlav79n7bh4w")))) + "1wpbn37r16si2vqzsnv93435f2hir7lkxl2qqvp4g0l0ikpkicxw")))) (build-system r-build-system) (propagated-inputs (list r-openssl r-r6 r-uuid r-xml2 r-zip)) -- cgit 1.4.1 From ff9a7abcc0dfd982b5ebb6189e593ec27aa40d0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:26 +0100 Subject: gnu: r-insight: Update to 0.19.0. * gnu/packages/cran.scm (r-insight): Update to 0.19.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3829721bbd..62754e7a6f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11555,14 +11555,14 @@ Decomposition in R (Beaton et al 2014) .") (define-public r-insight (package (name "r-insight") - (version "0.18.8") + (version "0.19.0") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "01bm7w8f80i550gwv41kakaxp0d5a2pqa2s3ihz36snkczmdlapm")))) + "0990jbcsv168j7kbbg91jk8qdv9vph98y5snpb7i4v5q9qwkvdp7")))) (build-system r-build-system) (native-inputs (list r-knitr)) -- cgit 1.4.1 From 91228686e5f3967e1b4a3d7e2739722d034893a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:26 +0100 Subject: gnu: r-flextable: Update to 0.8.5. * gnu/packages/cran.scm (r-flextable): Update to 0.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62754e7a6f..2441d5e176 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11691,14 +11691,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.8.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "0fqc0zq1w7fdnql2m96g0rpichfpwrhyinnld29ddaw0d742gfj5")))) + "1c4xa4rg04ixqqim9sd9x2yj7805l8bvz292n9n0vm0sg959m9dn")))) (build-system r-build-system) (propagated-inputs (list r-base64enc -- cgit 1.4.1 From f59c6878acc2b3d63cdda9120c5c12728bb8959a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:26 +0100 Subject: gnu: r-biasedurn: Update to 2.0.9. * gnu/packages/cran.scm (r-biasedurn): Update to 2.0.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2441d5e176..7375adf594 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11746,14 +11746,14 @@ libxlsxwriter.") (define-public r-biasedurn (package (name "r-biasedurn") - (version "2.0.8") + (version "2.0.9") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0mmq8zf52p6y76nqm0fcvvg8bdlrfl12mlfr9fznz9zvm26pypi0")))) + "02bb81x1hfvhm6qlcvp88bdpm1fhqak9cjbqz1r7fhg2qfxjpims")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/BiasedUrn/") -- cgit 1.4.1 From 90af6ea79a6505246f2a3d78b72483314d29126a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:27 +0100 Subject: gnu: r-doby: Update to 4.6.16. * gnu/packages/cran.scm (r-doby): Update to 4.6.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7375adf594..872093099c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11971,14 +11971,14 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.15") + (version "4.6.16") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "14asz3bpyvxakvpap2aajk6f5j2d3d6vrvrgnlixg5q6gdbh465m")))) + "1rxvxhb572n29mbvkh6xmi7cnwc6c8g2xzw1wp10nfr9gnspx4ym")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 681cc28788cdc4f8a5b255a99f67b06a1386abe4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:27 +0100 Subject: gnu: r-gam: Update to 1.22-1. * gnu/packages/cran.scm (r-gam): Update to 1.22-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 872093099c..5cd9cedb3c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12586,14 +12586,14 @@ repeated measures data, respectively.") (define-public r-gam (package (name "r-gam") - (version "1.22") + (version "1.22-1") (source (origin (method url-fetch) (uri (cran-uri "gam" version)) (sha256 (base32 - "0gyrg73f63ccars1639n0gv6cnh8ixp7p7lgdxb2yjl240lk0c9i")))) + "1h84klxs7wbksn9hsqdspmska9q5pmy6q71fmwm4bcmdrqixr8gv")))) (properties `((upstream-name . "gam"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 7cbd37032417533d807ac4f062c0c31e00f95e13 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:27 +0100 Subject: gnu: r-raster: Update to 3.6-14. * gnu/packages/cran.scm (r-raster): Update to 3.6-14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5cd9cedb3c..653c3f3240 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12856,14 +12856,14 @@ used to teach mathematics, statistics, computation and modeling.") (define-public r-raster (package (name "r-raster") - (version "3.6-13") + (version "3.6-14") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "035hb1063lrlcs3l5aiccminax228ji0363hijmnxkvl7fsydxp1")))) + "02iv1lddplg49lak623w6zmjnbhrbqcvarc5rb7qizsp1aqq44q3")))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-sp r-terra)) -- cgit 1.4.1 From 80c4ed90f7f07b0f7849b5434a3c580458fc3c80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:28 +0100 Subject: gnu: r-nleqslv: Update to 3.3.4. * gnu/packages/cran.scm (r-nleqslv): Update to 3.3.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 653c3f3240..30293ad2f1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13277,13 +13277,13 @@ emission distributions.") (define-public r-nleqslv (package (name "r-nleqslv") - (version "3.3.3") + (version "3.3.4") (source (origin (method url-fetch) (uri (cran-uri "nleqslv" version)) (sha256 - (base32 "0cy65bqkmnnr8v0x1cag84caxwdxyr0yw4w443apxzfxjp7dyiif")))) + (base32 "1kqgjgrid0s4f5rr7kcmw2h1zkb5vfvl2nnzrvc5s5fdbd9fg0r7")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/nleqslv/") -- cgit 1.4.1 From 32fab335675de6f5c2e41accbf2bf932ef43b0af Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:28 +0100 Subject: gnu: r-phyclust: Update to 0.1-33. * gnu/packages/cran.scm (r-phyclust): Update to 0.1-33. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 30293ad2f1..c4a69b196d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13299,13 +13299,13 @@ singular or ill-conditioned Jacobian.") (define-public r-phyclust (package (name "r-phyclust") - (version "0.1-32") + (version "0.1-33") (source (origin (method url-fetch) (uri (cran-uri "phyclust" version)) (sha256 (base32 - "1ga2pzksp97psqbl484fikfnr4bl3bgyys86wb3ya904xxwghy6c")))) + "04x4ymqnmc20pns89i4zs2yp75vchdgjszsinnpddjiv3446cy1q")))) (properties `((upstream-name . "phyclust"))) (build-system r-build-system) (propagated-inputs (list r-ape)) -- cgit 1.4.1 From 76d06986598370a1b396015d8b9cd02c6b3a28ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:28 +0100 Subject: gnu: r-emmeans: Update to 1.8.4-1. * gnu/packages/cran.scm (r-emmeans): Update to 1.8.4-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4a69b196d..dc82131c62 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13928,14 +13928,14 @@ the differences were not significantly different.") (define-public r-emmeans (package (name "r-emmeans") - (version "1.8.3") + (version "1.8.4-1") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "004fd6kzky44xixd87q2nl1sn37krmqfas5gsylbc1cbrwnjzxlz")))) + "12ap4hbr354qzn1cpjj7596vssxvs0in6yc66805nj1h8w5xj3y6")))) (build-system r-build-system) (propagated-inputs (list r-estimability r-mvtnorm r-numderiv)) -- cgit 1.4.1 From c3d612127b205d07d206ef9c6ad20559e6846374 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:28 +0100 Subject: gnu: r-tmb: Update to 1.9.2. * gnu/packages/cran.scm (r-tmb): Update to 1.9.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc82131c62..4d61137121 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14057,14 +14057,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "03zv38gig31ir5gdhgw5j6j8xn1f4y91j2r87fv31gywmg1bhzl9")))) + "0kz5a3y6xcqz2ycxq6ff3jasc2hkvq2rxnpr618nng7k9gljc504")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 1584fbcf9e0c246b0b3920e551c93e604e0cdc0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:29 +0100 Subject: gnu: r-performance: Update to 0.10.2. * gnu/packages/cran.scm (r-performance): Update to 0.10.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4d61137121..4e95a5b5ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14188,14 +14188,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "1m2zzznfbla8qdm0kxbj5vp431kpygpi4d70042hkg1ly3fyg7pz")))) + "0r9x5pqf1asf0sy0255jv0d4cki4xd5sfp5rl9mldclykpswf022")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) -- cgit 1.4.1 From 9c8f4326e02d29f44fc0e0ec738f0e24fe17f34d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:29 +0100 Subject: gnu: r-ggeffects: Update to 1.1.5. * gnu/packages/cran.scm (r-ggeffects): Update to 1.1.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4e95a5b5ee..ca17598f80 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14214,14 +14214,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1j3l5v00f3xx2pwwfg1z9y31h8qja88nx7lycwj1y55ry5i6drr1")))) + "0nygl4m79b1znaj8zkxbicfp0223gpmv75n0a5v3gsh5gyn6cmyp")))) (build-system r-build-system) (propagated-inputs (list r-insight)) -- cgit 1.4.1 From ed123de3dfd90e7fb75fe31c534e5e5a0190ed32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:29 +0100 Subject: gnu: r-effectsize: Update to 0.8.3. * gnu/packages/cran.scm (r-effectsize): Update to 0.8.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ca17598f80..09df634d7b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14242,14 +14242,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1ibkvvpkd4md73d53823wnwzk3iqi1k4vr99jkyiiybcn6mv5qkc")))) + "1db197w72zi2ln0xfivg1i35rqr9xfsn7py854fv12dipg3l1cfw")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From a621ef9f40e0e7a6ab568dbc18a4d03e8fa85485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:30 +0100 Subject: gnu: r-gillespiessa2: Update to 0.3.0. * gnu/packages/cran.scm (r-gillespiessa2): Update to 0.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09df634d7b..28b4522e5c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14335,13 +14335,13 @@ back to file after modifications.") (define-public r-gillespiessa2 (package (name "r-gillespiessa2") - (version "0.2.10") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "GillespieSSA2" version)) (sha256 - (base32 "0mvsjkjkm27j1y6mfipmxjmki4hpxw0cnmcmls7i5pacnrxc1gcb")))) + (base32 "0wjz0fh9cwvaw6n7hs2lkh818jzbjl11ps5gxnjqizz8gfp9fr10")))) (properties `((upstream-name . "GillespieSSA2"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From dcf9ce4597d131b2f8cf32e210e54e2168c67fa2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:30 +0100 Subject: gnu: r-fs: Update to 1.6.1. * gnu/packages/cran.scm (r-fs): Update to 1.6.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 28b4522e5c..48873f834c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14417,14 +14417,14 @@ repositories.") (define-public r-fs (package (name "r-fs") - (version "1.5.2") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "fs" version)) (sha256 (base32 - "11qr3v0xn65vfhgcxl4l6yv48s4w0w3ldp3anpzc25vd3mwd3jim")))) + "0ck7swilvmkp5l81cdqn76rlbbgs90d4xirh186ccw62l8hy9wgs")))) (build-system r-build-system) (native-inputs (list r-knitr)) -- cgit 1.4.1 From 88fc74a3b6a745136bfc0b3ede4f23135c7b1b8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:30 +0100 Subject: gnu: r-rcppgsl: Update to 0.3.13. * gnu/packages/cran.scm (r-rcppgsl): Update to 0.3.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 48873f834c..dc016afb6c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14892,13 +14892,13 @@ and related methods.") (define-public r-rcppgsl (package (name "r-rcppgsl") - (version "0.3.12") + (version "0.3.13") (source (origin (method url-fetch) (uri (cran-uri "RcppGSL" version)) (sha256 - (base32 "1qmrwd0zc0kwbhpwxg5s5fxp0pmfh0hwcli8vqh1q41997yyy14m")))) + (base32 "1rwkin79ppkdz1y9pghxx29vlyvs84bylvqblkhj8r4w26y76ppy")))) (properties `((upstream-name . "RcppGSL"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 92996040e70322a77d5ed508014007b6aaf51d1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:31 +0100 Subject: gnu: r-rcppalgos: Update to 2.7.1. * gnu/packages/cran.scm (r-rcppalgos): Update to 2.7.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc016afb6c..48fd0fcdd7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15134,13 +15134,13 @@ address a bug.") (define-public r-rcppalgos (package (name "r-rcppalgos") - (version "2.6.0") + (version "2.7.1") (source (origin (method url-fetch) (uri (cran-uri "RcppAlgos" version)) (sha256 (base32 - "11dvh0ba3chsqf3vw8g9h1754arxgwqryayavx3n6vm5daz2krqa")))) + "1js4h78szdfszphrbb0rh7hvr1hx0gp8lqxy67l4qvszcqj08wy1")))) (properties `((upstream-name . "RcppAlgos"))) (build-system r-build-system) (inputs (list gmp)) -- cgit 1.4.1 From dfdb2eabfc7a9a66c0dfaf88618e665443c75ccb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:31 +0100 Subject: gnu: r-rcppparallel: Update to 5.1.6. * gnu/packages/cran.scm (r-rcppparallel): Update to 5.1.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 48fd0fcdd7..398b416784 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15213,14 +15213,14 @@ package provides a minimal R interface by relying on the Rcpp package.") (define-public r-rcppparallel (package (name "r-rcppparallel") - (version "5.1.5") + (version "5.1.6") (source (origin (method url-fetch) (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3")) + "058g9yx4rscg4j7ghxllj5kkyxgwa7cdyxpivcysjmwpis30smmc")) (modules '((guix build utils))) (snippet '(delete-file-recursively "src/tbb/")))) -- cgit 1.4.1 From 16019e9585e1b3d46adcfb141d2095e835a034c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:31 +0100 Subject: gnu: r-rgl: Update to 1.0.1. * gnu/packages/cran.scm (r-rgl): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 398b416784..a33a0f0223 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15294,14 +15294,14 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "0.111.6") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "1h6nbcnbl0knmc91923wfhghs58yjc84mhnmk2byd474lrgzxynd")))) + "1j1g1b1j6azhg944ddzzrxgynb2bfl14l5qz58n4mhvxrbx018w9")))) (build-system r-build-system) (native-inputs (list pkg-config -- cgit 1.4.1 From 273cda9f0f23e6e953a1ddda1678c22aad8397a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:32 +0100 Subject: gnu: r-gsl: Update to 2.1-8. * gnu/packages/cran.scm (r-gsl): Update to 2.1-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a33a0f0223..f77793ffb4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15659,14 +15659,14 @@ parametrizations of Nolan.") (define-public r-gsl (package (name "r-gsl") - (version "2.1-7.1") + (version "2.1-8") (source (origin (method url-fetch) (uri (cran-uri "gsl" version)) (sha256 (base32 - "118rj9kjx9rzlynvhrly19qz3yxg8jzws35971ssgzrp5lwd367f")))) + "159d782nz7fqhgcj3fa79hlmkdrqnkd0ypgzcl71kgas92zhjdpk")))) (build-system r-build-system) (inputs (list gsl)) -- cgit 1.4.1 From 5b9e4bf2b2cdf56b0a2ce535f622ca667eaeeffa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:32 +0100 Subject: gnu: r-mritc: Update to 0.5-3. * gnu/packages/cran.scm (r-mritc): Update to 0.5-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f77793ffb4..972cdb70ef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15773,13 +15773,13 @@ This package is part of the Rigorous Analytics bundle.") (define-public r-mritc (package (name "r-mritc") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "mritc" version)) (sha256 (base32 - "07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2")))) + "1bpnm2qzq67dgjxsa4wxn51f4a4cxal5r6abgs3m7p5a9a16jmjp")))) (properties `((upstream-name . "mritc"))) (build-system r-build-system) (propagated-inputs (list r-lattice r-misc3d r-oro-nifti)) -- cgit 1.4.1 From 1e673c2f9adbf3ea8cc40f1cc71ed19b6e522599 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:32 +0100 Subject: gnu: r-tm: Update to 0.7-11. * gnu/packages/cran.scm (r-tm): Update to 0.7-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 972cdb70ef..4ffbed3bd9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15918,14 +15918,14 @@ Processing.") (define-public r-tm (package (name "r-tm") - (version "0.7-10") + (version "0.7-11") (source (origin (method url-fetch) (uri (cran-uri "tm" version)) (sha256 (base32 - "15lxaqlgkl9chiz0aw05l55bvlh48jwdgplfl8f2d8xsaq4gmbvc")))) + "0hp7xamjmifd56qwsin5m0xng592wwxsbfxdz37n4k6zjf28paws")))) (properties `((upstream-name . "tm"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0f4fba37689231162d569d823abf42bd2f3236a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:33 +0100 Subject: gnu: r-sparsesvd: Update to 0.2-2. * gnu/packages/cran.scm (r-sparsesvd): Update to 0.2-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4ffbed3bd9..3e19278996 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16111,14 +16111,14 @@ giving it a description in the specific format.") (define-public r-sparsesvd (package (name "r-sparsesvd") - (version "0.2-1") + (version "0.2-2") (source (origin (method url-fetch) (uri (cran-uri "sparsesvd" version)) (sha256 (base32 - "0yz0mgayxriyrz6bbrd41cck0s56b916xvyh13hw86gydd6kpl5k")))) + "0dnqjqypjwac8aqdqsqdgcd70lyrfv6idz8q2kzjiv1sxrlwqh5v")))) (build-system r-build-system) (propagated-inputs (list r-matrix)) (home-page "http://tedlab.mit.edu/~dr/SVDLIBC/") -- cgit 1.4.1 From 1931b8bfa9bd3a8e529152b9cab75535578ebfd2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:33 +0100 Subject: gnu: r-rnexml: Update to 2.4.11. * gnu/packages/cran.scm (r-rnexml): Update to 2.4.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3e19278996..d0d397b423 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16515,13 +16515,13 @@ useful for building large phylogenies using multiple markers.") (define-public r-rnexml (package (name "r-rnexml") - (version "2.4.9") + (version "2.4.11") (source (origin (method url-fetch) (uri (cran-uri "RNeXML" version)) (sha256 (base32 - "180w7c8n4xcn3x7haymi1fl3fpnklqfgmaki6jkxpm3hdiffmbsd")))) + "0ipxdhfzccpqmnfrqdy8bizm80k2chhdlzg3p0dl05p8n35i6s94")))) (build-system r-build-system) (propagated-inputs (list r-ape -- cgit 1.4.1 From d3de3d9b2fe6840a525102a529f87e01bfccd4ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:33 +0100 Subject: gnu: r-rnifti: Update to 1.4.5. * gnu/packages/cran.scm (r-rnifti): Update to 1.4.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d0d397b423..6febdc35d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16549,14 +16549,14 @@ and compatibility with @code{ape} objects.") (define-public r-rnifti (package (name "r-rnifti") - (version "1.4.3") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "1w627brzag9laxsfrr1kxh07glycl8l1n5xf5frn8m0jzvrn3d50")))) + "0a26jdhgwnfk2ai4zrnqf65czmamqrj2gb6l9w83mfpyrm4shxx2")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (inputs (list zlib)) -- cgit 1.4.1 From dc48528fef9cf82bfa77972dc483e37fc1a7a0b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:34 +0100 Subject: gnu: r-ore: Update to 1.7.3.1. * gnu/packages/cran.scm (r-ore): Update to 1.7.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6febdc35d0..bbba6b806d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16592,13 +16592,13 @@ creating color scales and calculating color distances.") (define-public r-ore (package (name "r-ore") - (version "1.7.2.1") + (version "1.7.3.1") (source (origin (method url-fetch) (uri (cran-uri "ore" version)) (sha256 - (base32 "104506x9x14bs8lfhydwpgdh4qws2vqkvyy6xrlrviqlll6qbjgg")))) + (base32 "0hlmr4p0ldizdv46myyhlki10qkjdgs44jxp9y61zqcdw360dz95")))) (build-system r-build-system) (home-page "https://github.com/jonclayden/ore") (synopsis "R interface to the Onigmo regular expression library") -- cgit 1.4.1 From 2cec41d2214351bed41161991797bf841a152fb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:34 +0100 Subject: gnu: r-gargle: Update to 1.3.0. * gnu/packages/cran.scm (r-gargle): Update to 1.3.0. [propagated-inputs]: Add r-lifecycle and r-openssl. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bbba6b806d..d3a11498d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16945,14 +16945,14 @@ and manipulating sets of ontological terms.") (define-public r-gargle (package (name "r-gargle") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "gargle" version)) (sha256 (base32 - "087hlbqpwjj7jnsg1ax2b12nc0h4zfj070q5hjp6fca05z4f4rzk")))) + "02ldshm8phs1ls0djqfprv5yy8i50ijh16y7smkb61wrwd4zr3s2")))) (build-system r-build-system) (propagated-inputs (list r-cli @@ -16960,6 +16960,8 @@ and manipulating sets of ontological terms.") r-glue r-httr r-jsonlite + r-lifecycle + r-openssl r-rappdirs r-rlang r-rstudioapi -- cgit 1.4.1 From 5f409bec7933f8a2b9d780e37acfbdeafe3aa08a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:34 +0100 Subject: gnu: r-gmp: Update to 0.7-1. * gnu/packages/cran.scm (r-gmp): Update to 0.7-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d3a11498d9..e4d9c45d11 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17014,14 +17014,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-gmp (package (name "r-gmp") - (version "0.6-9") + (version "0.7-1") (source (origin (method url-fetch) (uri (cran-uri "gmp" version)) (sha256 (base32 - "00zh0phr8axva2y2c10nla7n9mgh3wvwvsyyd3y43jpb3xim6lv6")))) + "1djxhc4v874asmrj8qy054779wsq499f5f2wc6vmr40qab33v1x6")))) (build-system r-build-system) (arguments '(#:phases -- cgit 1.4.1 From 4ecae23db328a9f019fc571074ef569f972caf7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:35 +0100 Subject: gnu: r-rmpfr: Update to 0.9-1. * gnu/packages/cran.scm (r-rmpfr): Update to 0.9-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e4d9c45d11..c11b9bbae6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17041,14 +17041,14 @@ limitations\" using the GNU Multiple Precision library.") (define-public r-rmpfr (package (name "r-rmpfr") - (version "0.8-9") + (version "0.9-1") (source (origin (method url-fetch) (uri (cran-uri "Rmpfr" version)) (sha256 (base32 - "12mwvgyalzh4zf5d002fm1hpr3wwhiypy9ia6wy47ij9gns5mvng")))) + "0m4x4mndyvm374h2mnb3zs8hlbzafpzfqjpypr91h886dfs1vbyv")))) (properties `((upstream-name . "Rmpfr"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From cf55d76048080c50a201ee58a270b0951a76e550 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:35 +0100 Subject: gnu: r-protviz: Update to 0.7.7. * gnu/packages/cran.scm (r-protviz): Update to 0.7.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c11b9bbae6..180c312c3d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17891,14 +17891,14 @@ sampling.") (define-public r-protviz (package (name "r-protviz") - (version "0.7.3") + (version "0.7.7") (source (origin (method url-fetch) (uri (cran-uri "protViz" version)) (sha256 (base32 - "0f6jwzcqi0w37hvg3i5dlk0c3anpkqh54ibf94vaf17r8sykr4nw")))) + "18l4aw0fx47w9czw73lxh68aj4ljbfr3z39vakbbx6xp2llyw8b1")))) (properties `((upstream-name . "protViz"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) -- cgit 1.4.1 From b6f7d74331187337649e787c21fc3a6671273575 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:35 +0100 Subject: gnu: r-parallelly: Update to 1.34.0. * gnu/packages/cran.scm (r-parallelly): Update to 1.34.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 180c312c3d..78858ba09a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18144,14 +18144,14 @@ them in distributed compute environments.") (define-public r-parallelly (package (name "r-parallelly") - (version "1.33.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (cran-uri "parallelly" version)) (sha256 (base32 - "0ymrpcxp2fnk1fpfig0kd1q3whzh7sykgcl91k53c2w20v2wwfpw")))) + "1x5gk008813i9c2i7qdhpmlbq2xdgv5q47xcmc6lb8p475q9sqqi")))) (properties `((upstream-name . "parallelly"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/parallelly") -- cgit 1.4.1 From 90375c84d9bedc6c7870cf93dcd137e61260716d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:36 +0100 Subject: gnu: r-future: Update to 1.31.0. * gnu/packages/cran.scm (r-future): Update to 1.31.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 78858ba09a..9246ef0887 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18172,14 +18172,14 @@ port-forwarding to your local computer.") (define-public r-future (package (name "r-future") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "1njmgnq0qz7b9yvcp6351yz7ydz9hj8bnnaf1ys3md66v9mg1xf7")))) + "0anzvxw1r5nmsa69h5lmvx0ixc9khlp02ix19w06y1hkka2qznxj")))) (build-system r-build-system) (arguments `(#:phases -- cgit 1.4.1 From 47bc08b492964ba18e6b62bdff817792f6a90f4f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:36 +0100 Subject: gnu: r-dorng: Update to 1.8.6. * gnu/packages/cran.scm (r-dorng): Update to 1.8.6. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9246ef0887..1d4b085b96 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18314,18 +18314,20 @@ heuristics.") (define-public r-dorng (package (name "r-dorng") - (version "1.8.3") + (version "1.8.6") (source (origin (method url-fetch) (uri (cran-uri "doRNG" version)) (sha256 (base32 - "1aqzy646c6aggscmwninr1hz0z4nkxibmrg1mm77p2jnf1lh914c")))) + "1qkxa3jxpnn5anhqycqcbk18kw87m9pl5m78q8d89ygihghascjh")))) (properties `((upstream-name . "doRNG"))) (build-system r-build-system) (propagated-inputs (list r-foreach r-iterators r-rngtools)) + (native-inputs + (list r-knitr)) (home-page "https://renozao.github.io/doRNG/") (synopsis "Generic reproducible parallel backend for foreach loops") (description -- cgit 1.4.1 From caca5ea6fcd95bfc2a4a1862c39fd7adce346057 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:36 +0100 Subject: gnu: r-compositions: Update to 2.0-5. * gnu/packages/cran.scm (r-compositions): Update to 2.0-5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1d4b085b96..b108d0a596 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18628,14 +18628,14 @@ users of rARPACK are advised to switch to the RSpectra package.") (define-public r-compositions (package (name "r-compositions") - (version "2.0-4") + (version "2.0-5") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "1bqg0qqzsf92q0jb7hdjycr54bwv8rk7ajhvxgch5yslyqxpm73v")))) + "0niccv8i3jrcjnjm7dygzhz6bfah9za6lswa669pfpgsycilpf51")))) (build-system r-build-system) (propagated-inputs (list r-bayesm r-mass r-robustbase r-tensora)) -- cgit 1.4.1 From b2f8ddfaa3e4d70b9aaaba3fbad51103f58e28de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:37 +0100 Subject: gnu: r-minpack-lm: Update to 1.2-3. * gnu/packages/cran.scm (r-minpack-lm): Update to 1.2-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b108d0a596..30724d0feb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18854,14 +18854,14 @@ marginal histograms/boxplots/density plots to ggplot2 scatterplots.") (define-public r-minpack-lm (package (name "r-minpack-lm") - (version "1.2-2") + (version "1.2-3") (source (origin (method url-fetch) (uri (cran-uri "minpack.lm" version)) (sha256 (base32 - "11yz6hk2r33571d16kq01cb1x6sgdzi6jmksqlrm8mr84l95c2f7")))) + "1w7f9zhqjzayppbd5r6wmlkzlv72nvg74cdjajd2qfq2kxkh59xz")))) (properties `((upstream-name . "minpack.lm"))) (build-system r-build-system) (native-inputs (list gfortran)) -- cgit 1.4.1 From 6989fc288b08b7e19302f0d39432c38ebc1c9e21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:37 +0100 Subject: gnu: r-pbdzmq: Update to 0.3-9. * gnu/packages/cran.scm (r-pbdzmq): Update to 0.3-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 30724d0feb..d6b4b211f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19084,14 +19084,14 @@ graphs.") (define-public r-pbdzmq (package (name "r-pbdzmq") - (version "0.3-8") + (version "0.3-9") (source (origin (method url-fetch) (uri (cran-uri "pbdZMQ" version)) (sha256 (base32 - "0rala2aqyva4cjpih8xbqq1nxhwfgbkcdwb1c3h5jjp5dv7lrvgd")))) + "1dhg9sakfz4mivwvyfv5hnjrbi6gcd9cgis0dcgmh44q1a6j6cyh")))) (properties `((upstream-name . "pbdZMQ"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From a2bdff58e3c690673e049e6f2d1d887652f78ae5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:37 +0100 Subject: gnu: r-repr: Update to 1.1.6. * gnu/packages/cran.scm (r-repr): Update to 1.1.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d6b4b211f4..36b70be58c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19111,14 +19111,14 @@ compatible with @code{rzmq} are also provided.") (define-public r-repr (package (name "r-repr") - (version "1.1.4") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "repr" version)) (sha256 (base32 - "0h3h14ybamcbwmm31ib66fx13v75vkzn4bn2v26n2h097sl9qybg")))) + "0gv72qydk4r070q3jcqakvfcm4r0n9zzzpl82s0w87iw6sdnqbix")))) (build-system r-build-system) (propagated-inputs (list r-base64enc r-htmltools r-jsonlite r-pillar)) -- cgit 1.4.1 From dae0e097c1bf2a2c547dc413abc1dbc5077119ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:38 +0100 Subject: gnu: r-irkernel: Update to 1.3.2. * gnu/packages/cran.scm (r-irkernel): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 36b70be58c..988be73e83 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19155,14 +19155,14 @@ running IRkernel session.") (define-public r-irkernel (package (name "r-irkernel") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "IRkernel" version)) (sha256 (base32 - "03343ds7sprql1c6h41dibk40rc3225mzxca452ns967fyhy71ii")))) + "19i4wj5cb62n6j83nxgv500dcdzrf6rzwdy5v6fh7r93vjyxiip1")))) (properties `((upstream-name . "IRkernel"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From e769ef30172e3887e1ec4770d5261d471a58b0cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:38 +0100 Subject: gnu: r-sets: Update to 1.0-22. * gnu/packages/cran.scm (r-sets): Update to 1.0-22. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 988be73e83..4057d04fb3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19436,14 +19436,14 @@ additional utilities for genomic regions processing.") (define-public r-sets (package (name "r-sets") - (version "1.0-21") + (version "1.0-22") (source (origin (method url-fetch) (uri (cran-uri "sets" version)) (sha256 (base32 - "1h1a03b1850kh5hd3gxbspx2nxqxvk2gb0wm0s60b70qb6zg0csp")))) + "1ilyiw02gq2rzd5db1nlapxv1azyjdav6fl09zh5hfhin2k9mgvg")))) (properties `((upstream-name . "sets"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sets") -- cgit 1.4.1 From 1f36adf45adee306350846d0fd31aa396bc8d248 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:38 +0100 Subject: gnu: r-s2: Update to 1.1.2. * gnu/packages/cran.scm (r-s2): Update to 1.1.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4057d04fb3..a9d6d1b5da 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19809,14 +19809,14 @@ high-performance functions are provided here.") (define-public r-s2 (package (name "r-s2") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "s2" version)) (sha256 (base32 - "07c9f8ghfjqdjcw50by3y4j8nbsmmcwd4a3vpcwsxr4mvybckq0w")))) + "0mqb7jvjpbix9fq5ivcg630m5s5z2pyx8dmyiyvsajkg3i9kgclg")))) (properties `((upstream-name . "s2"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From c280111b867f39d5cfd7b10768bf29039c06bca4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:39 +0100 Subject: gnu: r-adegenet: Update to 2.1.10. * gnu/packages/cran.scm (r-adegenet): Update to 2.1.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a9d6d1b5da..3b00d3718b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19949,14 +19949,14 @@ spanning tree.") (define-public r-adegenet (package (name "r-adegenet") - (version "2.1.8") + (version "2.1.10") (source (origin (method url-fetch) (uri (cran-uri "adegenet" version)) (sha256 (base32 - "09ahgz1ddsdn30fmi5kimdcrcnw18ryqpjcixhyp4xz0xwz2rmw0")))) + "0qxig2jyj1q0a8pwpv5f5v5b4x4af8s9p1p0yc0msmyxq457hqmb")))) (build-system r-build-system) (propagated-inputs (list r-ade4 -- cgit 1.4.1 From 9bb154fe753cb57031705c4aaea30f39b9f4646e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:39 +0100 Subject: gnu: r-rms: Update to 6.4-1. * gnu/packages/cran.scm (r-rms): Update to 6.4-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3b00d3718b..dfc7b701de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20106,13 +20106,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.3-0") + (version "6.4-1") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "1yfk800q4mgmrjkh0hqjkiv907sr1bi1jaigrj8l6pmg1mkynhbc")))) + (base32 "1bmhg0q1lrzwhy9a7gljpxf82wkk4vi4ajrlc5p10kpk0bvjckyn")))) (build-system r-build-system) (propagated-inputs (list r-cluster -- cgit 1.4.1 From b59d39f12678232f60739c35f83422a937900bee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:39 +0100 Subject: gnu: r-haplo-stats: Update to 1.9.3. * gnu/packages/cran.scm (r-haplo-stats): Update to 1.9.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dfc7b701de..44efef4835 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20191,14 +20191,14 @@ include (define-public r-haplo-stats (package (name "r-haplo-stats") - (version "1.9.2") + (version "1.9.3") (source (origin (method url-fetch) (uri (cran-uri "haplo.stats" version)) (sha256 (base32 - "1397rxcqqz29yaf3f2gphg1jhmfw3wvvjvqk7cz01jdh3pihdh56")))) + "1nwxmx3v0085bdr14sr1n4wpipyp1bdq9qhx2gxmx9h3l02glkis")))) (properties `((upstream-name . "haplo.stats"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 8db9ea6ddcc296ab1a26fee41398ff40b25356d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:40 +0100 Subject: gnu: r-bookdown: Update to 0.32. * gnu/packages/cran.scm (r-bookdown): Update to 0.32. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 44efef4835..15e9c6d10a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20352,13 +20352,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.31") + (version "0.32") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "0rkapx3zz0vwggnrpk0ns8bpqsblkp08xpr0srz93c3kzlsjdiac")))) + "0vw15ahws4y1pb4va58j4d0xif9hnq7q2h57jany39wf2mx11ny6")))) (build-system r-build-system) (propagated-inputs (list r-htmltools -- cgit 1.4.1 From b7f99f0464468e336074a371548e6ff412abf635 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:40 +0100 Subject: gnu: r-osqp: Update to 0.6.0.8. * gnu/packages/cran.scm (r-osqp): Update to 0.6.0.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 15e9c6d10a..7ebc67b093 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20407,13 +20407,13 @@ that accept short and long options.") (define-public r-osqp (package (name "r-osqp") - (version "0.6.0.7") + (version "0.6.0.8") (source (origin (method url-fetch) (uri (cran-uri "osqp" version)) (sha256 (base32 - "00w2hr0pagnvpsk84z99c7alhv7xvs9wpcmkzbcg3qs14g888rgf")))) + "15zd0byk8vy899hm7kd0hpx84hnr84ynai29mr7frraamr2l00ql")))) (properties `((upstream-name . "osqp"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-r6 r-rcpp)) -- cgit 1.4.1 From 28e49ff0e6bca3f05aaec69728e2d209d82080ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:40 +0100 Subject: gnu: r-kernlab: Update to 0.9-32. * gnu/packages/cran.scm (r-kernlab): Update to 0.9-32. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ebc67b093..c28da8167b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20429,13 +20429,13 @@ multipliers. See for details.") (define-public r-kernlab (package (name "r-kernlab") - (version "0.9-31") + (version "0.9-32") (source (origin (method url-fetch) (uri (cran-uri "kernlab" version)) (sha256 - (base32 "12i7ffc1aacyy7bpjc0w60wwivn88wri8jz43h77irn5q5jwcnbk")))) + (base32 "1p3gbn9qgc6yqx9irkl8c23khvkx77jl96hk9hn4vsrx6i7g6kk5")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/kernlab") (synopsis "Kernel-based machine learning tools") -- cgit 1.4.1 From a10902a068dde19cfae16cdaad6ce83e457ff22a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:41 +0100 Subject: gnu: r-rttf2pt1: Update to 1.3.12. * gnu/packages/cran.scm (r-rttf2pt1): Update to 1.3.12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c28da8167b..270f490468 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20639,14 +20639,14 @@ interaction search in high-dimensional data.") (define-public r-rttf2pt1 (package (name "r-rttf2pt1") - (version "1.3.11") + (version "1.3.12") (source (origin (method url-fetch) (uri (cran-uri "Rttf2pt1" version)) (sha256 (base32 - "1fbls9hy4s0hdszg449bpapx2mhknwiasvr15djf9f1hm0b2908p")))) + "10x580dnzddm9z045gya5ya01d10s9mpp0fy8ilrldlh74q7ljqb")))) (properties `((upstream-name . "Rttf2pt1"))) (build-system r-build-system) (home-page "https://github.com/wch/Rttf2pt1") -- cgit 1.4.1 From df9f459c5e8fb57a09e19e8338fc0e94869e5eab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:41 +0100 Subject: gnu: r-extrafont: Update to 0.19. * gnu/packages/cran.scm (r-extrafont): Update to 0.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 270f490468..509588b2ac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20681,14 +20681,14 @@ interaction search in high-dimensional data.") (define-public r-extrafont (package (name "r-extrafont") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (cran-uri "extrafont" version)) (sha256 (base32 - "0mx810mld67vb1w3wkl4fhpjmkq32lgpq5x1c0a9rf8li5wskrj4")))) + "13dbrlf54nbyfz3z2snz7x4m6rfnnhk2l8kkwpgcagzi5lar13sf")))) (build-system r-build-system) (propagated-inputs (list r-extrafontdb r-rttf2pt1)) -- cgit 1.4.1 From d1d780a8106283c1fc9595ba36d079a109c05d5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:41 +0100 Subject: gnu: r-rda: Update to 1.2-1. * gnu/packages/cran.scm (r-rda): Update to 1.2-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 509588b2ac..2d4bb268b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21240,14 +21240,14 @@ microarrays.") (define-public r-rda (package (name "r-rda") - (version "1.0.2-2.1") + (version "1.2-1") (source (origin (method url-fetch) (uri (cran-uri "rda" version)) (sha256 (base32 - "17ll0idnms4bcpbl65xnl8zfnwsk9ww0rg5z8qqh4ahk5qdab8zf")))) + "16mf76hlhii30f2m5xlwa4gv4a5ydnla2kz6ylcka4y9668ql0rp")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rda/") (synopsis "Shrunken centroids regularized discriminant analysis") -- cgit 1.4.1 From 27cbff23eedae68bd0e39bcc12b12fba255ca17f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:42 +0100 Subject: gnu: r-styler: Update to 1.9.0. * gnu/packages/cran.scm (r-styler): Update to 1.9.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2d4bb268b1..8e227fb7e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22230,14 +22230,14 @@ batch correction, and data correction.") (define-public r-styler (package (name "r-styler") - (version "1.8.1") + (version "1.9.0") (source (origin (method url-fetch) (uri (cran-uri "styler" version)) (sha256 (base32 - "1sc1xr9pfrbd2yyzyyxpj8dd81djmsr00gxgr0mr18habyl5yl0m")))) + "0by0mbdvdh8lrr350br1s01fl7yqjpi4vkj0b84b5x83vyrifm58")))) (build-system r-build-system) ;; This is needed by R.cache. (arguments -- cgit 1.4.1 From 3dab9ff63db19a7410bf469ce9c6c346df2e8074 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:42 +0100 Subject: gnu: r-batchtools: Update to 0.9.16. * gnu/packages/cran.scm (r-batchtools): Update to 0.9.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e227fb7e4..9c6094c82a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22327,14 +22327,14 @@ extends the lme4 package.") (define-public r-batchtools (package (name "r-batchtools") - (version "0.9.15") + (version "0.9.16") (source (origin (method url-fetch) (uri (cran-uri "batchtools" version)) (sha256 (base32 - "0d2xy77hkzhcnyz8zxcv98i80fx6ripjw4rvyx4ww1d0vjjgqf52")))) + "1fpmbsb0qp91kv7hjk6f7j41gvmz3xcxfcrr4bz2x62k0j7fmgsi")))) (build-system r-build-system) (propagated-inputs (list r-backports -- cgit 1.4.1 From 22367a9ae816fa917e96a53635792cde8603f537 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:42 +0100 Subject: gnu: r-clue: Update to 0.3-64. * gnu/packages/cran.scm (r-clue): Update to 0.3-64. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9c6094c82a..e7d436149e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22366,14 +22366,14 @@ experiments in a well-organized and reproducible way.") (define-public r-clue (package (name "r-clue") - (version "0.3-63") + (version "0.3-64") (source (origin (method url-fetch) (uri (cran-uri "clue" version)) (sha256 (base32 - "0c402fb3r1cxd0j6ikjhssq2k22lbnsq4k7vjpgvyx4a4ly2h4yr")))) + "1br8vsjcfrklspk24cx2zpk05l0na18ajbkwkwmwmpc79jlbfp7l")))) (build-system r-build-system) (propagated-inputs (list r-cluster)) (home-page "https://cran.r-project.org/web/packages/clue/") -- cgit 1.4.1 From 252dc08f313f4189666b8c1267c0ede0e5d7268d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:43 +0100 Subject: gnu: r-ingredients: Update to 2.3.0. * gnu/packages/cran.scm (r-ingredients): Update to 2.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e7d436149e..e130363419 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22445,14 +22445,14 @@ engine (Salmon et al., 2011) as provided by the package @code{sitmo}.") (define-public r-ingredients (package (name "r-ingredients") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "ingredients" version)) (sha256 (base32 - "11bv4l4fn9kr7y2nfzrwnaya8fi9w3nwcm9vzlqb7dva83rkqbsc")))) + "0jvxkdhbc28a096hi0y6519cj4im4mnl1vz9s563dvb5g4vb7r7b")))) (properties `((upstream-name . "ingredients"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From eadbda13b681f357ec38fb9300813b073a777e1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:43 +0100 Subject: gnu: r-dae: Update to 3.2-14. * gnu/packages/cran.scm (r-dae): Update to 3.2-14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e130363419..6e54b7313f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22509,14 +22509,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.2-13") + (version "3.2-14") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "0mq94ah21p1glvsbvdmi2p7nlgz1bvq7w3rz2z3mdqq18kz6nkjw")))) + "157bx6b06xxz5wsj4miarfx820ds7dsjx2bfyjzf6845pmvg4hjb")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-plyr)) -- cgit 1.4.1 From 534726fb94b893cc7bf5d3ef40476b58f96ebb40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:43 +0100 Subject: gnu: r-dalex: Update to 2.4.3. * gnu/packages/cran.scm (r-dalex): Update to 2.4.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6e54b7313f..659ab469a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22547,14 +22547,14 @@ been used in the call to @code{aov}.") (define-public r-dalex (package (name "r-dalex") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "1m19ibv8rpghqm4vr8nrvarrjkm9rxw6jx8xl3hzrqnnmf2xifqr")))) + "08cd5nhgd6vaazcqq985kwivg99v6ily4idhgkpz8l9ffl3lavm0")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From a48404a0a1894bd648ffc13b4706171e37c2496d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:43 +0100 Subject: gnu: r-xgboost: Update to 1.7.3.1. * gnu/packages/cran.scm (r-xgboost): Update to 1.7.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 659ab469a0..834e12f21f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22770,14 +22770,14 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "1.6.0.1") + (version "1.7.3.1") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "1gafjv6vcpny03lqw8s68xszalsylniavaqwsbzh46vyk4h9mscs")))) + "199qlj74i7rsrwg7al55d2yr7py67k6yaa5wjfg6ma7s1sijrv9w")))) (build-system r-build-system) (propagated-inputs (list r-data-table r-jsonlite r-matrix)) -- cgit 1.4.1 From 41086efde7e030bb4e92ccc9ff3340897ae59f53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:44 +0100 Subject: gnu: r-umap: Update to 0.2.10.0. * gnu/packages/cran.scm (r-umap): Update to 0.2.10.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 834e12f21f..f98c4616de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22799,14 +22799,14 @@ easily.") (define-public r-umap (package (name "r-umap") - (version "0.2.9.0") + (version "0.2.10.0") (source (origin (method url-fetch) (uri (cran-uri "umap" version)) (sha256 (base32 - "1282v09kpds83mlr7kz06k8a40ji15hw85p30vrnp1g6w64w26sm")))) + "1abfddi0rq75b7nlx6550fx9nrqa62vb92xyp05ris25jf98ciwd")))) (build-system r-build-system) (propagated-inputs (list r-matrix r-openssl r-rcpp r-reticulate r-rspectra)) -- cgit 1.4.1 From 16a867c7202766df8482a9789ad408341611d10c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:44 +0100 Subject: gnu: r-terra: Update to 1.7-3. * gnu/packages/cran.scm (r-terra): Update to 1.7-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f98c4616de..8fd6ab46dd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23268,14 +23268,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.6-47") + (version "1.7-3") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "13n6rxrrkn4wgcgq2kyyhn5nxw099hy9fbzxg78waxa6cxapwpmh")))) + "0bi7d25g1ihl8gzwycxd0l47g94gx8975r1xbj6hh0dir2br7zl9")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From e8ab96d5639ad776a21d2da6e668e2e15bd5d36d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:44 +0100 Subject: gnu: r-tidygraph: Update to 1.2.3. * gnu/packages/cran.scm (r-tidygraph): Update to 1.2.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8fd6ab46dd..067084dc0d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23302,14 +23302,14 @@ files is supported.") (define-public r-tidygraph (package (name "r-tidygraph") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "tidygraph" version)) (sha256 (base32 - "0w34jfldjkynbkyinmi1vdrfjhjrs47hm599mbnx4sxmnpbclmfm")))) + "11sn8z7bwv84lqlgnqc36n14nyhv1qdfc0gcs7nmgbl34nqhd75h")))) (properties `((upstream-name . "tidygraph"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 6ba8aa92277009685f4743a2045f351e2bb35a26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:45 +0100 Subject: gnu: r-parameters: Update to 0.20.2. * gnu/packages/cran.scm (r-parameters): Update to 0.20.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 067084dc0d..fde7044507 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23389,14 +23389,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.20.0") + (version "0.20.2") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "16y92q4h385sqc7xgdcrdmdvw0l8plxxbhcdsnx4gqqgm8di9l9p")))) + "197qna5lb3ypbl8zgsmar61gbsyyj5ma2q7r74sm0b70c9rhk9n8")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From e89aa8f19622de28835925b7a20175f674e69820 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:45 +0100 Subject: gnu: r-rgdal: Update to 1.6-4. * gnu/packages/cran.scm (r-rgdal): Update to 1.6-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fde7044507..43d3994ebb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23417,13 +23417,13 @@ effect size.") (define-public r-rgdal (package (name "r-rgdal") - (version "1.6-3") + (version "1.6-4") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "0snz5m158as39h6zdcdrydwm5n2r2vayv3xy8n3g5mmkbxyyx7i2")))) + (base32 "19rcsrlf89fr94yqwmg9b4qmm51lc4qjijk8mi9hf5v120sm6b4k")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From a43bd01e6d14d0e724712588740d5bd79c52d341 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:45 +0100 Subject: gnu: r-accept: Update to 1.0.0. * gnu/packages/cran.scm (r-accept): Update to 1.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 43d3994ebb..7babc61a2c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24262,14 +24262,14 @@ Social Sciences\" by Mark S. Handcock and Martina Morris, Springer-Verlag, (define-public r-accept (package (name "r-accept") - (version "0.9.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "accept" version)) (sha256 (base32 - "0risdxw17jk3d56q40a78slb1rcj93b6kz71hn5hbwr0iih722gr")))) + "0yjihmgi94yfwhnvgw4v235yyr8n6w1ass2qbmvk0ia1hmjis8zq")))) (properties `((upstream-name . "accept"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 5d18b18e3b47e8e9d0ec8600b9e9ccdc1ae9015a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:46 +0100 Subject: gnu: r-rngwell: Update to 0.10-9. * gnu/packages/cran.scm (r-rngwell): Update to 0.10-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7babc61a2c..5aa67b4a03 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24531,14 +24531,14 @@ facilitates insertion into pipelines, and content inspection.") (define-public r-rngwell (package (name "r-rngwell") - (version "0.10-8") + (version "0.10-9") (source (origin (method url-fetch) (uri (cran-uri "rngWELL" version)) (sha256 (base32 - "0ad1mz11l27h6apil2hd7gwz5zhi9jkjrk2jnhbkd8d0wz9g0sis")))) + "1jyanz789ylbz9a2agqv5c674zrfqn0k7s9d5dfia63dpq8cqscr")))) (properties `((upstream-name . "rngWELL"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rngWELL/") -- cgit 1.4.1 From 01707f4132bf096e86efaab298bb5ace75a902d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:46 +0100 Subject: gnu: r-randtoolbox: Update to 2.0.4. * gnu/packages/cran.scm (r-randtoolbox): Update to 2.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5aa67b4a03..e67f332b63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24576,14 +24576,14 @@ and prints vectorized images.") (define-public r-randtoolbox (package (name "r-randtoolbox") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "randtoolbox" version)) (sha256 (base32 - "0i23wj9nmsfy3x2yzlfadzrvil2yhcrxs6qxrykrqs15r9jwx3hm")))) + "0jwylffr8zajgd1x24nrv4xxlkic10i8cfd9sy0pkz2g7sai9nll")))) (properties `((upstream-name . "randtoolbox"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 1e97fd8a64be7e317dfa2c5d31e34f7d54ea3717 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:46 +0100 Subject: gnu: r-gamlss: Update to 5.4-12. * gnu/packages/cran.scm (r-gamlss): Update to 5.4-12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e67f332b63..536ce612ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24735,14 +24735,14 @@ models.") (define-public r-gamlss (package (name "r-gamlss") - (version "5.4-10") + (version "5.4-12") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "1cm0rvihniad309j26ll8kabndqzs3wdh5dak70b60z4kljrfx4c")))) + "1w5630hzir49nacpvmx28hqc8hcc9acmba9dd8zwzhz5ywwi0ycz")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b71c3edcd77b37ee62abf529ea9c246320c06563 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:47 +0100 Subject: gnu: r-tuner: Update to 1.4.2. * gnu/packages/cran.scm (r-tuner): Update to 1.4.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 536ce612ca..eb4886cd51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25044,14 +25044,14 @@ provided as well.") (define-public r-tuner (package (name "r-tuner") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (cran-uri "tuneR" version)) (sha256 (base32 - "1mfkhxprqkj5v2z23g0bj8mwdp6q5fj1krk5ggr79359bd1nl7pf")))) + "1wic18fn9cd75lky0vwd5h38pwbk2w42b0n492s83w4nf9wbx7zb")))) (properties `((upstream-name . "tuneR"))) (build-system r-build-system) (propagated-inputs (list r-signal)) -- cgit 1.4.1 From 9e5ed6e8abb4a7314219ee451a83c51ea933f7b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:47 +0100 Subject: gnu: r-tree: Update to 1.0-43. * gnu/packages/cran.scm (r-tree): Update to 1.0-43. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb4886cd51..4437e235e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25255,13 +25255,13 @@ management} (aCRM).") (define-public r-tree (package (name "r-tree") - (version "1.0-42") + (version "1.0-43") (source (origin (method url-fetch) (uri (cran-uri "tree" version)) (sha256 (base32 - "1q3jgkhl5d4d8c396cyvkw60094p0z0a3x7xwhdbi8gl4c2c65ss")))) + "11sjkm89ql1576jy0cqbxzjdpx7qs95wbgdxg92lzkiw05nrj2lv")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/tree/") (synopsis "Classification and regression trees") -- cgit 1.4.1 From ef8c540d2a5416602174b026a7adb775ef63d73a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:47 +0100 Subject: gnu: r-actuar: Update to 3.3-2. * gnu/packages/cran.scm (r-actuar): Update to 3.3-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4437e235e4..40477d136f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25946,14 +25946,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "3.3-1") + (version "3.3-2") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "16nyhn0aw2mb8915ycr46rjvg9pbcps7zxs2sgvdws9kzm027mpj")))) + "0ys7kqqbx9g2mhsn243z9vj7qkdd69d3jy1vin9v8bknwimgdxvb")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs (list r-expint)) -- cgit 1.4.1 From b74d06227fc61cc303e1e6e98afd88647daeee0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:48 +0100 Subject: gnu: r-imager: Update to 0.42.18. * gnu/packages/cran.scm (r-imager): Update to 0.42.18. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 40477d136f..45690be92b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26019,14 +26019,14 @@ number embedded in the file rather than the file extension.") (define-public r-imager (package (name "r-imager") - (version "0.42.16") + (version "0.42.18") (source (origin (method url-fetch) (uri (cran-uri "imager" version)) (sha256 (base32 - "00q2v000xanp03bzscmj3q9qnlhc97b1lgr4l19s9jmbf0hf9c5c")))) + "0ljkcvs91sjddndwdbaqg0nf9sksm0284s6kg05k027wnvbkc5f1")))) (properties `((upstream-name . "imager"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 2e7abf48d4f4ae25cfed47c1ac89cd811f080b58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:48 +0100 Subject: gnu: r-shapes: Update to 1.2.7. * gnu/packages/cran.scm (r-shapes): Update to 1.2.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 45690be92b..466a3dc518 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26426,14 +26426,14 @@ different conceptual parts of the algorithm.") (define-public r-shapes (package (name "r-shapes") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "shapes" version)) (sha256 (base32 - "1p9fr95zk3q2v277c5ksb0nh26mcpzwjzjb2lmag51z6hck8cb66")))) + "155q6asc9202f85snyjaxhm8qpj7swgzhg95sisjy506gvcb6c8z")))) (properties `((upstream-name . "shapes"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From c07e57f16154b89f39fb78942752f27a7d6d653e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:48 +0100 Subject: gnu: r-anthropometry: Update to 1.18. * gnu/packages/cran.scm (r-anthropometry): Update to 1.18. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 466a3dc518..a06a7a6682 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26507,14 +26507,14 @@ inserted into Sweave / @code{knitr} easily.") (define-public r-anthropometry (package (name "r-anthropometry") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (cran-uri "Anthropometry" version)) (sha256 (base32 - "0vxjlzxv16bygw8n57f25msq5bd1dydg41my92ximah0nzzvbg41")))) + "1zpawma8vci7swnk3vskpkb1zqmjl4jkmg4n5h7gghf89kgp0xgy")))) (properties `((upstream-name . "Anthropometry"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 66f712a8d4cf02fd01f44b102944cb74c12f9859 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:49 +0100 Subject: gnu: r-openmx: Update to 2.21.1. * gnu/packages/cran.scm (r-openmx): Update to 2.21.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a06a7a6682..c7cd6c0c2d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27812,14 +27812,14 @@ Complete access to optimized C functions is made available with (define-public r-openmx (package (name "r-openmx") - (version "2.20.7") + (version "2.21.1") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "0ki3n2i9b9880mpfxazmd6zrblzl1jngi10qnbxxvxik1x2mq3vy")))) + "13ka7c7qlb0q2jrmxg1y43gqcbsxcsw5s4cf6ckkh25gdf4mq6v3")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From f4b30acdd043d1e49c92bc88e72c9b1b7e6c2f89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:49 +0100 Subject: gnu: r-packrat: Update to 0.9.0. * gnu/packages/cran.scm (r-packrat): Update to 0.9.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c7cd6c0c2d..781b6e52c8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28223,14 +28223,14 @@ interesting features. iheatmapr uses the plotly library for interactivity.") (define-public r-packrat (package (name "r-packrat") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "packrat" version)) (sha256 (base32 - "1ni3xn51xifdb2bya5z54jn4nxgss6f23b3hn126j2kaz80h7ns5")))) + "0l3rz9p62k7ymlin88hn6ydhdaawg6jb1jii7mdyss0agxzgbz7m")))) (properties `((upstream-name . "packrat"))) (build-system r-build-system) (home-page "https://github.com/rstudio/packrat/") -- cgit 1.4.1 From 6471f296a25dfee3f3ed74c89a5afb20fac68468 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:49 +0100 Subject: gnu: r-rsconnect: Update to 0.8.29. * gnu/packages/cran.scm (r-rsconnect): Update to 0.8.29. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 781b6e52c8..8cce1f02af 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28244,14 +28244,14 @@ and reproducible way.") (define-public r-rsconnect (package (name "r-rsconnect") - (version "0.8.28") + (version "0.8.29") (source (origin (method url-fetch) (uri (cran-uri "rsconnect" version)) (sha256 (base32 - "1q0njv25xiri4ql9mfrzlwdf3l3xg9xjjj2wva9rbniafx3skf95")))) + "0hqww1nn7ap6jzy6jl936d1fxs3hqw09w6hr9pgww2zrmb99ja45")))) (properties `((upstream-name . "rsconnect"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From c930c026b279659cd89b18cf95e616a99ace51bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:49 +0100 Subject: gnu: r-rstan: Update to 2.21.8. * gnu/packages/cran.scm (r-rstan): Update to 2.21.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8cce1f02af..84feb3e81a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28449,14 +28449,14 @@ techniques to average Bayesian predictive distributions.") (define-public r-rstan (package (name "r-rstan") - (version "2.21.7") + (version "2.21.8") (source (origin (method url-fetch) (uri (cran-uri "rstan" version)) (sha256 (base32 - "0ibd3pj2pvd7658sdg95fa2yhfmxz9gy0cjwcrdr546k209j55a4")))) + "0xah8wl4lg8zh5982m20ipc6cjck1dsfi8lz1jbkg4212p1yvm5j")))) (properties `((upstream-name . "rstan"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From b0bd1fd1b43b20d954f0b65267d1de5789c2e5b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:50 +0100 Subject: gnu: r-zyp: Update to 0.11. * gnu/packages/cran.scm (r-zyp): Update to 0.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 84feb3e81a..6350340010 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28598,14 +28598,14 @@ Additional storage back-ends can be added easily.") (define-public r-zyp (package (name "r-zyp") - (version "0.10-1.1") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "zyp" version)) (sha256 (base32 - "03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9")))) + "0jmddxg88qb9f38ywdy4min7w5qadnkhqxd46b0j0gjsq95vw85q")))) (properties `((upstream-name . "zyp"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0c727a46f73ce53f675fd251150960c453aeb79a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:50 +0100 Subject: gnu: r-projpred: Update to 2.3.0. * gnu/packages/cran.scm (r-projpred): Update to 2.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6350340010..fcdbb74ead 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29431,14 +29431,14 @@ here.") (define-public r-projpred (package (name "r-projpred") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "projpred" version)) (sha256 (base32 - "0fycjmaqbcr3vp5708003flvi9ny4z04acgbcfly1ird0kcw9s3v")))) + "0ynk1i3q2qcs9d4a12341p0dq0ph7zpmbpl925vnzbg1d6swz8zl")))) (properties `((upstream-name . "projpred"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 3c44209f089f3a04a242be3a6deafaeba58b5eb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:50 +0100 Subject: gnu: r-scrypt: Update to 0.1.6. * gnu/packages/cran.scm (r-scrypt): Update to 0.1.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fcdbb74ead..69ecfaae9e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29661,14 +29661,14 @@ pies on a map.") (define-public r-scrypt (package (name "r-scrypt") - (version "0.1.4") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "scrypt" version)) (sha256 (base32 - "12q9d4m7flbvlgssvjh1ga4jswkmqjfshf6pna6qk6v087gmzdsj")))) + "11ncpv01a5lgbxl46g07a43ncjp7jdhrrciasxvxc1d56cz26jh1")))) (properties `((upstream-name . "scrypt"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 182d9423ce4a7e90944e516000700512292b21cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:51 +0100 Subject: gnu: r-lightgbm: Update to 3.3.5. * gnu/packages/cran.scm (r-lightgbm): Update to 3.3.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 69ecfaae9e..bd31d87cec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29832,14 +29832,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "3.3.4") + (version "3.3.5") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "12hcq2idjgggs8l9a5aaxbw1wsfz6byzaxqn9k6afvkf3v5srp65")))) + "1bnzggia48jkd1ffdzhznmbk76dw3mab65i7rmg967zcflapv7rh")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 164ad7fc668c7ddea2ff68879e53ba785f3a3f99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:51 +0100 Subject: gnu: r-conquer: Update to 1.3.2. * gnu/packages/cran.scm (r-conquer): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bd31d87cec..a781c20509 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30042,14 +30042,14 @@ you can automate browsers locally or remotely.") (define-public r-conquer (package (name "r-conquer") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "conquer" version)) (sha256 (base32 - "1mdwm0aanq4rx3042djvs0l2vkdx6zbzvrjfyfb9dhv0gfs8mhhl")))) + "0imrr5k7cxyxgr2jcan9fagj1p3crffga4qa4agkciz4caq9n4lg")))) (properties `((upstream-name . "conquer"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From c89cbd8f2353ec22ec15b07a2bacc0d88558b4c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:51 +0100 Subject: gnu: r-memuse: Update to 4.2-3. * gnu/packages/cran.scm (r-memuse): Update to 4.2-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a781c20509..516c9850f9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30098,13 +30098,13 @@ doi.org/10.1007/s10115-013-0679-x} for details.") (define-public r-memuse (package (name "r-memuse") - (version "4.2-2") + (version "4.2-3") (source (origin (method url-fetch) (uri (cran-uri "memuse" version)) (sha256 (base32 - "1rdp8wi9sd03qdak7mifvdc1szgk0fdzmhbikdfsza8xshm2pp33")))) + "0816s6airiqmn8faprpwmchxaay6llri4673ivlx1bp2cpvdyvwh")))) (properties `((upstream-name . "memuse"))) (build-system r-build-system) (home-page "https://github.com/shinra-dev/memuse") -- cgit 1.4.1 From 62d9721d68f65d31500db5bc4d0f3c774cf64903 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:52 +0100 Subject: gnu: r-spatstat-explore: Update to 3.0-6. * gnu/packages/cran.scm (r-spatstat-explore): Update to 3.0-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 516c9850f9..9b2105ea7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30228,13 +30228,13 @@ diagonals. This package allows you to compute the tensor product of arrays.") (define-public r-spatstat-explore (package (name "r-spatstat-explore") - (version "3.0-5") + (version "3.0-6") (source (origin (method url-fetch) (uri (cran-uri "spatstat.explore" version)) (sha256 (base32 - "0qn8dmymbnh9vdw0hysijkk2nwz5q69i62smpp8f3wy3z898lhwz")))) + "1m85as59672psx5miqwi5479mm44ddx2misxmy188bn0b0nw7k9b")))) (properties `((upstream-name . "spatstat.explore"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From a7f483633d90f2df65b040228d30286be77b520d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:52 +0100 Subject: gnu: r-spatstat-model: Update to 3.1-2. * gnu/packages/cran.scm (r-spatstat-model): Update to 3.1-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9b2105ea7a..c602de7031 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30268,13 +30268,13 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-model (package (name "r-spatstat-model") - (version "3.0-2") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "spatstat.model" version)) (sha256 (base32 - "0a6lf5y0k13h60s0lnwwfrmxswl7avcg4fhqmha1nmycidhga8z9")))) + "0njka15lcd1ldcn2kwblr9i0g10x4l88nc4vz0mxpp63idkiwz89")))) (properties `((upstream-name . "spatstat.model"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ebc710315281b0483db216a1afac68bf295a4a0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:52 +0100 Subject: gnu: r-spatstat-geom: Update to 3.0-6. * gnu/packages/cran.scm (r-spatstat-geom): Update to 3.0-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c602de7031..e52290d648 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30379,14 +30379,14 @@ package.") (define-public r-spatstat-geom (package (name "r-spatstat-geom") - (version "3.0-3") + (version "3.0-6") (source (origin (method url-fetch) (uri (cran-uri "spatstat.geom" version)) (sha256 (base32 - "111wj507i2mxi0ak8sj468w26pr2f7hgv3ssmbf0qjkp1v35cnvf")))) + "037jixp9sqvqp79rdcpvwrx8zf1p9rk60v4g1sl0jgrnd037ay33")))) (properties `((upstream-name . "spatstat.geom"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 6c5709b249925a42131bf59dc3cfdece9f2efab2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:53 +0100 Subject: gnu: r-spatstat-linnet: Update to 3.0-4. * gnu/packages/cran.scm (r-spatstat-linnet): Update to 3.0-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e52290d648..4b85bf5ba9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30435,14 +30435,14 @@ user-level code from spatstat, except for the code for linear networks.") (define-public r-spatstat-linnet (package (name "r-spatstat-linnet") - (version "3.0-3") + (version "3.0-4") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "1y9crkj9sa1hnfsfkyyq8zv6fgafv07b8w0y01qps1rd6virnns0")))) + "16sazaxf4sdnvwdzc6ggcs2v10247ywx9dk8r9vkjdgh0s5cyn10")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) -- cgit 1.4.1 From b55fb729a66a18e242db4da1ae8febabcc40df79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:53 +0100 Subject: gnu: r-spatstat-random: Update to 3.1-3. * gnu/packages/cran.scm (r-spatstat-random): Update to 3.1-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4b85bf5ba9..0aa43274ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30465,13 +30465,13 @@ for spatial data on a linear network.") (define-public r-spatstat-random (package (name "r-spatstat-random") - (version "3.0-1") + (version "3.1-3") (source (origin (method url-fetch) (uri (cran-uri "spatstat.random" version)) (sha256 - (base32 "1dp58dxw7ln9bsls9ssbb917qakvgr9nf2jci6zq31rv0rf8934k")))) + (base32 "1l21qi9cdq7bgflyjxprqgc1fwvzbsnnhywkkjzjl018r9czb2mj")))) (properties `((upstream-name . "spatstat.random"))) (build-system r-build-system) (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-utils)) -- cgit 1.4.1 From 6a04cf5d298b3b54eb4c2ee026dce370bb13be82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:53 +0100 Subject: gnu: r-spatstat: Update to 3.0-3. * gnu/packages/cran.scm (r-spatstat): Update to 3.0-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0aa43274ca..47f26189bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30493,14 +30493,14 @@ sampler).") (define-public r-spatstat (package (name "r-spatstat") - (version "3.0-2") + (version "3.0-3") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "1k8qs5hsy0n4rh7ccp6bdnqgbw3fvjdp55bc0zhjqwbbhq8c0ax0")))) + "0ajhf43jkds9b0x7l02mis47b1c5w78i742axa84g0ysaqv7gbqx")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 256c12c712f83b7c6719081ebf9c22f819b58b66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:54 +0100 Subject: gnu: r-rcpptoml: Update to 0.2.2. * gnu/packages/cran.scm (r-rcpptoml): Update to 0.2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 47f26189bc..1de7e4194b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30573,13 +30573,13 @@ semantics and supports interaction with @code{ALTREP} vectors.") (define-public r-rcpptoml (package (name "r-rcpptoml") - (version "0.1.7") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "RcppTOML" version)) (sha256 - (base32 "0h8517ipwqhqkhcfiyqmvsb585g01p0ra0azbpzyxip6pq6g029g")))) + (base32 "1ak3dwzdrmq9kd30i12fy582rsn5xfljw214liv1w8l2rbwr24rp")))) (properties `((upstream-name . "RcppTOML"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) -- cgit 1.4.1 From 7b28ac2a7ecfa5d3400b827d55dcd70dac490f05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:54 +0100 Subject: gnu: r-clusterr: Update to 1.3.0. * gnu/packages/cran.scm (r-clusterr): Update to 1.3.0. [propagated-inputs]: Remove r-gtools. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1de7e4194b..bfaf4b3415 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30670,20 +30670,19 @@ model.") (define-public r-clusterr (package (name "r-clusterr") - (version "1.2.9") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "ClusterR" version)) (sha256 (base32 - "04aswnmxzpffc1fj2hf85pc5b10fh418k29a1x5cs1f1y7b3zav3")))) + "1k3rpz8rjw7r2lrx79h62m46hwxrn57hs5n7072g2rnvmc9jx3j2")))) (properties `((upstream-name . "ClusterR"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-gmp - r-gtools r-lifecycle r-rcpp r-rcpparmadillo)) -- cgit 1.4.1 From 87c42b0dd358b7d971a386783072d7dbeba1f361 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:54 +0100 Subject: gnu: r-visdat: Update to 0.6.0. * gnu/packages/cran.scm (r-visdat): Update to 0.6.0. [propagated-inputs]: Add r-cli, r-forcats, and r-scales. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bfaf4b3415..64ddd0376f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30812,21 +30812,24 @@ not digit characters.") (define-public r-visdat (package (name "r-visdat") - (version "0.5.3") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "visdat" version)) (sha256 (base32 - "1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j")))) + "1675az0lfvmwzh9c3fknnk0n2kz1w7hy0kdj3a37n5j1knxwsjhh")))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-cli + r-dplyr + r-forcats r-ggplot2 r-glue r-magrittr r-purrr r-readr + r-scales r-tibble r-tidyr)) (native-inputs -- cgit 1.4.1 From 3285df3108f179d3cad23a8ec0cb466b40b5d9eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:55 +0100 Subject: gnu: r-flexsurv: Update to 2.2.2. * gnu/packages/cran.scm (r-flexsurv): Update to 2.2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64ddd0376f..d6fa7177c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30961,14 +30961,14 @@ censored data.") (define-public r-flexsurv (package (name "r-flexsurv") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "flexsurv" version)) (sha256 (base32 - "1xqsihvrb8b5mzkr3mhg0ydm8kkcw1k0kgp6ndyavw8yahl059as")))) + "1qshsii5fqpx4l113vr4lx9ijxhcr8494lx3ixjdbzy58077adb6")))) (properties `((upstream-name . "flexsurv"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From bf2d3f2bfa6578d0c4db5a875dc4293dc77f5627 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:55 +0100 Subject: gnu: r-tidypredict: Update to 0.5. * gnu/packages/cran.scm (r-tidypredict): Update to 0.5. [propagated-inputs]: Remove r-stringr. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d6fa7177c3..76c4cc89af 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31819,14 +31819,14 @@ models without involving a test set.") (define-public r-tidypredict (package (name "r-tidypredict") - (version "0.4.9") + (version "0.5") (source (origin (method url-fetch) (uri (cran-uri "tidypredict" version)) (sha256 (base32 - "0x0r36zvny4rqgndx7iqh39yhr53gl4d8wd8wpvdcgg35q6z02z2")))) + "1h05gm6fwjh6v9qqi9jbislf008h7d50k003qymb0x9gz6p75qgy")))) (properties `((upstream-name . "tidypredict"))) (build-system r-build-system) (propagated-inputs @@ -31835,7 +31835,6 @@ models without involving a test set.") r-knitr r-purrr r-rlang - r-stringr r-tibble r-tidyr)) (native-inputs -- cgit 1.4.1 From 9f8b51f15b31eb8a8a9e9d22897ea28fdbc0f0cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:56 +0100 Subject: gnu: r-janitor: Update to 2.2.0. * gnu/packages/cran.scm (r-janitor): Update to 2.2.0. [propagated-inputs]: Add r-hms. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76c4cc89af..b15ea2b544 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31875,17 +31875,18 @@ and \"Persuasion\".") (define-public r-janitor (package (name "r-janitor") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "janitor" version)) (sha256 (base32 - "09nqm957m2f54y2l30619b58x4i7gxwvr2lwg5kly5xy1ya1a1nn")))) + "1bmsyrmy833kzj3s9s6207f54bx1ca0ianwhiyrlp0jfbqcd1m99")))) (properties `((upstream-name . "janitor"))) (build-system r-build-system) (propagated-inputs (list r-dplyr + r-hms r-lifecycle r-lubridate r-magrittr -- cgit 1.4.1 From 7325c6c9d9e56561f5cee3a768c9494e23e81ea5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:56 +0100 Subject: gnu: r-modeldata: Update to 1.1.0. * gnu/packages/cran.scm (r-modeldata): Update to 1.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b15ea2b544..676324cc0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32090,14 +32090,14 @@ expressive statistical grammar that coheres with the Tidy design framework.") (define-public r-modeldata (package (name "r-modeldata") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "modeldata" version)) (sha256 (base32 - "0ik4r25l69brkf0l248bln1kicy7dpi6mziwn19by8rq3f8fylhy")))) + "0wsqn8vchvanfbfh1l1q54wzgnqx703r32a7xm4zqvq2jixc2nww")))) (properties `((upstream-name . "modeldata"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 89f8ac6cb931962b337aa98f8080d60d07ae872d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:56 +0100 Subject: gnu: r-conflicted: Update to 1.2.0. * gnu/packages/cran.scm (r-conflicted): Update to 1.2.0. [propagated-inputs]: Add r-cli. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 676324cc0b..53f2142239 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32141,18 +32141,18 @@ distributions.") (define-public r-conflicted (package (name "r-conflicted") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "conflicted" version)) (sha256 (base32 - "1qg9ar114r98wm0pnf65mss4v2ksq3924rlpm13mqp4s3p6j9yi4")))) + "121h4b4rms23szcfs1nrbgdk812d61vhrmwn9lgpsgnsaaxqd6y9")))) (properties `((upstream-name . "conflicted"))) (build-system r-build-system) (propagated-inputs - (list r-memoise r-rlang)) + (list r-cli r-memoise r-rlang)) (home-page "https://github.com/r-lib/conflicted") (synopsis "Alternative conflict resolution strategy") (description -- cgit 1.4.1 From 587503fe7cc42fd9aa59031b0a699710a8c32521 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:57 +0100 Subject: gnu: r-seqminer: Update to 8.6. * gnu/packages/cran.scm (r-seqminer): Update to 8.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 53f2142239..c8069b5229 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32408,14 +32408,14 @@ designs. Broman et al. (2018) .") (define-public r-seqminer (package (name "r-seqminer") - (version "8.5") + (version "8.6") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "1ki8b4bgb3ky9y3x2g56h7i94lk345awgwkg10lys022jxhm30d7")))) + "1fm76mam5hp5v0hj27ywna7vafrw7mnwph30fqdb17163rrhr1ca")))) (build-system r-build-system) (inputs (list zlib)) -- cgit 1.4.1 From 88e286cad221bffadcca7e05eae9d76eac523003 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:57 +0100 Subject: gnu: r-phangorn: Update to 2.11.1. * gnu/packages/cran.scm (r-phangorn): Update to 2.11.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8069b5229..645529299b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32659,14 +32659,14 @@ distributed as independent packages.") (define-public r-phangorn (package (name "r-phangorn") - (version "2.10.0") + (version "2.11.1") (source (origin (method url-fetch) (uri (cran-uri "phangorn" version)) (sha256 (base32 - "1kjxp352jdk1amxpk9jrql490d0qy79zm65y8szyxrm1adqghlyi")))) + "086lxqzqx1n3237h9q28r54libaz2xk9h3f6vfj8l49yw356w28h")))) (build-system r-build-system) (propagated-inputs (list r-ape -- cgit 1.4.1 From 8372fbd60c6296a819df7d2a925aeef48e5ea09f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:57 +0100 Subject: gnu: r-vdiffr: Update to 1.0.5. * gnu/packages/cran.scm (r-vdiffr): Update to 1.0.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 645529299b..492492bafd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33357,14 +33357,14 @@ unit tests of graphics).") (define-public r-vdiffr (package (name "r-vdiffr") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "vdiffr" version)) (sha256 (base32 - "1z8nn8yh6jfzb9r7ylmigwh1p30lrclqm6khmp323qqphzmzfdwy")))) + "1w6hqjb57q6ys9d6d4sh8v2s9hkgg1mkpil8lj1nld5pzir7pgqc")))) (properties `((upstream-name . "vdiffr"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 6b3b5d9719644724e0a58522eceb4741692dfba9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:58 +0100 Subject: gnu: r-highlight: Update to 0.5.1. * gnu/packages/cran.scm (r-highlight): Update to 0.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 492492bafd..4446a138a4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33389,14 +33389,14 @@ test cases.") (define-public r-highlight (package (name "r-highlight") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "highlight" version)) (sha256 (base32 - "1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf")))) + "06sirfmkdl355rfr5bb475829v7zx1spkz82vi31vl55jzijq54m")))) (properties `((upstream-name . "highlight"))) (build-system r-build-system) (home-page "https://github.com/hadley/highlight") -- cgit 1.4.1 From 0c50826e34e46722757d9bb840fe195652efd9d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:58 +0100 Subject: gnu: r-ragg: Update to 1.2.5. * gnu/packages/cran.scm (r-ragg): Update to 1.2.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4446a138a4..31d179f262 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33474,14 +33474,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.2.4") + (version "1.2.5") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "1k8dd08a2f3dg4zrq37cfvljqg413snhzmd0440amvrfd9iyaiy5")))) + "1yd89p4f2b7r2n1kl6lybbgd04kqvlf14zgmp7pxw770w1slsvwk")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 51fadbe9130e2fc112bfea5f11fd10bad2646724 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:58 +0100 Subject: gnu: r-pdftools: Update to 3.3.3. * gnu/packages/cran.scm (r-pdftools): Update to 3.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 31d179f262..c752d75f6c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34035,14 +34035,14 @@ parallel programming style, which is intended for batch parallel execution.") (define-public r-pdftools (package (name "r-pdftools") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (cran-uri "pdftools" version)) (sha256 (base32 - "012s98ghj3mk0adghbx2nyrwnja0707ym13nhjpjwj4xd7bll7s5")))) + "174hsmdpykgxkgbif562lsnrlsybhjbjh4r7w9pc5hss42jxzh7z")))) (properties `((upstream-name . "pdftools"))) (build-system r-build-system) (inputs (list zlib poppler)) -- cgit 1.4.1 From 2958f69440e82288926e618a23bfdd16bbfe50c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:59 +0100 Subject: gnu: r-lwgeom: Update to 0.2-11. * gnu/packages/cran.scm (r-lwgeom): Update to 0.2-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c752d75f6c..7af2f6ec7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34164,14 +34164,14 @@ and formatted text files with additional meta-data, such including @code{.csv}, (define-public r-lwgeom (package (name "r-lwgeom") - (version "0.2-10") + (version "0.2-11") (source (origin (method url-fetch) (uri (cran-uri "lwgeom" version)) (sha256 (base32 - "1gdvp2q4mzlg1kpjqxkiqxw1r5c4n5pxwvhdbzp89a3gyyjgh7zf")))) + "069lsr050qgr1vkg9smb6h3cg82yazb3xxkbjinmdyc1i7skrmvz")))) (properties `((upstream-name . "lwgeom"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 70feac1f8b8bccc1e5c27927b167913bbf47584f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:59 +0100 Subject: gnu: r-delaporte: Update to 8.1.0. * gnu/packages/cran.scm (r-delaporte): Update to 8.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7af2f6ec7a..9c0b58936c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34383,14 +34383,14 @@ BTM-WWW13.pdf}.") (define-public r-delaporte (package (name "r-delaporte") - (version "8.0.3") + (version "8.1.0") (source (origin (method url-fetch) (uri (cran-uri "Delaporte" version)) (sha256 (base32 - "1d1jkbxlwnqznh9pkjpkr7np2nmqzjvrdmlb210y1lb08mqmb73w")))) + "08si87f6zjsmmzgvhnfjw8l7lcwlfj2qd4zf6ypm197vdhqw0d0r")))) (properties `((upstream-name . "Delaporte"))) (build-system r-build-system) (native-inputs (list gfortran)) -- cgit 1.4.1 From e6b9b1b8127b6bc8557f08dcf2a76a1ca5b0c20c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:08:59 +0100 Subject: gnu: r-rjsonio: Update to 1.3-1.8. * gnu/packages/cran.scm (r-rjsonio): Update to 1.3-1.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9c0b58936c..5dd9c12ce4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34411,14 +34411,14 @@ variability than the Poisson, but less than the negative binomial.") (define-public r-rjsonio (package (name "r-rjsonio") - (version "1.3-1.6") + (version "1.3-1.8") (source (origin (method url-fetch) (uri (cran-uri "RJSONIO" version)) (sha256 (base32 - "17x0ayk7daprbc8w2hvb2jl9mfnw4dic9yc3sr5adcjqfzmcklc2")))) + "1xak6n15ck7rj9swxk99vpjly1naxgz9gj6zjmib2lkq7inmgw7n")))) (properties `((upstream-name . "RJSONIO"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=RJSONIO") -- cgit 1.4.1 From 2d67a4aee938ce81beb40c93964c388f8992421e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:00 +0100 Subject: gnu: r-vroom: Update to 1.6.1. * gnu/packages/cran.scm (r-vroom): Update to 1.6.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5dd9c12ce4..a5548a43b0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34716,14 +34716,14 @@ time zone manipulations.") (define-public r-vroom (package (name "r-vroom") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "vroom" version)) (sha256 (base32 - "19kcsa4i1pc4vvwp2y21izj5rv4a9mvl8a9rylx6jhk4j7gwq657")))) + "0z40655l03gz2pdxlm9zq5f3c5ahpnc2qqwdnglcgy8j6bak63pb")))) (properties `((upstream-name . "vroom"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 94741d0d9efdf79b41927c2176609060755f5300 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:00 +0100 Subject: gnu: r-protolite: Update to 2.2.0. * gnu/packages/cran.scm (r-protolite): Update to 2.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5548a43b0..e1106bc1cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34824,13 +34824,13 @@ using either @code{httpuv} or @code{Rhttpd}.") (define-public r-protolite (package (name "r-protolite") - (version "2.1.3") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "protolite" version)) (sha256 - (base32 "1sr56hrd5n79igy3168993cxzqkzizhal4s1g22pd0rgdixm27ch")))) + (base32 "1bqqw43irk2a9xqlylxlbxpcaa40wdxdx4y6kqhzibxvw1p7drii")))) (properties `((upstream-name . "protolite"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 604cf11aa4c42a2470d8f27005dcc1d7a3b33426 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:00 +0100 Subject: gnu: r-paws-common: Update to 0.5.5. * gnu/packages/cran.scm (r-paws-common): Update to 0.5.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e1106bc1cb..e7444a74c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35390,14 +35390,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.5.3") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "090csb0wjnsfhkphws5anrnml18y1k54yi48lxav8wp5kqj4wlb6")))) + "06iqh38xmq9zdqd07kayxqfy903lh62k7yp7b0kv6qsyazpz7krq")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 24506cc72b7708902e933cb3d8a9798b4f295da8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:01 +0100 Subject: gnu: r-paws-customer-engagement: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-customer-engagement): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e7444a74c3..f37834633c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35421,14 +35421,14 @@ Service (S3).") (define-public r-paws-customer-engagement (package (name "r-paws-customer-engagement") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.customer.engagement" version)) (sha256 (base32 - "0ac6hzn4ilfjhzdmc9x80999fl18cz16mky31qd3y09m93w2xkdj")))) + "12viq760wd5b7dl800075hvm8jy19q112m6rlgyz85znwbiam2qj")))) (properties `((upstream-name . "paws.customer.engagement"))) (build-system r-build-system) -- cgit 1.4.1 From 78b6ca0404300596d18618fa9d0de30c86a6c310 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:01 +0100 Subject: gnu: r-paws-cost-management: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-cost-management): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f37834633c..531b6bb4f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35445,14 +35445,14 @@ service, and more.") (define-public r-paws-cost-management (package (name "r-paws-cost-management") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.cost.management" version)) (sha256 (base32 - "0in4f8ygw5g2v6vl3lz2y0v51llglh8b1ymbd04d54xxlgn83knh")))) + "0rpl6dfv6xa7ysqhhskcj7kix4s087yrxav9n33730hk1gjf1g62")))) (properties `((upstream-name . "paws.cost.management"))) (build-system r-build-system) -- cgit 1.4.1 From 128a7f6f66105aa262a696f46d56784f4c2474da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:01 +0100 Subject: gnu: r-paws-developer-tools: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-developer-tools): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 531b6bb4f4..8b55d271a9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35469,13 +35469,13 @@ more.") (define-public r-paws-developer-tools (package (name "r-paws-developer-tools") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.developer.tools" version)) (sha256 - (base32 "16gb8g8s67al7qdd95fbigxqkih9a9p7slkyf3cga42wb6miiby2")))) + (base32 "0d1j9wilwx2harvslg9vs6k8w7631pqgr1c8346wzjk5387fpsac")))) (properties `((upstream-name . "paws.developer.tools"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 27ee75d465eb706549eac5c2f0bd90c40b4f74ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:02 +0100 Subject: gnu: r-paws-end-user-computing: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-end-user-computing): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b55d271a9..8eb81e99f9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35491,13 +35491,13 @@ deployment, and more.") (define-public r-paws-end-user-computing (package (name "r-paws-end-user-computing") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.end.user.computing" version)) (sha256 - (base32 "1xxsz86nx128sizym9np8vldzkbym0p3i6vcy94kq1y0cylaicv3")))) + (base32 "0709jwrihggqsp3p99sqldsfk7bww3pgl9x0akrnm60daqxhhyqv")))) (properties `((upstream-name . "paws.end.user.computing"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From d9c4724313bb69cf99fa6b0d8c1093e9749bc636 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:02 +0100 Subject: gnu: r-paws-application-integration: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-application-integration): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8eb81e99f9..f7f0b95220 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35513,14 +35513,14 @@ and more.") (define-public r-paws-application-integration (package (name "r-paws-application-integration") - (version "0.1.13") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.application.integration" version)) (sha256 (base32 - "0qxrjmqywp4ychjwfbripfin4vlv0k041ycmr3pjr6p3dg910i3w")))) + "0m79k4q3yalzym4alv4h1mggr9sf8sc1vk1islx5j63s2p6m4j3g")))) (properties `((upstream-name . "paws.application.integration"))) (build-system r-build-system) -- cgit 1.4.1 From 7f8b5db616a215b5f1de29ececd3e46838d4412b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:02 +0100 Subject: gnu: r-paws-security-identity: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-security-identity): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f7f0b95220..a844ce20c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35537,14 +35537,14 @@ Simple Notification Service (SNS) publish/subscribe messaging, and more.") (define-public r-paws-security-identity (package (name "r-paws-security-identity") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.security.identity" version)) (sha256 (base32 - "092lz2ipn5iqr593x7ra8c0bj64yf6315mdc3llgwrjyb4vfxif9")))) + "0rnws1d8wy3nhg2fyidpa21sfbz3r7jalrklnx6l8s92jyycmhbd")))) (properties `((upstream-name . "paws.security.identity"))) (build-system r-build-system) -- cgit 1.4.1 From 1c6f1e9500dbcf07f959845f021a4ad7ae6334a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:03 +0100 Subject: gnu: r-paws-analytics: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-analytics): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a844ce20c1..f80c4b0a3c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35562,14 +35562,14 @@ more.") (define-public r-paws-analytics (package (name "r-paws-analytics") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.analytics" version)) (sha256 (base32 - "04gnaxmj21l312xkrsd9bisi0bz9h6h5fyhwlqylcxi077z1yb2g")))) + "1ixgrcfixx7h17wryml63n28ldgxi2srqw3bqglws54h5acgqza9")))) (properties `((upstream-name . "paws.analytics"))) (build-system r-build-system) -- cgit 1.4.1 From da896211b43de2b669911c5678f4081c60976dff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:03 +0100 Subject: gnu: r-paws-machine-learning: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-machine-learning): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f80c4b0a3c..f936589399 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35586,14 +35586,14 @@ Elasticsearch search engine, and more.") (define-public r-paws-machine-learning (package (name "r-paws-machine-learning") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.machine.learning" version)) (sha256 (base32 - "01w2y5952pk50xjbzby2pc51xrkrzjpfxbmii1b10cl2xgzfkxsa")))) + "0nmxb53x0vsd2g69qnxxs4hapcbg53r9b26cdkhpmj6ijj7v1hh3")))) (properties `((upstream-name . "paws.machine.learning"))) (build-system r-build-system) -- cgit 1.4.1 From 44057dfff1cfea98773b24f8bedb25b7ff1c6440 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:03 +0100 Subject: gnu: r-paws-management: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-management): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f936589399..c374099b64 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35610,14 +35610,14 @@ natural language processing, speech recognition, translation, and more.") (define-public r-paws-management (package (name "r-paws-management") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.management" version)) (sha256 (base32 - "09k7wg0jlj40zs2yb3vldffpkdcjg7ap98n7c5lxr5plpca08swg")))) + "1hdjgbrfrhrh9ss3lhnsjd2qpz22mrb95qvdcfngz2i8aa73hmpg")))) (properties `((upstream-name . "paws.management"))) (build-system r-build-system) -- cgit 1.4.1 From f178a3ba2a9846af742df9d218cfe204678a6901 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:04 +0100 Subject: gnu: r-paws-networking: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-networking): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c374099b64..7210fc8f23 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35634,14 +35634,14 @@ monitoring, Auto Scaling for automatically scaling resources, and more.") (define-public r-paws-networking (package (name "r-paws-networking") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.networking" version)) (sha256 (base32 - "02hxaa5nlj70mdggh379ij3fn09xm8h5ldzsyf45c342prpl6zwj")))) + "1fyr236pk6pyc6qck8i8mn855wxlbcmb40mnwmhaqjfxy503jjh7")))) (properties `((upstream-name . "paws.networking"))) (build-system r-build-system) -- cgit 1.4.1 From 9c4dd0e321ebef2f588dd9d845175a09fb3140a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:04 +0100 Subject: gnu: r-paws-storage: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-storage): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7210fc8f23..c461e3b975 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35682,14 +35682,14 @@ database, and more.") (define-public r-paws-storage (package (name "r-paws-storage") - (version "0.1.12") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.storage" version)) (sha256 (base32 - "06m887vpqp5d6k3zxdlga599dsv8v3rladk7xqaxqnld1f17am04")))) + "1yqd1a1c0m978x1ngk39x7sb0glmcy855nw7m1wbgn2mxma0q3li")))) (properties `((upstream-name . "paws.storage"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b86b379bfce0cbbae48f397b50546993fc8079c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:04 +0100 Subject: gnu: r-paws-compute: Update to 0.2.0. * gnu/packages/cran.scm (r-paws-compute): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c461e3b975..fb99d1b444 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35704,14 +35704,14 @@ services, including Simple Storage Service (S3).") (define-public r-paws-compute (package (name "r-paws-compute") - (version "0.1.13") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "paws.compute" version)) (sha256 (base32 - "1s7g4y2h763xf32p08drs3ygkfqb2zjikkgxb7yl91gk13zp7kjm")))) + "10bfcwsriyl73mp3wi9kvn6msy1g4ci71jmpv61bcqngp9qmv4wg")))) (properties `((upstream-name . "paws.compute"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 20e773a8b3a764d5016820e5be6659fb31f4cf6c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:04 +0100 Subject: gnu: r-mass: Update to 7.3-58.2. * gnu/packages/statistics.scm (r-mass): Update to 7.3-58.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 58b933f033..acf2b59727 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -508,14 +508,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-58.1") + (version "7.3-58.2") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "080l4gqkaw9r4s7b0q9hda489rn24p4ma5xf4g8405qkzgif817p")))) + "0jvqvlmb1fjqhcnix1blj7hjiyxy7m1rfjdv3sr2nhyad19rvh5m")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") -- cgit 1.4.1 From 7b9fb4007345d8f902f23b39dd41a421984ecb3b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:05 +0100 Subject: gnu: r-class: Update to 7.3-21. * gnu/packages/statistics.scm (r-class): Update to 7.3-21. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index acf2b59727..47385b9832 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -529,14 +529,14 @@ Applied Statistics with S\" (4th edition, 2002) by Venables and Ripley.") (define-public r-class (package (name "r-class") - (version "7.3-20") + (version "7.3-21") (source (origin (method url-fetch) (uri (cran-uri "class" version)) (sha256 (base32 - "10slys2jny4k2j8l8k97hwrwd6ryzajfnzywqpq2yc9bqxmh8nz6")))) + "1pydmsy4glvdbvm8ci76br69qhlfgjq8irwm4jk63nnjli54068c")))) (build-system r-build-system) (propagated-inputs (list r-mass)) -- cgit 1.4.1 From 0876435e654a871a2e076b616966b893d245c1b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:05 +0100 Subject: gnu: r-codetools: Update to 0.2-19. * gnu/packages/statistics.scm (r-codetools): Update to 0.2-19. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 47385b9832..7a66a898d7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -573,14 +573,14 @@ Hubert, based on Kaufman and Rousseeuw (1990) \"Finding Groups in Data\".") (define-public r-codetools (package (name "r-codetools") - (version "0.2-18") + (version "0.2-19") (source (origin (method url-fetch) (uri (cran-uri "codetools" version)) (sha256 (base32 - "0a2c115glq8jxixwfigrpvjabhxchn9r4mc40y41dg9dg6wsd7hs")))) + "1ardg28x2cvilkgsj6bdvvp5snsy3rj7jbz9bpcdlcvzr1kybdy4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/codetools") (synopsis "Code analysis tools for R") -- cgit 1.4.1 From 196d39dd531d0bca44aeaecb31a1c0de751a7239 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:05 +0100 Subject: gnu: r-nlme: Update to 3.1-162. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-162. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7a66a898d7..fb904c181b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -678,13 +678,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-161") + (version "3.1-162") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "0pw9kwhac6a01zcchl4xxy2rk3ghzc9kxxn6kjkh2z4iq41a1z9a")))) + (base32 "0rywlbbg76c8nx62h0fj49va1y59z1qrkfjc9ihs5bslambs4vds")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) -- cgit 1.4.1 From b4fbd4624a8681a4e017bb0e5b7503e8c4bbe619 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:05 +0100 Subject: gnu: r-spatial: Update to 7.3-16. * gnu/packages/statistics.scm (r-spatial): Update to 7.3-16. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fb904c181b..c75f3cf8cc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -760,14 +760,14 @@ classification, regression and survival trees.") (define-public r-spatial (package (name "r-spatial") - (version "7.3-15") + (version "7.3-16") (source (origin (method url-fetch) (uri (cran-uri "spatial" version)) (sha256 (base32 - "1vwc7ingskdj1k4nq418x9yl3cw699pckb9xh5a1yp3g9plknqg5")))) + "01p42q72mb8b4fdm75723nj64r3l0d8px1l9fyklihay9jk6arg4")))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Functions for kriging and point pattern analysis") -- cgit 1.4.1 From 140ef5a26204fc5382e93167bc372667d0648b39 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:05 +0100 Subject: gnu: r-stringi: Update to 1.7.12. * gnu/packages/statistics.scm (r-stringi): Update to 1.7.12. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c75f3cf8cc..d8058fb824 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1161,14 +1161,14 @@ solution for sending email, including attachments, from within R.") (define-public r-stringi (package (name "r-stringi") - (version "1.7.8") + (version "1.7.12") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "074b8wky3dhm4vcdqliwz6cqw20ah2x4dcasvnidilbfrnqii2ak")))) + "02g0464sbprrbjlacx727p9ad1s5nbxl2mnvfmm9h7q000lsrs7g")))) (build-system r-build-system) (inputs (list icu4c)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 2c6e5c178b31ab0ff729ce9fbe190c486457db19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:06 +0100 Subject: gnu: r-gdtools: Update to 0.3.0. * gnu/packages/statistics.scm (r-gdtools): Update to 0.3.0. [propagated-inputs]: Add r-gfonts, r-htmltools, and r-memoise. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d8058fb824..c72ffa99dd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1300,21 +1300,21 @@ agnes cluster diagrams.") (define-public r-gdtools (package (name "r-gdtools") - (version "0.2.4") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "0a1hqg5b484ji4g9dy0zi06wn9w7pk6hiy5ljzc1zgj9mbhlr21j")))) + "1lkyzavgdivxmpvyqx81caizy1yrr8xp47qzgmfcn6k4inrn51jl")))) (build-system r-build-system) (native-inputs (list pkg-config)) (inputs (list cairo fontconfig freetype zlib)) (propagated-inputs - (list r-rcpp r-systemfonts)) + (list r-gfonts r-htmltools r-memoise r-rcpp r-systemfonts)) (home-page "https://cran.r-project.org/web/packages/gdtools") (synopsis "Utilities for graphical rendering") (description -- cgit 1.4.1 From b2aad281d8bedf51d8d3b78b21054c1e4bc6ea30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:06 +0100 Subject: gnu: r-svglite: Update to 2.1.1. * gnu/packages/statistics.scm (r-svglite): Update to 2.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c72ffa99dd..c63eb3b822 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1325,14 +1325,14 @@ and to generate base64 encoded string from raster matrix.") (define-public r-svglite (package (name "r-svglite") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "svglite" version)) (sha256 (base32 - "16wwhfmp9agdz9azslgd8qs77fllhdp6p0m304qfh2p8qy8gah5d")))) + "0mmcipyqq4hs8fnb7301gdhl9ic4m80f1fp2x6z5vc61xrlh2w28")))) (build-system r-build-system) (inputs (list libpng zlib)) -- cgit 1.4.1 From a44daa622680acc8b2262be621894a3d3ee907fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:06 +0100 Subject: gnu: r-bh: Update to 1.81.0-1. * gnu/packages/statistics.scm (r-bh): Update to 1.81.0-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c63eb3b822..759a4f254b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1412,13 +1412,13 @@ R/DBMS implementations.") (define-public r-bh (package (name "r-bh") - (version "1.78.0-0") + (version "1.81.0-1") (source (origin (method url-fetch) (uri (cran-uri "BH" version)) (sha256 (base32 - "1cwc1q8w9d6i81nclgi7lycsnpj0dcbxlv9rdb0f04r0d03rv7iv")))) + "0r7zjxpbm2paliplprwf9769a57clqaiskiiadiy10gissnqn77m")))) (build-system r-build-system) (home-page "https://github.com/eddelbuettel/bh") (synopsis "R package providing subset of Boost headers") -- cgit 1.4.1 From 336f6c4ca9299fbd4106026d476c7cfd72629d03 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:06 +0100 Subject: gnu: r-evaluate: Update to 0.20. * gnu/packages/statistics.scm (r-evaluate): Update to 0.20. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 759a4f254b..4cff9b5be9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1430,13 +1430,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "1k36mpb12nvcr5bv3n6591shhr38d6zpfwgj643cgprd8l0kvk39")))) + "1w7zi9cvbn3751hprfpb7waia4faqn8xa8q9jrc0nq03avldkx9m")))) (build-system r-build-system) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") -- cgit 1.4.1 From 57bc6e61389b85dd48019cbb78c82c00df2d75ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:06 +0100 Subject: gnu: r-formatr: Update to 1.14. * gnu/packages/statistics.scm (r-formatr): Update to 1.14. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4cff9b5be9..2a48bf84b0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1450,13 +1450,13 @@ adapted for other output formats, such as HTML or LaTeX.") (define-public r-formatr (package (name "r-formatr") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (cran-uri "formatR" version)) (sha256 (base32 - "09z5wvbhrr2s2d196cxwzvjn0qr6pf4czrfqwdzqgqrdpwrxq1xj")))) + "0k271w4bhlj7r9igkiyfw7d7bg30s2mn4sr4alb8f9w57wnapfjf")))) (build-system r-build-system) (native-inputs (list r-knitr)) -- cgit 1.4.1 From 6ce4a6defbe0cbdbde8a8821faea3ab7f3d8a986 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:07 +0100 Subject: gnu: r-markdown: Update to 1.5. * gnu/packages/statistics.scm (r-markdown): Update to 1.5. [propagated-inputs]: Remove r-mime. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2a48bf84b0..6470063675 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1516,13 +1516,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "0ziwirplzjcci2km6wln035qfd2irjl58r77kl98r8s257kavqz0")))) + "05lq5r698bk4qs2qklvri3rlbdss9w58n5y91yf3k6x5bzwh6580")))) (build-system r-build-system) ;; Skip check phase because the tests require the r-knitr package to be ;; installed. This prevents installation failures. Knitr normally @@ -1530,7 +1530,7 @@ data derived from /etc/mime.types in UNIX-type systems.") ;; package. (arguments `(#:tests? #f)) (propagated-inputs - (list r-commonmark r-mime r-xfun)) + (list r-commonmark r-xfun)) (home-page "https://github.com/rstudio/markdown") (synopsis "Markdown rendering for R") (description -- cgit 1.4.1 From 66f3db550444ce0ecd1ece2affcc6d194f46ecb6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:07 +0100 Subject: gnu: r-yaml: Update to 2.3.7. * gnu/packages/statistics.scm (r-yaml): Update to 2.3.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6470063675..c8657117ba 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1542,13 +1542,13 @@ syntax that can be converted to XHTML or other formats.") (define-public r-yaml (package (name "r-yaml") - (version "2.3.6") + (version "2.3.7") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "09msw6k0hsazjna53ya3c6p8alfajs7cw5k2rm62xvslcs6rvlax")))) + "1aw0cvaqw8a0d1r3cplj5kiabkcyz8fghcpi0ax8mi7rw0cv436j")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit 1.4.1 From f8316c77a01cb35ce728e886e64290c5d30085d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:07 +0100 Subject: gnu: r-knitr: Update to 1.42. * gnu/packages/statistics.scm (r-knitr): Update to 1.42. [propagated-inputs]: Remove r-stringr. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c8657117ba..f87fa8c6f2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1560,16 +1560,16 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.41") + (version "1.42") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "1izv1m56ngc20wx4da9mmr5ll6ah14ka8dqn9i3pd7ah70lmya81")))) + "1wrha732mhlc3la61ibm5l1b5qygswwfwjpmvq0s2kcy12hg2i4k")))) (build-system r-build-system) (propagated-inputs - (list r-evaluate r-highr r-stringr r-xfun r-yaml)) + (list r-evaluate r-highr r-xfun r-yaml)) (home-page "https://yihui.org/knitr/") (synopsis "General-purpose package for dynamic report generation in R") (description -- cgit 1.4.1 From b961fa83b45ebe5e24c0c6f17b98eecb8c43a10d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:07 +0100 Subject: gnu: r-pryr: Update to 0.1.6. * gnu/packages/statistics.scm (r-pryr): Update to 0.1.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f87fa8c6f2..69a8f3c01f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1623,13 +1623,13 @@ the execution time of R expressions.") (define-public r-pryr (package (name "r-pryr") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "pryr" version)) (sha256 (base32 - "02vp1y7zhv22id43j5c0gdcgn9171dyypqp8rqrlc3w5a7n565kv")))) + "013p2xxd51kr9ddx051cvn45mzgj44fm47nkchdb13l0885a7hb8")))) (build-system r-build-system) (propagated-inputs (list r-codetools r-lobstr r-rcpp r-stringr)) -- cgit 1.4.1 From 6bc3870edd2c0171f12bf231c6ceaecdb5f52c9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:08 +0100 Subject: gnu: r-dplyr: Update to 1.1.0. * gnu/packages/statistics.scm (r-dplyr): Update to 1.1.0. [propagated-inputs]: Add r-cli. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 69a8f3c01f..fa363caf59 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1811,16 +1811,17 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "1.0.10") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0aqggs0gk95b326gzqjab8i27cna1hzik3zi5l2kkr5l4zv3kdis")))) + "1msfp29lbddwdv8ibc2nkan0g1g4y4w5fws6802v6h6x95g57c4c")))) (build-system r-build-system) (propagated-inputs - (list r-generics + (list r-cli + r-generics r-glue r-lifecycle r-magrittr -- cgit 1.4.1 From 7c268f137cd58ac5ff9c36e3d6630c5da37754be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:08 +0100 Subject: gnu: r-dbplyr: Update to 2.3.0. * gnu/packages/statistics.scm (r-dbplyr): Update to 2.3.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fa363caf59..efc9ffcc6a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1848,14 +1848,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1xqdrfpl5l94cw717d90xx1hs5aswl6s38wr7qximzk8q12gdwx6")))) + "1zqz2ml4pgi93miz5flxmm7cjlh4w33hi45phyvv89i9gxp4a387")))) (build-system r-build-system) (propagated-inputs (list r-assertthat -- cgit 1.4.1 From e85c2d66f61f493a0a63e03acb83745b2fca5088 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:08 +0100 Subject: gnu: r-chron: Update to 2.3-59. * gnu/packages/statistics.scm (r-chron): Update to 2.3-59. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index efc9ffcc6a..97956cd36a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1952,13 +1952,13 @@ and density estimation.") (define-public r-chron (package (name "r-chron") - (version "2.3-58") + (version "2.3-59") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "1l36yy9jq6hxkg9rfbsggwhjsb33scb56di0klmw4c73rllcczq5")))) + "1xh18s4mip3xc9vn2xw6a2gpz09s3zmxw8sarn6qbrs2gjwschxr")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") -- cgit 1.4.1 From abee2c7bc87866d672efb39f46ca90e330eac12d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:08 +0100 Subject: gnu: r-ade4: Update to 1.7-22. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-22. [propagated-inputs]: Add r-rcpp and r-rcpparmadillo. --- gnu/packages/statistics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 97956cd36a..1ffb77061f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2143,17 +2143,17 @@ chain.") (define-public r-ade4 (package (name "r-ade4") - (version "1.7-20") + (version "1.7-22") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "0yxd9dgci3rzz807wsb76wis12ipgjv9w86smdyz20jrnn45giyx")))) + "1d4knc1c1hha4gwcakbllzmff4g0mh56y058dn6wp9m2hd7gaz80")))) (build-system r-build-system) (propagated-inputs - (list r-mass r-pixmap r-sp)) + (list r-mass r-pixmap r-rcpp r-rcpparmadillo r-sp)) (home-page "http://pbil.univ-lyon1.fr/ADE-4") (synopsis "Multivariate data analysis and graphical display") (description -- cgit 1.4.1 From 235e03f6e808c685119c1370d0717404d41bb791 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:08 +0100 Subject: gnu: r-git2r: Update to 0.31.0. * gnu/packages/statistics.scm (r-git2r): Update to 0.31.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1ffb77061f..27b4c898aa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2539,13 +2539,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.30.1") + (version "0.31.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "0h58djc9cim8iskkyhdxllbpf6ycl5zj9g4fp70k57k5qzfi7nc5")))) + "0vfn7kkkarha63vv3k8hi9y5snfsdpwdrbmych560126z9w95nzi")))) (build-system r-build-system) (inputs (list libgit2 zlib)) -- cgit 1.4.1 From f2200fe732999ac60248ac4a8f39dd13fe0ce20f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:09 +0100 Subject: gnu: r-rcpparmadillo: Update to 0.11.4.3.1. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.11.4.3.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 27b4c898aa..85f0d7d045 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2760,13 +2760,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.11.4.2.1") + (version "0.11.4.3.1") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "172vz9j1hck6iwk56hgsrg91n4f11df1n6hy1crbv3cb53rkyjgn")))) + "0pk14pv3q3ykdj8pcgj3z1mkfiw9lbn5ny01hydc0mx98yj4lc2w")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0d70f095964573d540da2d3fa4b7a11b251d936a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:09 +0100 Subject: gnu: r-rmarkdown: Update to 2.20. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.20. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 85f0d7d045..7d26ff79c8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2852,13 +2852,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "14lvvdq3n95qbl7nrqlym1lp05i17m6f9mx3ly35iip83p2s9hir")))) + (base32 "178mc3dqm11y58k8jdhm1yi11bbl1h7bls9d8f94ngmlzjdhbxyp")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ee88e28e407ae65e45bdd32ef7730a8ead70cf65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:09 +0100 Subject: gnu: r-rcurl: Update to 1.98-1.10. * gnu/packages/statistics.scm (r-rcurl): Update to 1.98-1.10. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7d26ff79c8..3cf4046968 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2999,13 +2999,13 @@ engine (version 3.8.8.2) is included.") (define-public r-rcurl (package (name "r-rcurl") - (version "1.98-1.9") + (version "1.98-1.10") (source (origin (method url-fetch) (uri (cran-uri "RCurl" version)) (sha256 (base32 - "1iff8cbfrz94mp1m82ai448zhipm8xv6zlxmbysd5hsycxqli3gj")))) + "1m7i0q9scrh2bfr0nqs029052kznhlv3siz9055pzdvgig7jnqjs")))) (properties `((upstream-name . "RCurl"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From a1876f13ed000eed439a1fb0f9afb86ad0237f19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:09 +0100 Subject: gnu: r-pkgmaker: Update to 0.32.7. * gnu/packages/statistics.scm (r-pkgmaker): Update to 0.32.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3cf4046968..4ad5356beb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3821,14 +3821,14 @@ path-wise fashion.") (define-public r-pkgmaker (package (name "r-pkgmaker") - (version "0.32.2") + (version "0.32.7") (source (origin (method url-fetch) (uri (cran-uri "pkgmaker" version)) (sha256 (base32 - "14ggsd24n5g5rvn0wl4w90ipxzmywqikh28llj89q6kpxwnv4iff")))) + "0c7njqwi3szr7dhw3vglgjf2y1hwv0imgb4wfgp42pizsqmacin6")))) (build-system r-build-system) (propagated-inputs (list r-assertthat -- cgit 1.4.1 From a6df23d6b96712e02f390d0edd7a4977e4882ad7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:09 +0100 Subject: gnu: r-e1071: Update to 1.7-13. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-13. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4ad5356beb..980173f399 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3916,14 +3916,14 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.7-12") + (version "1.7-13") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "1ksxbkf2zb1hs353vc1qr8n2l7v0vcldn2prdnk79nr1lp855q4i")))) + "0bvbgcbj8a5z3rv4z4cx6dlwhk374fwd8l1jkq7slsbfmy8y356s")))) (build-system r-build-system) (propagated-inputs (list r-class r-proxy)) -- cgit 1.4.1 From b22011d2f41381a82f0efeaa6b2096793634cc83 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:10 +0100 Subject: gnu: r-tidyr: Update to 1.3.0. * gnu/packages/statistics.scm (r-tidyr): Update to 1.3.0. [propagated-inputs]: Remove r-ellipsis; add r-cli and r-stringr. --- gnu/packages/statistics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 980173f399..63d2dbd51c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4259,24 +4259,25 @@ selection.") (define-public r-tidyr (package (name "r-tidyr") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "1bv1rvnbbfdqf78qfbawq3yxjhjfdy0mgcla6b17bp336rnpcwb9")))) + "178a9sb07rph4mh7cz004ls0g7d4b7jk065m4ycfrlzxcs9jnlwd")))) (build-system r-build-system) (propagated-inputs - (list r-cpp11 + (list r-cli + r-cpp11 r-dplyr - r-ellipsis r-magrittr r-glue r-lifecycle r-purrr r-rlang + r-stringr r-tidyselect r-tibble r-vctrs)) -- cgit 1.4.1 From 84469cdfd3359828ade8dcd2a1f0afeb26010679 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:10 +0100 Subject: gnu: r-purrr: Update to 1.0.1. * gnu/packages/statistics.scm (r-purrr): Update to 1.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 63d2dbd51c..198b04441d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4320,14 +4320,14 @@ It uses and relies on grid graphics and formal (S4) classes and methods.") (define-public r-purrr (package (name "r-purrr") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "purrr" version)) (sha256 (base32 - "1hm6lylx05s43rdk9q7xqdcydz495aim16c7xlw94lyw7v5l81kz")))) + "18ibdyd9dyqba1w208pplgasmjpg5dhg4dni8165ld9r6nz12y8a")))) (build-system r-build-system) (propagated-inputs (list r-cli r-lifecycle r-magrittr r-rlang r-vctrs)) -- cgit 1.4.1 From 9ec3a271320d90f2d195bee8f6472fa3cf5e8d80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:10 +0100 Subject: gnu: r-biased-urn: Update to 2.0.9. * gnu/packages/statistics.scm (r-biased-urn): Update to 2.0.9. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 198b04441d..c319340f24 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4466,14 +4466,14 @@ data behind them) can be viewed and modified in a web browser.") (define-public r-biased-urn (package (name "r-biased-urn") - (version "2.0.8") + (version "2.0.9") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0mmq8zf52p6y76nqm0fcvvg8bdlrfl12mlfr9fznz9zvm26pypi0")))) + "02bb81x1hfvhm6qlcvp88bdpm1fhqak9cjbqz1r7fhg2qfxjpims")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://www.agner.org/random/") -- cgit 1.4.1 From 86ec570b4595a461e7c9412558ab6d7372e55240 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:10 +0100 Subject: gnu: r-sourcetools: Update to 0.1.7-1. * gnu/packages/statistics.scm (r-sourcetools): Update to 0.1.7-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c319340f24..88bc232b61 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4977,14 +4977,14 @@ closely-packed, non-overlapping points.") (define-public r-sourcetools (package (name "r-sourcetools") - (version "0.1.7") + (version "0.1.7-1") (source (origin (method url-fetch) (uri (cran-uri "sourcetools" version)) (sha256 (base32 - "1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627")))) + "1l9i9ram12pjks8h2gzmj119wf4ixwyhljsfv289dn8dgbdjp0cn")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sourcetools") (synopsis "Tools for reading, tokenizing and parsing R code") -- cgit 1.4.1 From d9a45f736bd878850cec5b09ecd68e3fb72ca634 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:11 +0100 Subject: gnu: r-pbapply: Update to 1.7-0. * gnu/packages/statistics.scm (r-pbapply): Update to 1.7-0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 88bc232b61..8a5f7e47e8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5579,14 +5579,14 @@ VGLMs can be loosely thought of as multivariate generalised linear models.") (define-public r-pbapply (package (name "r-pbapply") - (version "1.6-0") + (version "1.7-0") (source (origin (method url-fetch) (uri (cran-uri "pbapply" version)) (sha256 (base32 - "0qbzqgxz3lm97y0k9v2radqblzb4r5zkfrjw5wj1a91dvxz3xhg8")))) + "1h06nz312si2hsy2klrmy6w46q341bl3q5v61g133450w0qykf34")))) (build-system r-build-system) (home-page "https://github.com/psolymos/pbapply") (synopsis "Adding progress bar to apply functions") -- cgit 1.4.1 From 9da0a02eaceba725eacc08b4d9b6ddc0a6857c4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:11 +0100 Subject: gnu: r-pbkrtest: Update to 0.5.2. * gnu/packages/statistics.scm (r-pbkrtest): Update to 0.5.2. [propagated-inputs]: Remove r-magrittr. --- gnu/packages/statistics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8a5f7e47e8..e0b4ea9491 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5782,20 +5782,19 @@ C++ library for numerical linear algebra and RcppEigen glue.") (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "1if7msv9i7jhg1as1f7m81a95dnwhwj3yfs24bqr0f6r0ch4b8xj")))) + "1qxnd4pfpsq762x81s3vkw09wdwpfj25bba5474g7z506pqasycf")))) (build-system r-build-system) (propagated-inputs (list r-broom r-dplyr r-lme4 - r-magrittr r-mass r-matrix r-numderiv)) -- cgit 1.4.1 From fd4ed5cb742dd0fefc50634e0a8429ebf65f3eae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:11 +0100 Subject: gnu: r-lubridate: Update to 1.9.1. * gnu/packages/statistics.scm (r-lubridate): Update to 1.9.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e0b4ea9491..4c4f451035 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6076,14 +6076,14 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "0flh3arja7al9xznj5jvicadvq1kb2s63zyg63wlx2bii8gh8dmr")))) + "1brjq18lbnn2r6qiysmps9276rx691a36qiw66x8hrqv55vwxa8d")))) (build-system r-build-system) (propagated-inputs (list r-generics r-timechange)) -- cgit 1.4.1 From 7eefff7ace687113755bca779ed05eacf7a9ebb9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:11 +0100 Subject: gnu: r-forcats: Update to 1.0.0. * gnu/packages/statistics.scm (r-forcats): Update to 1.0.0. [propagated-inputs]: Remove r-ellipsis and r-withr. --- gnu/packages/statistics.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4c4f451035..a7e891ffa1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6131,24 +6131,22 @@ and the corresponding decision threshold.") (define-public r-forcats (package (name "r-forcats") - (version "0.5.2") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "forcats" version)) (sha256 (base32 - "0hb1m16il1n8nmhp7hx8k2xxq8bd8kp3qqs2pw7xm0iz311hm9hl")))) + "0ki5c84n7xm4iw4aj629l51hm84f6p5wa3bw88d1wbnr15wibfy5")))) (build-system r-build-system) (propagated-inputs (list r-cli - r-ellipsis r-glue r-lifecycle r-magrittr r-tibble - r-rlang - r-withr)) + r-rlang)) (native-inputs (list r-knitr)) (home-page "https://forcats.tidyverse.org") -- cgit 1.4.1 From 0ba69c1ee20a03528bc9c369bdec0d8bc666db68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 16:09:12 +0100 Subject: gnu: r-naniar: Update to 1.0.0. * gnu/packages/statistics.scm (r-naniar): Update to 1.0.0. [propagated-inputs]: Add r-cli and r-vctrs. --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a7e891ffa1..aec646e92c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6907,16 +6907,17 @@ normal model.") (define-public r-naniar (package (name "r-naniar") - (version "0.6.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "naniar" version)) (sha256 (base32 - "0l3l2x85v3srilww483kpgp4zlwixyml257b0cqly8kcpwawlinm")))) + "1x4ljc6yji7312g6cg1shc85jqv5kaf2zlf5q7sdmqh3wryskvf2")))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-cli + r-dplyr r-norm r-forcats r-ggplot2 @@ -6927,6 +6928,7 @@ normal model.") r-tibble r-tidyr r-upsetr + r-vctrs r-viridis r-visdat)) (native-inputs -- cgit 1.4.1 From 1b78b94f06c56af83874455861205c11cd4fdcfd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 20:57:13 -0500 Subject: gnu: audacity: Update to 3.2.4. * gnu/packages/audio.scm (audacity): Update to 3.2.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6504ec2345..707a7b4aa1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -856,7 +856,7 @@ engineers, musicians, soundtrack editors and composers.") (define-public audacity (package (name "audacity") - (version "3.2.3") + (version "3.2.4") (source (origin (method git-fetch) @@ -865,7 +865,7 @@ engineers, musicians, soundtrack editors and composers.") (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wg75fblxlnrn5kqvg0w1fi2pwdkn1nd6vgya3sad84l3ki7wpyh")) + (base32 "06kfxbfvvhbhwfzkvar6hir351606g29ij8b4hksxpzq338shgc3")) (patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From f1234c7569088531862c84d19ca6350a44ea5aa5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 12:41:23 -0500 Subject: gnu: python-pygit2: Update to 1.11.1. * gnu/packages/python-xyz.scm (python-pygit2): Update to 1.11.1. [build-system]: Use pyproject-build-system. [arguments]: Delete field. [propagated-inputs]: Remove python-cached-property. --- gnu/packages/python-xyz.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f97faefc65..12a0c9f983 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6500,24 +6500,16 @@ readable format.") (define-public python-pygit2 (package (name "python-pygit2") - (version "1.9.2") + (version "1.11.1") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 - (base32 "068bwhirigbh2435abyv4shdxgxvyfqf4dxfmhd4hihivwrl9290")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-v"))))))) - (propagated-inputs - (list python-cached-property python-cffi libgit2)) - (native-inputs - (list python-pytest)) + (base32 "1v34xdvh6i5cn5srwicvp0i2kvv8fzsv0v9p72ng081nsczmhgvr")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-cffi libgit2)) + (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") (synopsis "Python bindings for libgit2") (description "Pygit2 is a set of Python bindings to the libgit2 shared library.") -- cgit 1.4.1 From 0d5286b8a67be2012e892f6762a145d89d013c44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 16:30:53 -0500 Subject: gnu: xmlsec: Update to 1.2.37. * gnu/packages/xml.scm (xmlsec): Update to 1.2.37. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d86848a1c..2565b13632 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1151,14 +1151,14 @@ XSL-T processor. It also performs any necessary post-processing.") (define-public xmlsec (package (name "xmlsec") - (version "1.2.36") + (version "1.2.37") (source (origin (method url-fetch) (uri (string-append "https://www.aleksey.com/xmlsec/download/" "xmlsec1-" version ".tar.gz")) (sha256 (base32 - "100wsklff8x30rsg0xp191kg8p3z5va2d0q3iy08a791ic07xngh")))) + "0747w8mnnyawvvzlvhjpkwm3998c7l5f1hjy1gfvsmhydp5zp3az")))) (build-system gnu-build-system) (propagated-inputs ; according to xmlsec1.pc (list libxml2 libxslt)) -- cgit 1.4.1 From c7e3617cf241a204e42c37047553e9e8ac6722c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 22:36:00 -0500 Subject: gnu: libreoffice: Enable logging system. * gnu/packages/libreoffice.scm (libreoffice) [configure-flags]: Add --enable-sal-log. --- gnu/packages/libreoffice.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 32802334e7..7ce89fc904 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1023,6 +1023,10 @@ commonly called @code{ftoa} or @code{dtoa}.") #~(list "--enable-release-build" "--with-vendor=GNU Guix" + ;; Without the SAL logging system enabled, LibreOffice is utterly + ;; silent. Setting the environment variable 'SAL_INFO=+INFO' can be + ;; useful to debug problems. + "--enable-sal-log" ;; Avoid using all cpu cores by default (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads -- cgit 1.4.1 From 9f21ca83a89a5e6c808b58fab0dc54b7785c26b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 13:21:59 -0500 Subject: gnu: libreoffice: Fix password encryption issue. Fixes . * gnu/packages/libreoffice.scm (libreoffice) [phases]: Add a augment-LD_LIBRARY_PATH phase. --- gnu/packages/libreoffice.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 7ce89fc904..9706e0ab69 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -934,6 +934,18 @@ commonly called @code{ftoa} or @code{dtoa}.") (lambda _ (mkdir-p "external/tarballs") (copy-file #$dtoa "external/tarballs/dtoa-20180411.tgz"))) + (add-after 'unpack 'augment-LD_LIBRARY_PATH + ;; Without this, the nsscrypto_initialize procedure in + ;; nssinitializer.cxx silently fails to load libnssckbi.so, which + ;; causes password encryption to also silently fail (see: + ;; https://bugs.documentfoundation.org/show_bug.cgi?id=153714). + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "desktop/scripts/soffice.sh" + (("^exec .*oosplash.*" anchor) + (string-append "export LD_LIBRARY_PATH=" + (search-input-directory inputs "lib/nss") + "${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\n" + anchor))))) (add-before 'configure 'prepare-src (lambda* (#:key inputs #:allow-other-keys) (substitute* -- cgit 1.4.1 From eb4b61c7b2c2d4c8a54a6f30cd7abafe0d4d70ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:27:23 +0100 Subject: gnu: Add r-strex. * gnu/packages/cran.scm (r-strex): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb99d1b444..5d67cdff5c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33940,6 +33940,30 @@ structures from them.") user streams, and to parse the output into data frames.") (license license:gpl2))) +(define-public r-strex + (package + (name "r-strex") + (version "1.6.0") + (source (origin + (method url-fetch) + (uri (cran-uri "strex" version)) + (sha256 + (base32 + "1fxg07n8cjvvgpbzqhyx5ma5bv6vax1yw0rbfdqfzr79v6k5x3n7")))) + (properties `((upstream-name . "strex"))) + (build-system r-build-system) + (propagated-inputs + (list r-checkmate r-magrittr r-rlang r-stringi r-stringr)) + (native-inputs (list r-knitr)) + (home-page "https://rorynolan.github.io/strex/") + (synopsis "Extra string manipulation functions") + (description + "Strex is a collection of string manipulation functions not provided by +the @code{stringi} or @code{stringr} packages. The foremost of these is the +extraction of numbers from strings. There are many other handy +functionalities in strex.") + (license license:gpl3))) + (define-public r-readods (package (name "r-readods") -- cgit 1.4.1 From 206195d4e24628739871b837d9986fb827c20086 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:27:37 +0100 Subject: gnu: Add r-filesstrings. * gnu/packages/cran.scm (r-filesstrings): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5d67cdff5c..52d109ca93 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24858,6 +24858,38 @@ been tested on multi-terabyte matrices. It allows for more than 2^32 rows or columns, ad allows for quick addition of extra columns to a filematrix.") (license license:lgpl3))) +(define-public r-filesstrings + (package + (name "r-filesstrings") + (version "3.2.4") + (source (origin + (method url-fetch) + (uri (cran-uri "filesstrings" version)) + (sha256 + (base32 + "1jl3jhkdjx5x00kllnkpvrlpsmzsvlgd6vhzdavd39zx4jzwjxw3")))) + (properties `((upstream-name . "filesstrings"))) + (build-system r-build-system) + (propagated-inputs (list r-checkmate + r-magrittr + r-purrr + r-rlang + r-strex + r-stringi + r-stringr + r-withr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/rorynolan/filesstrings") + (synopsis "Handy file and string manipulation") + (description + "This started out as a package for file and string manipulation. Since +then, the @code{fs} and @code{strex} packages emerged, offering functionality +previously given by this package. Those packages have hence almost pushed +filesstrings into extinction. However, it still has a small number of unique, +handy file manipulation functions which can be seen in the vignette. One +example is a function to remove spaces from all file names in a directory.") + (license license:gpl3))) + (define-public r-acmeeqtl (package (name "r-acmeeqtl") -- cgit 1.4.1 From 971778f20b3ce5a5836ed43e238ea43b67909050 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:31:27 +0100 Subject: gnu: Add r-effsize. * gnu/packages/cran.scm (r-effsize): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 52d109ca93..3eb1d1dc42 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14265,6 +14265,27 @@ standardized parameters for a wide variety of models, allowing computation and conversion of indices such as Cohen's d, r, odds, etc.") (license license:gpl3))) +(define-public r-effsize + (package + (name "r-effsize") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (cran-uri "effsize" version)) + (sha256 + (base32 + "1m5ch2g77f4ldbxhzp2ls1pga8hq7ggkz1xs8a90h0s09rj0gd7w")))) + (properties `((upstream-name . "effsize"))) + (build-system r-build-system) + (home-page "https://github.com/mtorchiano/effsize/") + (synopsis "Efficient effect size computation") + (description + "This package provides a collection of functions to compute the +standardized effect sizes for experiments (Cohen d, Hedges g, Cliff delta, +Vargha-Delaney A). The computation algorithms have been optimized to allow +efficient computation even with very large data sets.") + (license license:gpl2))) + (define-public r-sjplot (package (name "r-sjplot") -- cgit 1.4.1 From 48e5c3bd290da7e796197f972645ae7a19a5677c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:31:40 +0100 Subject: gnu: Add r-lamw. * gnu/packages/cran.scm (r-lamw): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3eb1d1dc42..174c85a964 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5576,6 +5576,27 @@ selection, as well as methods for retrieving coordinates, for subsetting, print, summary, etc.") (license license:gpl2+))) +(define-public r-lamw + (package + (name "r-lamw") + (version "2.1.1") + (source (origin + (method url-fetch) + (uri (cran-uri "lamW" version)) + (sha256 + (base32 + "05b37kx4jpszx2hkm47d7cjkf8544f7r8x26q68yp9c6zqm9gbc3")))) + (properties `((upstream-name . "lamW"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp r-rcppparallel)) + (home-page "https://github.com/aadler/lamW") + (synopsis "Lambert-W function") + (description + "This package implements both real-valued branches of the Lambert-W +function (Corless et al, 1996) without the need for +installing the entire GSL.") + (license license:bsd-2))) + (define-public r-laplacesdemon (package (name "r-laplacesdemon") -- cgit 1.4.1 From 7ec692587a20a248e6b94fffc214ab152e7907d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:31:57 +0100 Subject: gnu: Add r-lambertw. * gnu/packages/cran.scm (r-lambertw): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 174c85a964..1f4f55f038 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5576,6 +5576,42 @@ selection, as well as methods for retrieving coordinates, for subsetting, print, summary, etc.") (license license:gpl2+))) +(define-public r-lambertw + (package + (name "r-lambertw") + (version "0.6.7-1") + (source (origin + (method url-fetch) + (uri (cran-uri "LambertW" version)) + (sha256 + (base32 + "0cdrq2nrvji8l5blswkffymm7cbjk5jzzx16js2a516cm3gjwxk4")))) + (properties `((upstream-name . "LambertW"))) + (build-system r-build-system) + (propagated-inputs (list r-ggplot2 + r-lamw + r-mass + r-rcolorbrewer + r-rcpp + r-reshape2)) + (native-inputs (list r-knitr)) + (home-page "https://cran.r-project.org/package=LambertW") + (synopsis + "Probabilistic models to analyze and Gaussianize heavy-tailed, skewed data") + (description + "Lambert W x F distributions are a generalized framework to analyze skewed, +heavy-tailed data. It is based on an input/output system, where the output +random variable (RV) Y is a non-linearly transformed version of an input RV X +~ F with similar properties as X, but slightly skewed (heavy-tailed). The +transformed RV Y has a Lambert W x F distribution. This package contains +functions to model and analyze skewed, heavy-tailed data the Lambert Way: +simulate random samples, estimate parameters, compute quantiles, and plot/ +print results nicely. The most useful function is @code{Gaussianize}, which +works similarly to @code{scale}, but actually makes the data Gaussian. A +do-it-yourself toolkit allows users to define their own Lambert W x +@code{MyFavoriteDistribution} and use it in their analysis right away.") + (license license:gpl2+))) + (define-public r-lamw (package (name "r-lamw") -- cgit 1.4.1 From 411f3f1ffe8ec17bd7fea624ff2284786de36c14 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:32:20 +0100 Subject: gnu: Add r-butcher. * gnu/packages/cran.scm (r-butcher): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1f4f55f038..81b01d4ad1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28071,6 +28071,32 @@ on a continuous-time birth-death process.") league, the Bundesliga. It contains data from 1964 to 2016.") (license license:gpl3))) +(define-public r-butcher + (package + (name "r-butcher") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (cran-uri "butcher" version)) + (sha256 + (base32 + "1ymz4p887f8z54bxwih0zycbs2wmy5rlmw9z0gl0y89q4l8vyygw")))) + (properties `((upstream-name . "butcher"))) + (build-system r-build-system) + (propagated-inputs (list r-cli + r-lobstr + r-purrr + r-rlang + r-tibble + r-vctrs)) + (native-inputs (list r-knitr)) + (home-page "https://butcher.tidymodels.org/") + (synopsis "Model butcher") + (description + "This package provides a set of S3 generics to axe components of fitted +model objects and help reduce the size of model objects saved to disk.") + (license license:expat))) + (define-public r-d3network (package (name "r-d3network") -- cgit 1.4.1 From 1de36ea8d756113f4c2f86e4685c21b058125376 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:32:28 +0100 Subject: gnu: Add r-bestnormalize. * gnu/packages/cran.scm (r-bestnormalize): New variable. --- gnu/packages/cran.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81b01d4ad1..ec07e401fa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1084,6 +1084,48 @@ and compare against other CPUs. Also provides functions for obtaining system specifications, such as RAM, CPU type, and R version.") (license license:gpl2+))) +(define-public r-bestnormalize + (package + (name "r-bestnormalize") + (version "1.8.3") + (source (origin + (method url-fetch) + (uri (cran-uri "bestNormalize" version)) + (sha256 + (base32 + "107z16vx6k31ln5ppxixjgagrzrjwlrk13689lq2s90x4k2pgmkh")))) + (properties `((upstream-name . "bestNormalize"))) + (build-system r-build-system) + (propagated-inputs (list r-butcher + r-doparallel + r-dorng + r-dplyr + r-foreach + r-lambertw + r-nortest + r-purrr + r-recipes + r-tibble)) + (native-inputs (list r-knitr)) + (home-page "https://petersonr.github.io/bestNormalize/") + (synopsis "Normalizing transformation functions") + (description + "Estimate a suite of normalizing transformations, including a new +adaptation of a technique based on ranks which can guarantee normally +distributed transformed data if there are no ties: @dfn{ordered quantile +normalization} (ORQ). ORQ normalization combines a rank-mapping approach with +a shifted logit approximation that allows the transformation to work on data +outside the original domain. It is also able to handle new data within the +original domain via linear interpolation. The package is built to estimate +the best normalizing transformation for a vector consistently and accurately. +It implements the Box-Cox transformation, the Yeo-Johnson transformation, +three types of Lambert WxF transformations, and the ordered quantile +normalization transformation. It estimates the normalization efficacy of +other commonly used transformations, and it allows users to specify custom +transformations or normalization statistics. Finally, functionality can be +integrated into a machine learning workflow via recipes.") + (license license:gpl3))) + (define-public r-bezier (package (name "r-bezier") -- cgit 1.4.1 From f3329764e2d3ffee7f0d177d33820c93e720b82e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Feb 2023 20:32:36 +0100 Subject: gnu: Add r-longdat. * gnu/packages/cran.scm (r-longdat): New variable. --- gnu/packages/cran.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ec07e401fa..c7a81b96eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17847,6 +17847,48 @@ hierarchic loggers, multiple handlers per logger, level based filtering, space handling in messages and custom formatting.") (license license:gpl3))) +(define-public r-longdat + (package + (name "r-longdat") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (cran-uri "LongDat" version)) + (sha256 + (base32 + "1sqfmdv5agyvlw1y3yiv8kxi1040gq75qj4ln1jgb9lsmhdlfpyd")))) + (properties `((upstream-name . "LongDat"))) + (build-system r-build-system) + (propagated-inputs (list r-bestnormalize + r-car + r-dplyr + r-effsize + r-emmeans + r-ggplot2 + r-glmmtmb + r-lme4 + r-magrittr + r-mass + r-patchwork + r-reshape2 + r-rlang + r-rstatix + r-stringr + r-tibble + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/CCY-dev/LongDat") + (synopsis + "Tool for covariate-sensitive longitudinal analysis on omics data") + (description + "This tool takes longitudinal dataset as input and analyzes if there is +significant change of the features over time (a proxy for treatments), while +detects and controls for covariates simultaneously. LongDat is able to take +in several data types as input, including count, proportion, binary, ordinal +and continuous data. The output table contains p values, effect sizes and +covariates of each feature, making the downstream analysis easy.") + (license license:gpl2))) + (define-public r-longitudinal (package (name "r-longitudinal") -- cgit 1.4.1 From 185e8ac8cc52669fe1a94954f2a944abd3dde2f5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 15:55:10 -0500 Subject: gnu: Add hplip-next. * gnu/packages/cups.scm (hplip-next): New variable. --- gnu/packages/cups.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c729363fe8..259805b98a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -696,6 +696,33 @@ should only be used as part of the Guix cups-pk-helper service.") (native-inputs (list perl pkg-config)))) +;;; TODO: Integrate in base hplip package on core-updates. +(define-public hplip-next + (package + (inherit hplip) + (name "hplip") + (version "3.21.10") + (source (origin + (inherit (package-source hplip)) + (uri (string-append "mirror://sourceforge/hplip/hplip/" version + "/hplip-" version ".tar.gz")) + (sha256 + (base32 + "0q3adcp8iygravp4bq4gw14jk20c5rhnawj1333qyw8yvlghw8yy")))) + (arguments + (substitute-keyword-arguments (package-arguments hplip) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'fix-more-hard-coded-file-names + (lambda* (#:key outputs #:allow-other-keys) + ;; Set the encoding to ISO-8859-1, as not all the files are + ;; readable as UTF-8. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* (find-files ".") + (("/etc/hp/hplip.conf") + (string-append (assoc-ref outputs "out") + "/etc/hp/hplip.conf")))))))))))) + (define-public hplip-minimal (package/inherit hplip (name "hplip-minimal") -- cgit 1.4.1 From 037c1b254a84d656b87b6bbb9c339bc04cfdb0a8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 16:01:10 -0500 Subject: gnu: hplip-next: Update to 3.22.10. * gnu/packages/cups.scm (hplip-next): Update to 3.22.10. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 259805b98a..f1007ea03b 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -701,14 +701,14 @@ should only be used as part of the Guix cups-pk-helper service.") (package (inherit hplip) (name "hplip") - (version "3.21.10") + (version "3.22.10") (source (origin (inherit (package-source hplip)) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0q3adcp8iygravp4bq4gw14jk20c5rhnawj1333qyw8yvlghw8yy")))) + "09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k")))) (arguments (substitute-keyword-arguments (package-arguments hplip) ((#:phases phases) -- cgit 1.4.1 From e1290c0d43cb2916a5908f15b3211911ee257968 Mon Sep 17 00:00:00 2001 From: Parnikkapore Date: Wed, 8 Feb 2023 17:17:30 +0800 Subject: gnu: dino: Update to 0.4.0. * gnu/packages/messaging.scm (dino): Update to 0.4.0. [inputs]: Replace gtk+ with gtk. Replace pango with pango-next. Add bash-minimal and libadwaita. Signed-off-by: Liliana Marie Prikler --- gnu/packages/messaging.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b6e7bc7cf1..a5c3f1d56d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1320,7 +1320,7 @@ Encryption to Gajim.") (define-public dino (package (name "dino") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) @@ -1328,7 +1328,7 @@ Encryption to Gajim.") (string-append "https://github.com/dino/dino/releases/download/v" version "/dino-" version ".tar.gz")) (sha256 - (base32 "1rs6qpkidiww805cd91q059r2lm5lzblrkyn01zz4g1mls8ghk5a")))) + (base32 "115p7mjk0q68nvv8asrm6hsv0dzsz7hy2bnvhwhxmcfbilr8fq68")))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -1367,12 +1367,13 @@ Encryption to Gajim.") (list gettext-minimal `(,glib "bin") gobject-introspection - `(,gtk+ "bin") + `(,gtk "bin") pkg-config vala)) (inputs (list adwaita-icon-theme atk + bash-minimal cairo librsvg glib @@ -1383,8 +1384,9 @@ Encryption to Gajim.") gstreamer ;for A/V support gst-plugins-base gst-plugins-good - gtk+ + gtk icu4c ;for emoji support + libadwaita libcanberra ;for sound-notification support libgcrypt libgee @@ -1392,7 +1394,7 @@ Encryption to Gajim.") libsignal-protocol-c libsoup libsrtp ;for calls support - pango + pango-next ;gtk4 wants pango 1.5+ qrencode sqlite webrtc-audio-processing)) ;for A/V support -- cgit 1.4.1 From b5326763c7f629980a80a210d2cd57e9ca21b29b Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 10 Feb 2023 19:49:34 -0500 Subject: gnu: racket: Update to 8.8. * gnu/packages/patches/racket-backport-8.7-pkg-strip.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Delete it. * gnu/packages/racket.scm (%racket-origin)[patches]: Likewise. (%racket-version): Update to 8.8. (%zuo-version): Update to 1.6. (racket)[inputs] : Update checksums. * gnu/packages/chez.scm (chez-scheme-for-racket): Update to 9.9.9-pre-release.14. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 3 +- gnu/packages/chez.scm | 2 +- .../patches/racket-backport-8.7-pkg-strip.patch | 90 ---------------------- gnu/packages/racket.scm | 45 ++++++----- 4 files changed, 24 insertions(+), 116 deletions(-) delete mode 100644 gnu/packages/patches/racket-backport-8.7-pkg-strip.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 5504dad8e0..b2033a5460 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -41,7 +41,7 @@ # Copyright © 2020, 2023 Vinicius Monego # Copyright © 2021 Björn Höfling # Copyright © 2021 Greg Hogan -# Copyright © 2021, 2022 Philip McGrath +# Copyright © 2021, 2022, 2023 Philip McGrath # Copyright © 2021 Arun Isaac # Copyright © 2021 Sharlatan Hellseher # Copyright © 2021 Dmitry Polyakov @@ -1797,7 +1797,6 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ - %D%/packages/patches/racket-backport-8.7-pkg-strip.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 1f178d2c72..0b3c813658 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -466,7 +466,7 @@ and 32-bit PowerPC architectures.") (package (inherit chez-scheme) (name "chez-scheme-for-racket") - (version "9.5.9.8") + (version "9.9.9-pre-release.14") ;; The version should match `scheme-version`. ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360. ;; It will always be different than the upstream version! diff --git a/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch b/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch deleted file mode 100644 index 703b6e8e82..0000000000 --- a/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 1b7e15c23baf1fda44b1d0752902ddea11419fc5 Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Fri, 7 Oct 2022 02:15:13 -0400 -Subject: [PATCH] pkg/strip: handle read-only input - -A package directory supplied to the functions from `pkg/strip` might -have had all of its write permission bits unset. Since `copy-file` -preserves the permissions of the source file, we may end up with a -read-only file that we want to overwrite (e.g. an `info.rkt` file). -Explicitly setting `user-write-bit` before writing avoids this problem. -Conservatively, we only set the permissions when actually needed, -and we restore the original permissions when we are done. - -(cherry picked from commit 8c647c8cc9b66112198fcf9bea27fc0e3737162f) ---- - racket/collects/pkg/strip.rkt | 35 +++++++++++++++++++++++++++++------ - 1 file changed, 29 insertions(+), 6 deletions(-) - -diff --git a/racket/collects/pkg/strip.rkt b/racket/collects/pkg/strip.rkt -index 0ff58cea02..5899dbc6e6 100644 ---- a/racket/collects/pkg/strip.rkt -+++ b/racket/collects/pkg/strip.rkt -@@ -306,9 +306,8 @@ - #t - new-mod*-subs)))) - (unless (eq? mod new-mod) -- (call-with-output-file* -+ (call-with-output-file/writable - new-p -- #:exists 'truncate/replace - (lambda (out) (write new-mod out))))) - - (define (fixup-local-redirect-reference p js-path #:user [user-js-path js-path]) -@@ -340,9 +339,8 @@ - (string->bytes/utf-8 user-js-path) - (subbytes s (+ delta end2)))] - [else s])))) -- (call-with-output-file* -+ (call-with-output-file/writable - p -- #:exists 'truncate/replace - (lambda (out) (write-bytes new-bstr out))))) - - ;; Used in binary[-lib] mode: -@@ -383,9 +381,8 @@ - (convert-mod info-lib defns)])) - (unless (equal? new-content content) - ;; write updated: -- (call-with-output-file* -+ (call-with-output-file/writable - new-p -- #:exists 'truncate - (lambda (out) - (write new-content out) - (newline out))) -@@ -503,3 +500,29 @@ - which - dir) - (current-continuation-marks))))) -+ -+(define (call-with-output-file/writable pth proc) -+ ;; In case `pth` was copied from a file without the user-write-bit set, -+ ;; explicitly make it writable while we overwrite it. -+ (define (run) -+ (call-with-output-file* pth -+ #:exists 'truncate/replace -+ proc)) -+ (cond -+ [(file-exists? pth) -+ (define old-mode -+ (file-or-directory-permissions pth 'bits)) -+ (define new-mode -+ (if (eq? (system-type) 'windows) -+ (bitwise-ior old-mode user-write-bit group-write-bit other-write-bit) -+ (bitwise-ior old-mode user-write-bit))) -+ (if (= old-mode new-mode) -+ (run) -+ (dynamic-wind -+ (λ () -+ (file-or-directory-permissions pth new-mode)) -+ run -+ (λ () -+ (file-or-directory-permissions pth old-mode))))] -+ [else -+ (run)])) - -base-commit: 7e4f6e2362d4a08affbbae3c7ee4b98e325274c6 --- -2.38.0 - diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index b5959e5f68..92060da283 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013-2016, 2018, 2020-2022 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Pierre Neidhardt -;;; Copyright © 2021, 2022 Philip McGrath +;;; Copyright © 2021, 2022, 2023 Philip McGrath ;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. @@ -190,8 +190,8 @@ ;; ;; CODE: -(define %racket-version "8.7") ; Remember to update chez-scheme-for-racket! -(define %zuo-version "1.0") ; defined in racket/src/zuo/zuo.c +(define %racket-version "8.8") ; Remember to update chez-scheme-for-racket! +(define %zuo-version "1.6") ; defined in racket/src/zuo/zuo.c (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -201,10 +201,9 @@ (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "0agwa1nrv8mizkqg9nffjli00djyx1r9n6y6b6ry7k13pb6i7xnj")) + (base32 "0d1dknnj93r6rmz9zhgn93z937csrni5xpjam2ci41zc070p09y7")) (file-name (git-file-name "racket" %racket-version)) - (patches (search-patches "racket-backport-8.7-pkg-strip.patch" - "racket-chez-scheme-bin-sh.patch" + (patches (search-patches "racket-chez-scheme-bin-sh.patch" "racket-rktio-bin-sh.patch" "racket-zuo-bin-sh.patch")) (modules '((guix build utils))) @@ -671,7 +670,7 @@ DrRacket IDE, are not included.") "2d" (base32 "0fb5v6058ls08xw3zbmqyr2ym0psm119gl9ffgmhm9w8rs9i4dq7") '("2d" "2d-doc" "2d-lib")) (simple-racket-origin - "algol60" (base32 "09kj6asypmc24n29w0izc9p0q8hpga2hpkchsypfwn5c8zpvihlx") + "algol60" (base32 "03akd7xhn4l7y66qgaimvdbn6gq7ay6j03dc11mz80n06z21dfb6") '(("algol60" "."))) (racket-packages-origin "racket" %racket-origin @@ -687,7 +686,7 @@ DrRacket IDE, are not included.") ("sandbox-lib" "pkgs/sandbox-lib") ("zo-lib" "pkgs/zo-lib"))) (simple-racket-origin - "cext-lib" (base32 "00w38jpv88fpl4pgj6ndnysvn0s21rjvj0xhznay80msan0vc341") + "cext-lib" (base32 "01dirj5nq9s384xqpzh1p07la38vcycsim0k1ls04a52sgyglgwc") '("cext-lib" "dynext-lib")) (simple-racket-origin "class-iop" (base32 "08z57q83cr7wnh6g8ah3hdhmsmf9zp1jfs7yvxv188l3hzvygy5l") @@ -708,16 +707,16 @@ DrRacket IDE, are not included.") "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "1ngdjky4n1vy2b9jz1z4pnzl0vgvaqr3p0ff5sx82hs38qvvi5di") + "deinprogramm" (base32 "0glnk8f1gi8r9y27glmz59fjib2vx8xwwil9jsds99bsvbp24g06") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") '("distributed-places" "distributed-places-doc" "distributed-places-lib")) (simple-racket-origin - "draw" (base32 "0pxpay04rylq3hqfpdrha2pw78hhwsjzq8w4f156gipin74lb7a2") + "draw" (base32 "0p69yk1c1jad5xmr8xxbxvrmq5yb3cr5zlj1kydx3nd0ij3g5dir") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "12khv954v7xpi3wv50pp5l28ww1382apbvzvs67d6ik10nn3d0y4") + "drracket" (base32 "19x5j1zj8zyg3kfhjshwqayiddbv7kqlsjd5zw0cpv7a3adkjr65") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -737,7 +736,7 @@ DrRacket IDE, are not included.") "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "0mjfwb4wzwsg5xj3k6cmik0va432n56rp5h7rxx1c2yy3prh1j7q") + "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -751,13 +750,13 @@ DrRacket IDE, are not included.") "games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d") '(("games" "."))) (simple-racket-origin - "gui" (base32 "027imnxwm0663yn9mbkq8sjm1qr1pw7zf4ra168k746hp446ah58") + "gui" (base32 "1dddr8c5v6vp42jmnrrfsm1v1hgha0q0wvvpdkl7x0ri23plgcrm") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "0pf2kf63xj9s0n44vaxlmnd1bdb1a44gcp807a3b3cmlc1lkb36z") + "htdp" (base32 "1ba4pj7v8mi8kvwdn7iw4jc435hm2d04i7gqgys79b47i6qyyf6h") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -781,7 +780,7 @@ DrRacket IDE, are not included.") "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "00ld38in5jfshs1q4zf07w84cyv4yjr40kmw30pyd5wqgs2zq9ai") + "math" (base32 "072hkk9lih1265pyjvafd4pill9x5wjs41kmm6cgwzwy5hqv0qyw") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -825,7 +824,7 @@ DrRacket IDE, are not included.") "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "063a1lc6v1i8ywxcskkvvfxdvlx0qhr0l4l3dkibmnli47mdhv7g") + "pict" (base32 "0hiwld84kd5s07rppswv8hd83sx8vk78xbhkbbwrnc51cfqwvvfj") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -859,7 +858,7 @@ DrRacket IDE, are not included.") (file-name (git-file-name "Metaxal-quickscript" %racket-version))) '(("quickscript" "."))) (simple-racket-origin - "r5rs" (base32 "1g3cysj7z88r38vkzvi8g2fb2hn4yg1fdhy5smxw303jxgl3inp6") + "r5rs" (base32 "0iciz6khmynly0901kl9m7rnd1d3nxrin0rl6d9rjwvsks30aqad") '("r5rs" "r5rs-doc" "r5rs-lib")) (simple-racket-origin "r6rs" (base32 "1mgcxd88s67w47a2z1i6snz8qhbngjbmr6rs4pchpnrfap96ssgl") @@ -895,7 +894,7 @@ DrRacket IDE, are not included.") "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1v5p65y3hnp1mfvy0jl4lhmaw9s3qzzfcfh3fhihhqxsybbqp3q3") + "redex" (base32 "1dlivxllz1y7lsh402i6bmljbwbbphcvhbgf8jsnhip2vhck5rp4") '("redex" "redex-benchmark" "redex-doc" @@ -904,13 +903,13 @@ DrRacket IDE, are not included.") "redex-lib" "redex-pict-lib")) (simple-racket-origin - "sasl" (base32 "0ibh4wb4gn8pggx6gkv4vk4d6rwzn5nrvjibhvkzhaynf6lhb824") + "sasl" (base32 "1l74rkp8m2jfb82678k3lhd2y5k9l8csazwshf9m969i67gzbjh8") '("sasl" "sasl-doc" "sasl-lib")) (simple-racket-origin "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "1n0ywdham53h2ibkhc0cnrhhaxfkl7ax0bx5sdfpnyh2yrabxwqf") + "scribble" (base32 "1m3s7nz4qk71hnl2qhnm4fbk4mfz1z53ig21czhinbxpall8l4d1") '("scribble" "scribble-doc" "scribble-html-lib" @@ -942,7 +941,7 @@ DrRacket IDE, are not included.") "snip" (base32 "19n2i1m2nysrbv38jxk32abymdbhcxdcrrjsg4ppfbng8niygc8x") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0yh9vcg1bjamf6nq3hqxwjg07kjkxyqhvymv3r64j1n4hiiwz6iv") + "typed-racket" (base32 "1hhc0nss68814xsxhl5rnw4smnm06573j6ka0wp77almqg5nzhpv") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -953,13 +952,13 @@ DrRacket IDE, are not included.") "srfi" (base32 "13xvfzr5546m3a4kksyawzcl93nrklasr1slfa5ar3p77h962la4") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin - "string-constants" (base32 "174q3ihcp8s52mmlk7z0sipjksiac432pfkm0inlwi92s6p7dlb3") + "string-constants" (base32 "1lxab9323xmxqs4mxbgr504xgcgsf9dvx2xsb4p92fjzsif0d64y") '("string-constants" "string-constants-doc" "string-constants-lib")) (simple-racket-origin "swindle" (base32 "03n9ymjhrw45h7hxkw4nq8nidnvs9mfzb4228s2cjfaqbgqxvsyb") '(("swindle" "."))) (simple-racket-origin - "syntax-color" (base32 "02dcd4yvdnw35m3srvfd43csxffxw3j4rk6zi379b8dsvbbrjyq1") + "syntax-color" (base32 "1xxbvcqca99px01cnh40r69w1ica8zl97yyryb6xz30j6nblsmb6") '("syntax-color" "syntax-color-doc" "syntax-color-lib")) (simple-racket-origin "trace" (base32 "070ihla5j796hdarn5wxdwn4xj0xnkm50shgh49jy994mribvhia") -- cgit 1.4.1 From 8285093cee000d6e28c040f721ddf0be18d32c42 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Feb 2023 15:50:34 +0100 Subject: gnu: python-clingo: Install distribution information. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (python-clingo)[#:phases]: Add ‘install-distinfo’. --- gnu/packages/maths.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ceb2f14a80..fc85560114 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2717,7 +2717,17 @@ satisfiability checking (SAT).") (("ctl\\.solve\\(on_statistics=on_statistics\\)" all) (string-append all - "; self.skipTest(\"You shall not fail.\")"))))))))) + "; self.skipTest(\"You shall not fail.\")"))))) + (add-after 'install 'install-distinfo + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion (python:site-packages inputs outputs) + (let ((dir (string-append "clingo-" #$version ".dist-info"))) + (mkdir-p dir) + (call-with-output-file (string-append dir "/METADATA") + (lambda (port) + (format port "Metadata-Version: 1.1~%") + (format port "Name: clingo~%") + (format port "Version: ~a~%" #$version))))))))))) (inputs (list clingo python-wrapper)) (propagated-inputs (list python-cffi)) (native-inputs (modify-inputs (package-native-inputs clingo) -- cgit 1.4.1 From eb96e148ca50fde3068f365ab4ebb6ab6dbf3dea Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Feb 2023 15:51:56 +0100 Subject: gnu: Add python-clorm. * gnu/packages/maths.scm (python-clorm): New variable. --- gnu/packages/maths.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fc85560114..1e40be8722 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2737,6 +2737,41 @@ satisfiability checking (SAT).") making it so that you can write @acronym{ASPs, Answer Set Programs} through Python code."))) +(define-public python-clorm + (package + (name "python-clorm") + (version "1.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/clorm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jx99y71mrgdicn1da5dwz5nzgvvpabrikff783sg4shbv2cf0b5")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-breaking-tests + (lambda _ + ;; noclingo tests rely on this being set + (setenv "CLORM_NOCLINGO" "1") + (delete-file "tests/test_mypy_query.py") + (substitute* "tests/test_clingo.py" + (("self\\.assertTrue\\(os_called\\)" all) + (string-append "# " all)))))))) + (propagated-inputs (list python-clingo)) + (native-inputs (list python-typing-extensions)) + (home-page "https://potassco.org") + (synopsis "Object relational mapping to clingo") + (description "@acronym{Clorm, Clingo ORM} provides an @acronym{ORM, +Object Relational Mapping} interface to the @acronym{ASP, answer set +programming} solver clingo. Its goal is to make integration of clingo +into Python programs easier.") + (license license:expat))) + (define-public python-telingo (package (name "python-telingo") -- cgit 1.4.1 From 243eb86c6ffa9d0a5665d90e33f788e2aac8dab5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Feb 2023 16:15:00 +0100 Subject: gnu: Add emacs-pasp-mode. * gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch: New file. * gnu/local.mk: Register it here. * gnu/packages/emacs-xyz.scm (emacs-pasp-mode): New variable. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 48 ++++++++++++++++++++++ .../patches/emacs-pasp-mode-quote-file-names.patch | 20 +++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index b2033a5460..5da09a8e79 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1071,6 +1071,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4592a9c3ae..4e40b22426 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -201,6 +201,7 @@ #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lsof) #:use-module (gnu packages lua) + #:use-module (gnu packages maths) #:use-module (gnu packages music) #:use-module (gnu packages version-control) #:use-module (gnu packages imagemagick) @@ -4389,6 +4390,53 @@ written text. Unlike dynamic abbreviation, the text is analysed during idle time, while Emacs is doing nothing else.") (license license:gpl3+))) +(define-public emacs-pasp-mode + (let ((commit "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92") + (revision "1")) + (package + (name "emacs-pasp-mode") + (version (git-version "0.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/santifa/pasp-mode") + (commit commit))) + (patches + (search-patches "emacs-pasp-mode-quote-file-names.patch")) + (sha256 + (base32 + "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'defconst-version + (lambda _ + (emacs-batch-edit-file "pasp-mode.el" + '(progn + (search-forward-regexp "(defcustom pasp-mode-version") + (forward-sexp) + (kill-sexp) + (backward-sexp) + (beginning-of-line) + (kill-sexp) + (insert (format "(defconst emacs-pasp-version \"%s\" %s)" + #$version (cadr kill-ring))) + (basic-save-buffer))))) + (add-after 'unpack 'hardcode-clingo + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "pasp-mode.el" + ("pasp-clingo-path" + (search-input-file inputs "/bin/clingo")))))))) + (inputs (list clingo)) + (home-page "https://github.com/santifa/pasp-mode") + (synopsis "Major mode for editing answer set programs") + (description + "This package provides a major mode for editing answer set programs, +in particular ones that can be solved by @command{clingo}.") + (license license:gpl3+)))) + (define-public emacs-pdf-tools (package (name "emacs-pdf-tools") diff --git a/gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch b/gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch new file mode 100644 index 0000000000..39dc5d0253 --- /dev/null +++ b/gnu/packages/patches/emacs-pasp-mode-quote-file-names.patch @@ -0,0 +1,20 @@ +diff --git a/pasp-mode.el b/pasp-mode.el +index 7f83645..5daf08e 100644 +--- a/pasp-mode.el ++++ b/pasp-mode.el +@@ -199,9 +199,12 @@ + Argument ENCODING The current buffer which holds the problem encoding. + Optional argument INSTANCE The problem instance which is solved by the encoding. + If no instance it is assumed to be also in the encoding file." +- (if 'instance +- (concat pasp-clingo-path " " pasp-clingo-options " " encoding " " instance) +- (concat pasp-clingo-path " " pasp-clingo-options " " encoding))) ++ (if instance ++ (concat pasp-clingo-path " " pasp-clingo-options " " ++ (shell-quote-argument encoding) " " ++ (shell-quote-argument instance)) ++ (concat pasp-clingo-path " " pasp-clingo-options " " ++ (shell-quote-argument encoding)))) + + (defun pasp-run-clingo (encoding &optional instance) + "Run Clingo with some ASP input files. -- cgit 1.4.1 From 28cefd2e560d5db60de7e03978ef03f57dd2011f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 11 Feb 2023 12:34:51 +0800 Subject: gnu: hyfetch: Update to 1.4.6. * gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch: New file. * gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/admin.scm (hyfetch)[source]: Update to 1.4.6. Switch to git source and add patches. [inputs]: Remove python-hypy-utils. [arguments]<#:phases>: Remove set-HOME phase. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 2 + gnu/packages/admin.scm | 27 +++-- ...h-fix-generator-script-quotation-escaping.patch | 115 +++++++++++++++++++++ .../patches/hyfetch-remove-old-catchy-os-py.patch | 48 +++++++++ 4 files changed, 181 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch create mode 100644 gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 5da09a8e79..f3d8dfcac6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1325,6 +1325,8 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-xattr.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ + %D%/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch \ + %D%/packages/patches/hyfetch-remove-old-catchy-os-py.patch \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 568c6ce650..b79621e279 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3915,19 +3915,24 @@ you are running, what theme or icon set you are using, etc.") (define-public hyfetch (package (name "hyfetch") - (version "1.4.4") + (version "1.4.6") (source - (origin - (method url-fetch) - (uri (pypi-uri "HyFetch" version)) - (sha256 - (base32 "1k3pcl16y2czkk7wd79yk0w1kqpi4fp8h8szhjs5ywwy20nqmms8")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hykilpikonna/hyfetch") + (commit version))) + (file-name (git-file-name name version)) + (patches + (search-patches + ;; XXX: Cherry-picked from upstream, remove when updating. + "hyfetch-fix-generator-script-quotation-escaping.patch" + "hyfetch-remove-old-catchy-os-py.patch")) + (sha256 + (base32 + "1cnjvkil40bipia8gvs32q0lbqyi5j0nrsr7k4s0c55rh5bhkc3d")))) (build-system python-build-system) - (inputs (list python-hypy-utils python-typing-extensions)) - (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'set-HOME - (lambda _ ;; Tries to set files in .config - (setenv "HOME" "/tmp")))))) + (inputs (list python-typing-extensions)) (home-page "https://github.com/hykilpikonna/HyFetch") (synopsis "@code{neofetch} with pride flags <3") (description "HyFetch is a command-line system information tool fork of diff --git a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch new file mode 100644 index 0000000000..dc09864707 --- /dev/null +++ b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch @@ -0,0 +1,115 @@ +From db69285ec161452c11ae490266e84211bec38c0d Mon Sep 17 00:00:00 2001 +From: Azalea Gui +Date: Fri, 10 Feb 2023 23:05:23 -0500 +Subject: [PATCH] [F] Fix generator script quotation escaping #91 #90 + +--- + hyfetch/distros/debian.py | 4 ++-- + hyfetch/distros/haiku.py | 2 +- + hyfetch/distros/puffos.py | 2 +- + hyfetch/distros/skiffos.py | 2 +- + hyfetch/distros/trisquel.py | 4 ++-- + tools/list_distros.py | 4 +++- + 6 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/hyfetch/distros/debian.py b/hyfetch/distros/debian.py +index 8aab161d..7b4a2a9c 100644 +--- a/hyfetch/distros/debian.py ++++ b/hyfetch/distros/debian.py +@@ -4,7 +4,7 @@ from . import AsciiArt + debian = AsciiArt(match=r'''"Debian"*''', color='1 7 3', ascii=r""" + ${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. +- ,g$$P" \"""Y$$.". ++ ,g$$P" "\""Y$$.". + ,$$P' `$$$. + ',$$P ,ggs. `$$b: + `d$$' ,$P"' ${c1}.${c2} $$$ +@@ -18,6 +18,6 @@ ${c2} `Y$$ + `$$b. + `Y$$b. + `"Y$b._ +- `\""" ++ `"\"" + """) + +\ No newline at end of file +diff --git a/hyfetch/distros/haiku.py b/hyfetch/distros/haiku.py +index cf10cfc5..198cd142 100644 +--- a/hyfetch/distros/haiku.py ++++ b/hyfetch/distros/haiku.py +@@ -15,6 +15,6 @@ ${c3} MMMM${c4} .cOMMMMM|/MMMMM/` + MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM + MMMM MMMM + MMMM MMMM +- \"""" \"""" ++ "\"\"" "\"\"" + """) + +\ No newline at end of file +diff --git a/hyfetch/distros/puffos.py b/hyfetch/distros/puffos.py +index 789d3994..0e61def4 100644 +--- a/hyfetch/distros/puffos.py ++++ b/hyfetch/distros/puffos.py +@@ -7,7 +7,7 @@ ${c1} + ,/' '""; + / ". + ,'mmmMMMMmm. \ +- _/-"^^^^^\"""%#%mm, ; ++ _/-"^^^^^"\""%#%mm, ; + ,m,_,' "###) ;, + (###% \#/ ;##mm. + ^#/ __ ___ ; (######) +diff --git a/hyfetch/distros/skiffos.py b/hyfetch/distros/skiffos.py +index 49d311c0..93a846a7 100644 +--- a/hyfetch/distros/skiffos.py ++++ b/hyfetch/distros/skiffos.py +@@ -11,6 +11,6 @@ ${c2} + ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==, + ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}|| + ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@ +- ${c1}````'\"""\""""${c2}'\"""\""""" ++ ${c1}````'"\"\""\"\""${c2}'"\"\""\"\"\"" + """) + +\ No newline at end of file +diff --git a/hyfetch/distros/trisquel.py b/hyfetch/distros/trisquel.py +index c92a5938..b15eb1f4 100644 +--- a/hyfetch/distros/trisquel.py ++++ b/hyfetch/distros/trisquel.py +@@ -3,7 +3,7 @@ from . import AsciiArt + + trisquel = AsciiArt(match=r'''"Trisquel"*''', color='4 6', ascii=r""" + ${c1} ,o$$$o. +- ,o$$Y\"""Y$$b ++ ,o$$Y"\""Y$$b + ,o$$$$$$o. ,$$' , Y$$b + ,o$$$$$$$$$$$$o. :$ b Y$$. + ,$$"' "Y$$$$o. 'b. ,b d$$$ +@@ -11,7 +11,7 @@ $$' .d$$$$b '$$$$o 'Y$$$Y d$$$' + $$' q' 'b '$$$$$o._ _.o$$$$' + .$$,_ _,d$ ,$$$$$$$$$$$$${c2}$$$$Y' + ${c1} '$$$$aaa$$$' .$$$$$$${c2}$$$$$$$$' +-${c1} \"""" ${c2}d$$$$"' ++${c1} "\"\"" ${c2}d$$$$"' + d$$$' .d$$b. + $$$$ .$" 'a$. + $$$$ $b $$. +diff --git a/tools/list_distros.py b/tools/list_distros.py +index d781b581..63fb5288 100755 +--- a/tools/list_distros.py ++++ b/tools/list_distros.py +@@ -140,7 +140,9 @@ def export_distro(d: AsciiArt) -> str: + varname = varname.replace(s, '_') + + # Escape/unescape ascii +- ascii = d.ascii.replace('"""', '\\"""').replace("\\\\", "\\") ++ ascii = d.ascii.replace("\\\\", "\\") ++ while '"""' in ascii: ++ ascii = ascii.replace('"""', '"\\""') + + script = f""" + from . import AsciiArt +-- +2.39.1 + diff --git a/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch b/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch new file mode 100644 index 0000000000..253730ce22 --- /dev/null +++ b/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch @@ -0,0 +1,48 @@ +From be475f02112e75a7ff72a594f75eb63b0a5ac29b Mon Sep 17 00:00:00 2001 +From: Azalea Gui +Date: Fri, 10 Feb 2023 23:25:16 -0500 +Subject: [PATCH] [-] Remove old catchy_os.py (Fixes #92) + +--- + hyfetch/distros/cachy_os.py | 28 ---------------------------- + 1 file changed, 28 deletions(-) + delete mode 100644 hyfetch/distros/cachy_os.py + +diff --git a/hyfetch/distros/cachy_os.py b/hyfetch/distros/cachy_os.py +deleted file mode 100644 +index 75df6106..00000000 +--- a/hyfetch/distros/cachy_os.py ++++ /dev/null +@@ -1,28 +0,0 @@ +- +-from hyfetch.distro import AsciiArt +- +-cachy_os = AsciiArt(match=r'''"Cachy OS"*''', color='2 8 6', ascii=r""" +-${c3} ${c2}.${c3}-------------------------: +-${c3} .${c1}+=${c3}========================. +-${c3} :${c1}++${c3}===${c1}++===${c3}===============- :${c1}++${c3}- +-${c3} :${c1}*++${c3}====${c1}+++++==${c3}===========- .==: +-${c3} -${c1}*+++${c3}=====${c1}+***++=${c3}=========: +-${c3} =${c1}*++++=${c3}=======------------: +-${c3} =${c1}*+++++=${c3}====- ${c2}...${c3} +-${c3} .${c1}+*+++++${c3}=-===: .${c1}=+++=${c3}: +-${c3} :${c1}++++${c3}=====-==: -***${c1}**${c3}+ +-${c3} :${c1}++=${c3}=======-=. .=+**+${c2}.${c3} +-${c3}.${c1}+${c3}==========-. ${c2}.${c3} +-${c3} :${c1}+++++++${c3}====- ${c2}.${c3}--==-${c2}.${c3} +-${c3} :${c1}++${c3}==========. ${c2}:${c1}+++++++${c3}${c2}: +-${c3} .-===========. =*****+*+ +-${c3} .-===========: .+*****+: +-${c3} -=======${c1}++++${c3}:::::::::::::::::::::::::-: ${c2}.${c3}---: +-${c3} :======${c1}++++${c3}====${c1}+++******************=. +-${c3} :=====${c1}+++${c3}==========${c1}++++++++++++++*- +-${c3} .====${c1}++${c3}==============${c1}++++++++++*- +-${c3} .===${c1}+${c3}==================${c1}+++++++: +-${c3} .-=======================${c1}+++: +-${c3} ${c2}.......................... +-""") +- +\ No newline at end of file +-- +2.39.1 + -- cgit 1.4.1 From 877df1765ad8440c81293f4943d1f4f44485ba0f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 10 Jan 2023 21:27:34 +0100 Subject: gnu: guile-filesystem: Update to 0.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-filesystem): Update to 0.2.0. [source]: Use “https://gitlab.com/lilyp/guile-filesystem”. [home-page]: Likewise. (guile2.0-filesystem): Deleted variable. --- gnu/packages/guile-xyz.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b998179ee0..67b47581e5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -898,33 +898,27 @@ is not available for Guile 2.0.") (define-public guile-filesystem (package (name "guile-filesystem") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/leoprikler/guile-filesystem.git") + (url "https://gitlab.com/lilyp/guile-filesystem") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy")))) + "0waiaxcha584d0dc15nvs6gxh4clrfm2bwjidjsbqajgb03l4ngm")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config texinfo)) (inputs (list guile-3.0)) - (home-page "https://gitlab.com/leoprikler/guile-filesystem") + (home-page "https://gitlab.com/lilyp/guile-filesystem") (synopsis "Complementary library to Guile's built-in file system procedures") (description "@code{guile-filesystem} provides a set of utility functions, that augment Guile's support for handling files and their names.") (license license:lgpl3+))) -(define-public guile2.0-filesystem - (package - (inherit guile-filesystem) - (name "guile2.0-filesystem") - (inputs (list guile-2.0)))) - (define-public guile2.2-filesystem (package (inherit guile-filesystem) -- cgit 1.4.1 From 0100ff1727b75441fcd777d240a76428bbe4e424 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 19 Feb 2023 08:39:50 +0100 Subject: gnu: dino: Fix comment for pango-next. Pango 1.5 is a rather old version ;) * gnu/packages/messaging.scm (dino)[inputs]: Fix comment next to pango-next. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a5c3f1d56d..d540309a8f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1394,7 +1394,7 @@ Encryption to Gajim.") libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.5+ + pango-next ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support -- cgit 1.4.1 From 819aaca9d524d2fde3ed82c688d3731ca1797f87 Mon Sep 17 00:00:00 2001 From: Aleksandr Vityazev Date: Sun, 12 Feb 2023 09:02:45 +0000 Subject: gnu: php: Drop a failed test for riscv64. * gnu/packages/php (php): Drop a failed test for riscv64. [source, arguments, description]: Fix formatting. --- gnu/packages/php.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e0cd47b846..c2539ef7fc 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -71,7 +71,7 @@ (base32 "0czflx9ikxymjfgnzaifjx9kc30ww2x4063075hcifjjwqwami5x")) (patches - (search-patches "php-fix-streams-copy-length.patch")) + (search-patches "php-fix-streams-copy-length.patch")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -178,7 +178,7 @@ ,@(if (target-arm32?) ;; Drop tests known to fail on armhf. '((for-each delete-file - (list + (list "ext/calendar/tests/unixtojd_error1.phpt" "ext/opcache/tests/preload_006.phpt" "ext/opcache/tests/preload_011.phpt" @@ -200,7 +200,7 @@ '()) ,@(if (target-x86-32?) - ;; Drop tests known to fail on i686. + ;; Drop tests known to fail on i686. '((for-each delete-file (list "ext/dba/tests/dba_gdbm.phpt"))) @@ -220,6 +220,12 @@ "sapi/phpdbg/tests/watch_006.phpt"))) '()) + ,@(if (target-riscv64?) + ;; Drop tests known to fail on riscv64. + '((for-each delete-file + (list "sapi/cli/tests/upload_2G.phpt"))) + '()) + ;; Drop tests that are known to fail. (for-each delete-file '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. @@ -419,7 +425,7 @@ ("procps" ,procps))) ; for tests (synopsis "PHP programming language") (description - "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting + "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting language designed primarily for web development but is also used as a general-purpose programming language. PHP code may be embedded into HTML code, or it can be used in combination with various web template -- cgit 1.4.1 From aa1caf5fadd06be8957d15bf6725b503f90fa10b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 11:32:37 +0100 Subject: gnu: emacs-project: Update to 0.9.7. * gnu/packages/emacs-xyz.scm (emacs-project): Update to 0.9.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4e40b22426..df68c3e502 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -987,13 +987,13 @@ buffer.") (define-public emacs-project (package (name "emacs-project") - (version "0.9.6") + (version "0.9.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar")) (sha256 - (base32 "11zxkfv756xsx6c87r66sm3k88hv5f623bp3hh1cp3j97hkd4b4d")))) + (base32 "0lj21hdf0jviwq71bnzy5ffzw23p2slpcgy89chc1fn8gx0flhak")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xref)) (home-page "https://elpa.gnu.org/packages/project.html") -- cgit 1.4.1 From 14e6a5fdd85a54089e51f00b29aaeafe3be92fee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 11:33:40 +0100 Subject: gnu: emacs-goggles: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-goggles): Update to 0.3. [description]: Use proper capitalization. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df68c3e502..c0fb9f6d39 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14327,7 +14327,7 @@ being deleted, changed, yanked, or pasted when using evil commands") (define-public emacs-goggles (package (name "emacs-goggles") - (version "0.2") + (version "0.3") (source (origin (method git-fetch) @@ -14336,11 +14336,11 @@ being deleted, changed, yanked, or pasted when using evil commands") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15bqjmwfdqp2np6fln6xjyw59c5iddvzsyga0lvb8raa753cdh2k")))) + (base32 "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx")))) (build-system emacs-build-system) (home-page "https://github.com/minad/goggles") (synopsis "Pulse modified region") - (description "Goggles highlights the modified region using pulse. + (description "Goggles highlights the modified region using Pulse. Currently the commands undo, yank, kill and delete are supported.") (license license:gpl3+))) -- cgit 1.4.1 From e6b4fb5c6a99e5e198e06c7ff3ca089762e2d8cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 11:34:49 +0100 Subject: gnu: emacs-gnuplot: Update to 0.8.1. * gnu/packages/emacs-xyz.scm (emacs-gnuplot): Update to 0.8.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c0fb9f6d39..a15b17ddc7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17421,7 +17421,7 @@ gnugo-image-display-mode}.") (define-public emacs-gnuplot (package (name "emacs-gnuplot") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -17430,7 +17430,7 @@ gnugo-image-display-mode}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm")))) + (base32 "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb")))) (build-system emacs-build-system) (home-page "https://github.com/emacsorphanage/gnuplot-mode") (synopsis "Emacs major mode for interacting with Gnuplot") -- cgit 1.4.1 From f36de1a5baef8a4b5b2b752912bbbae6ec8f576f Mon Sep 17 00:00:00 2001 From: Jake Leporte Date: Sat, 18 Feb 2023 16:22:59 -0600 Subject: gnu: emacs-vterm: Include etc directory in installed files. * gnu/packages/emacs-xyz.scm (emacs-vterm)[arguments]<#:include>: Add "^etc/.*" to the list of regexes for installed files. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a15b17ddc7..97e7a1b844 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27319,6 +27319,8 @@ integration.") (guix build utils)) #:imported-modules (,@%emacs-build-system-modules (guix build cmake-build-system)) + ;; Include the `etc' folder for shell-side configuration files + #:include (cons* "^etc/.*" %default-include) #:phases (modify-phases %standard-phases (add-after 'unpack 'substitute-vterm-module-path -- cgit 1.4.1 From 57495d063587e9301feddbe051abe2f97ca038be Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 18 Feb 2023 17:08:36 -0800 Subject: gnu: Add ddd. * gnu/packages/debug.scm (ddd): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/debug.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 22b3cd862d..625a072218 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Michael Rohleder ;;; Copyright © 2022 Matthew James Kraai +;;; Copyright © 2023 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages golang) #:use-module (gnu packages image) + #:use-module (gnu packages lesstif) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -70,6 +72,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages virtualization) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -860,6 +863,36 @@ engineering.") ;; Note: Some icons in src/resources are creative commons 3.0 and/or 4.0. (license license:gpl3+))) +(define-public ddd + (package + (name "ddd") + (version "3.3.12") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/ddd/ddd-" version ".tar.gz")) + (sha256 + (base32 + "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;tests require manual intervention + ;; Avoid "friend declaration specifies default arguments and isn’t + ;; a definition" errors. + #:configure-flags #~(list "CXXFLAGS=-fpermissive"))) + (native-inputs + (list pkg-config)) + (inputs + (list motif ncurses gdb)) + (synopsis "Graphical front-end for GDB and other debuggers") + (description "GNU DDD, the Data Display Debugger, is a graphical front-end +for command-line debuggers. Many back-end debuggers are supported, notably +the GNU debugger, GDB. In addition to usual debugging features such as +viewing the source files, DDD has additional graphical, interactive features +to aid in debugging.") + (home-page "https://www.gnu.org/software/ddd/") + (license license:gpl3+))) + + (define-public delve (package (name "delve") -- cgit 1.4.1 From 636b771536b95d15a2fd68b468deeebac97d6bee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Feb 2023 09:14:17 -0500 Subject: gnu: hplip-next: Simplify the fix-more-hard-coded-file-names phase. * gnu/packages/cups.scm (hplip-next) [phases]: Only substitute python files in the fix-more-hard-coded-file-names phase. This greatly reduce the time taken by the phase (from 21 s to 0.4 s) on my system, and is functionally equivalent. --- gnu/packages/cups.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index f1007ea03b..08677d612a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -715,13 +715,10 @@ should only be used as part of the Guix cups-pk-helper service.") #~(modify-phases #$phases (add-after 'unpack 'fix-more-hard-coded-file-names (lambda* (#:key outputs #:allow-other-keys) - ;; Set the encoding to ISO-8859-1, as not all the files are - ;; readable as UTF-8. - (with-fluids ((%default-port-encoding "ISO-8859-1")) - (substitute* (find-files ".") - (("/etc/hp/hplip.conf") - (string-append (assoc-ref outputs "out") - "/etc/hp/hplip.conf")))))))))))) + (substitute* (find-files "." "\\.py$") + (("/etc/hp/hplip.conf") + (string-append (assoc-ref outputs "out") + "/etc/hp/hplip.conf"))))))))))) (define-public hplip-minimal (package/inherit hplip -- cgit 1.4.1 From f4a932cbd7a351b63c3bec9fa075e05d81848b5e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Feb 2023 13:40:40 -0500 Subject: gnu: Add a 'update-mozilla-locales' helper for maintenance. * gnu/packages/gnuzilla.scm (update-mozilla-locales): New procedure. --- gnu/packages/gnuzilla.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b2e0870fea..3f0dbf938e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -37,6 +37,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) @@ -91,7 +92,8 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) + #:use-module (gnu packages sqlite) + #:autoload (json parser) (json->scm)) (define-public mozjs (package @@ -348,6 +350,10 @@ in C/C++.") (inputs (list icu4c readline zlib)))) + +;;; +;;; Localization helper procedures. +;;; (define mozilla-compare-locales (origin (method hg-fetch) @@ -371,6 +377,18 @@ in C/C++.") (list (mozilla-locale locale changeset hash-string) ...)) +(define (update-mozilla-locales changesets.json) + "Output a new list of Mozilla locales, to update the ALL-MOZILLA-LOCALES +variable defined below. It requires guile-json to be installed." + (match (call-with-input-file changesets.json json->scm) + (((lang ("revision" . revision) platforms pin) ...) + (let ((data (reverse (map (lambda (rev lang) + `(,(list->string (make-list 40 #\0)) + ,(string-take rev 12) ,lang)) + revision lang)))) + (format #t "~{~s~%~}" data) + data)))) + (define all-mozilla-locales (mozilla-locales ;; sha256 changeset locale -- cgit 1.4.1 From 456e98ad6ff026ed14d298ecc26cb75a23decff2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Feb 2023 22:05:58 -0500 Subject: gnu: icedove: Compute a self-contained source. This refactoring work is to prepare for adding a icedove-l10n package, which will reuse that source. * gnu/packages/gnuzilla.scm (comm-source->locales+changset): New procedure. (thunderbird-source): Rename to... (thunderbird-comm-source): ... here. (icedove-source): New variable. (icedove) [source]: Use it. [phases]: Remove the prepare-thunderbird-sources and rename-to-icedove phases. --- gnu/packages/gnuzilla.scm | 210 ++++++++++++++++++++++++++++++---------------- 1 file changed, 140 insertions(+), 70 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3f0dbf938e..64d1dca42b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -47,6 +47,7 @@ #:use-module (guix hg-download) #:use-module (guix gexp) #:use-module (guix store) + #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix build-system gnu) @@ -1119,7 +1120,7 @@ standards of the IceCat project.") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. -(define thunderbird-source +(define thunderbird-comm-source (origin (method hg-fetch) (uri (hg-reference @@ -1130,11 +1131,148 @@ standards of the IceCat project.") (base32 "071q0pcfvfpzx741ly1sl8anlmzx02h17w4ylfnrkwrpaclq3p6p")))) +(define (comm-source->locales+changeset source) + "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the +list of languages supported as well as the currently used changeset." + (match (update-mozilla-locales + (string-append source "/mail/locales/l10n-changesets.json")) + (((_ changeset locale) ...) + (values locale (first changeset))))) + +;;; To find out which changeset to use for the comm-l10n repo, use the +;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source +;;; checkout directory. The complete localization data should be released as +;;; a tarball in the next release (see: +;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball +;;; is available, it should replace the complete 'l10n' directory at the root +;;; of the IceCat source, instead of only the 'calendar', chat and mail +;;; directories that it provides. +(define thunderbird-comm-l10n + (let* ((changeset "5b6788295358") + (version (git-version %icedove-version "0" changeset))) + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/projects/comm-l10n") + (changeset changeset))) + (file-name (git-file-name "comm-l10n" version)) + (sha256 + (base32 + "1jrsmkscjjllcfawi3788vwm53wn25inbhdis5nk4vfpr7wk5ill"))))) + +(define icedove-source + (let ((name (string-append "icedove-" %icedove-version))) + (origin + (method computed-origin-method) + (file-name (string-append name ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (sxml simple)) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package tar) + #+(canonical-package xz))) + + ;; Extract the base Icecat tarball, renaming its top-level + ;; directory. + (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") + "-xf" #$icecat-source) + (chdir #$name) + + ;; Merge the Thunderdbird localization data. + (copy-recursively #$thunderbird-comm-l10n "l10n") + + ;; Add the Thunderbird-specific "comm" directory.. + (mkdir "comm") + (copy-recursively #$thunderbird-comm-source "comm") + (delete-file "sourcestamp.txt") + + ;; Adjust the application name. + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))) + + ;; Step out of the directory and create the tarball. + (chdir "..") + (format #t "Packing Icedove source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + "--mtime=@315619200" ;1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + #$name)))))))) + (define-public icedove (package (name "icedove") (version %icedove-version) - (source icecat-source) + (source icedove-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1148,11 +1286,6 @@ standards of the IceCat project.") ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda _ - (mkdir "comm") - (copy-recursively #$thunderbird-source "comm") - (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -1182,69 +1315,6 @@ ca495991b7852b855")) (substitute* "comm/mail/moz.configure" (("MOZ_DEDICATED_PROFILES, True") "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- cgit 1.4.1 From 6d4a78356fbc97091ecb60da8d669afa63f846d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 10 Feb 2023 13:41:41 -0500 Subject: gnu: Define %icecat-base-version at the top level. * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%icecat-version): Define in terms of %icecat-base-version. (icecat-source): Adjust to use the above newly introduced variables. --- gnu/packages/gnuzilla.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 64d1dca42b..55cf6ba6a0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -496,20 +496,19 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-base-version "102.8.0") +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) + (upstream-firefox-version (string-append %icecat-base-version "esr")) (upstream-firefox-source (origin (method url-fetch) @@ -521,8 +520,9 @@ variable defined below. It requires guile-json to be installed." (base32 "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - (upstream-icecat-base-version "102.8.0") ; maybe older than base-version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) + ;; The upstream-icecat-base-version may be older than the + ;; %icecat-base-version. + (upstream-icecat-base-version "102.8.0") (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") (gnuzilla-source (origin @@ -553,7 +553,7 @@ variable defined below. It requires guile-json to be installed." #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- cgit 1.4.1 From d3fcbefad10404b82c110b6b47f37a1591e861a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Feb 2023 18:23:57 -0500 Subject: gnu: icecat-source: Update gnuzilla to f23f8b609. * gnu/packages/gnuzilla.scm (icecat-source): Update gnuzilla to f23f8b609. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 55cf6ba6a0..0133d76733 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -523,7 +523,7 @@ variable defined below. It requires guile-json to be installed." ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. (upstream-icecat-base-version "102.8.0") - (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") + (gnuzilla-commit "f23f8b609ef4afcc7d8ac5fa795093f1c403f8da") (gnuzilla-source (origin (method git-fetch) @@ -535,7 +535,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "12id87nsdwm6kra0gm3d3ww8kr0xxb4yllw9wcqmnrlnmspdc1n8")))) + "1zvvgjvsj7k8753f7xmpmkq35dqzyik95943hzl84v2j5mnahhj4")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit 1.4.1 From efd9f326aec7ef791e8ca9f1b37e194ec175f19d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Feb 2023 22:19:55 -0500 Subject: gnu: Add icecat-l10n and icedove-l10n. * gnu/packages/gnuzilla.scm (%icecat-locales, %icedove-locales): New variable. (make-l10n-package): New procedure. (icecat-l10n, icedove-l10n): New variables. --- gnu/packages/gnuzilla.scm | 143 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0133d76733..4e1260f851 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul ;;; ;;; This file is part of GNU Guix. @@ -1115,6 +1115,16 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) +(define %icecat-locales + '("ach" "af" "an" "ar" "ast" "az" "be" "bg" "bn" "br" "bs" "ca" "cak" + "ca-valencia" "cs" "cy" "da" "de" "dsb" "el" "en-CA" "en-GB" "eo" "es-AR" + "es-CL" "es-ES" "es-MX" "et" "eu" "fa" "ff" "fi" "fr" "fy-NL" "ga-IE" "gd" + "gl" "gn" "gu-IN" "he" "hi-IN" "hr" "hsb" "hu" "hy-AM" "ia" "id" "is" "it" + "ja" "ja-JP-mac" "ka" "kab" "kk" "km" "kn" "ko" "lij" "lt" "lv" "mk" "mr" "ms" + "my" "nb-NO" "ne-NP" "nl" "nn-NO" "oc" "pa-IN" "pl" "pt-BR" "pt-PT" "rm" "ro" + "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" + "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) + (define %icedove-build-id "20230207000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.7.2") @@ -1139,6 +1149,15 @@ list of languages supported as well as the currently used changeset." (((_ changeset locale) ...) (values locale (first changeset))))) +;;; Generated with comm-source->locales+changeset. +(define %icedove-locales + '("af" "ar" "ast" "be" "bg" "br" "ca" "cak" "cs" "cy" "da" "de" "dsb" "el" + "en-CA" "en-GB" "es-AR" "es-ES" "es-MX" "et" "eu" "fi" "fr" "fy-NL" "ga-IE" + "gd" "gl" "he" "hr" "hsb" "hu" "hy-AM" "id" "is" "it" "ja" "ja-JP-mac" "ka" + "kab" "kk" "ko" "lt" "lv" "ms" "nb-NO" "nl" "nn-NO" "pa-IN" "pl" "pt-BR" + "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" + "zh-CN" "zh-TW")) + ;;; To find out which changeset to use for the comm-l10n repo, use the ;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source ;;; checkout directory. The complete localization data should be released as @@ -1547,6 +1566,128 @@ Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (native-inputs '()) (inputs '()))) +(define (make-l10n-package project version source locales) + "Return a package for PROJECT, a symbol (either icecat or icedove), with +their corresponding VERSION, SOURCE and LOCALES variables." + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (if (eq? 'icecat project) + "IceCat" + "Icedove"))) + (package + (name (format #f "~a-l10n" project)) + (version version) + (source source) + (outputs (cons "out" locales)) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 format) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:tests? #f ;no tests, this is data + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'install) + (replace 'configure + (lambda _ + ;; The following configuration is inspired by guidance at + ;; https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html. + (call-with-output-file ".mozconfig" + (lambda (p) + (format p "~{~a~%~}" + (list (if (eq? 'icecat '#$project) + "ac_add_options --enable-project=browser" + "ac_add_options --enable-project=comm/mail") + "ac_add_options --disable-compile-environment" + (string-append + "ac_add_options --with-l10n-base=" + (getcwd) "/l10n") + ;; Hack, otherwise the build system throws: + ;; 'RuntimeError: File "brand.dtd" not found'. + "ac_add_options --enable-official-branding" + "mk_add_options MOZ_OBJDIR=obj")))) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) + (replace 'build ;build and install data files + (lambda* (#:key outputs #:allow-other-keys) + (define (find-file dir name) + (let ((files (find-files dir name))) + (when (null? files) + (error "could not find file in dir" name dir)) + (car files))) + + (for-each + (lambda (l) + (let* ((out (assoc-ref outputs l)) + ;; The older lib/$project/distribution/extensions + ;; directory is deprecated. Use the newer app-global + ;; directory, which is lib/$project/extensions. + (ext-dir-prefix + (format + #f "lib/~a/~:[~;browser/~]extensions" + '#$project (eq? 'icecat '#$project))) + (all-ext (string-append #$output "/" ext-dir-prefix)) + (ext-dir (string-append out "/" ext-dir-prefix)) + ;; XXX: Because Icedove doesn't have a makeicedove + ;; script that substitutes all the Thunderbird + ;; references to Icedove, the MOZ_LANGPACK_EID + ;; defined in comm/mail/locales/Makefile.in uses + ;; 'thunderbird' in its ID extension rather than + ;; 'icedove'. + (name (format #f "langpack-~a@~a.mozilla.org.xpi" + l (if (eq? 'icedove '#$project) + 'thunderbird + '#$project)))) + (format #t "processing locale `~a'...~%" l) + (if (eq? 'icecat '#$project) + ;; XXX: For some reasons, for IceCat, there are some + ;; parsing errors that cause the build system to + ;; return an unclean exit code; use system* to ignore + ;; errors. + (system* "./mach" "build" (string-append "langpack-" l)) + (invoke "./mach" "build" (string-append "langpack-" l))) + (mkdir-p ext-dir) + (let ((xpi (find-file "obj" (string-append + "\\." l "\\.langpack\\.xpi$")))) + (copy-file xpi (string-append ext-dir "/" name)) + ;; Symlink to the main output so that a user can + ;; install all of the language packs at once. + (mkdir-p all-ext) + (symlink (string-append ext-dir "/" name) + (string-append all-ext "/" name))))) + (if (eq? 'icedove '#$project) + '#$%icedove-locales + '#$%icecat-locales))))))) + (native-inputs + (list m4 + perl + python-wrapper + node + unzip)) + (home-page "https://www.mozilla.org/") + (synopsis (string-append "Language localization data for " name)) + (description (string-append "This package contains the various language +localization data files (language pack extensions) for " name ". The +individual localization packages can be installed by using the output +associated with their name.")) + (license license:mpl2.0)))) + +(define-public icecat-l10n + (make-l10n-package 'icecat %icecat-version icecat-source %icecat-locales)) + +(define-public icedove-l10n + (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- cgit 1.4.1 From 6375e2e39c74b3cc702917314f93de7315bec918 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Feb 2023 10:20:12 -0500 Subject: gnu: icedove: Automatically load system-provided extensions. * gnu/packages/gnuzilla.scm (icedove-source): Set the extensions.autoDisableScopes preference value to 3. (icedove-minimal) [phases]: Add the --allow-addon-sideload and --with-unsigned-addon-scopes=app,system ac options to the configure phase. --- gnu/packages/gnuzilla.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4e1260f851..babf97e65c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1273,7 +1273,15 @@ list of languages supported as well as the currently used changeset." (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (string-append m ", false);")) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))) + (string-append m ", false);")) + + ;; XXX: The autoDisableScopes is tweaked by the makeicecat + ;; script, but it doesn't know about Thunderbird. This is + ;; necessary to allow picking up the extensions found in the + ;; system global application directory, such as the language + ;; packs. + (("\"extensions.autoDisableScopes\", 15") + "\"extensions.autoDisableScopes\", 3")) ;; Step out of the directory and create the tarball. (chdir "..") @@ -1386,6 +1394,8 @@ ca495991b7852b855")) (lambda () (display (string-append + "ac_add_options --allow-addon-sideload\n" + "ac_add_options --with-unsigned-addon-scopes=app,system\n" "ac_add_options --disable-crashreporter\n" "ac_add_options --disable-debug\n" "ac_add_options --disable-debug-symbols\n" -- cgit 1.4.1 From acf7d01fc39f863726a4034cb11071e4d46a7094 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 12 Feb 2023 22:44:27 -0500 Subject: gnu: Add language packs to icecat and icedove. Fixes . * gnu/packages/gnuzilla.scm (icecat): Rename to... (icecat-minimal): ... this. (icedove: Rename to... (icedove-minimal): ... this. (make-mozilla-with-l10n): New procedure. (icecat, icedove): New variables. --- gnu/packages/gnuzilla.scm | 133 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 100 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index babf97e65c..b7a96a880e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -671,9 +671,9 @@ variable defined below. It requires guile-json to be installed." "--sort=name" icecat-dir))))))))) -(define-public icecat +(define-public icecat-minimal (package - (name "icecat") + (name "icecat-minimal") (version %icecat-version) (source icecat-source) (build-system gnu-build-system) @@ -1295,9 +1295,9 @@ list of languages supported as well as the currently used changeset." "--sort=name" #$name)))))))) -(define-public icedove +(define-public icedove-minimal (package - (name "icedove") + (name "icedove-minimal") (version %icedove-version) (source icedove-source) (properties @@ -1547,35 +1547,6 @@ ca495991b7852b855")) Thunderbird. It supports email, news feeds, chat, calendar and contacts.") (license license:mpl2.0))) -(define-public icedove/wayland - (package - (inherit icedove) - (name "icedove-wayland") - (build-system trivial-build-system) - (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (let* ((exe (string-append #$output "/bin/icedove"))) - (mkdir-p (dirname exe)) - (call-with-output-file exe - (lambda (port) - (format port "#!~a - MOZ_ENABLE_WAYLAND=1 exec ~a $@" - #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) - (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") - (string-append #$output "/share")) - (substitute* (string-append #$output - "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) - (native-inputs '()) - (inputs '()))) - (define (make-l10n-package project version source locales) "Return a package for PROJECT, a symbol (either icecat or icedove), with their corresponding VERSION, SOURCE and LOCALES variables." @@ -1698,6 +1669,102 @@ associated with their name.")) (define-public icedove-l10n (make-l10n-package 'icedove %icedove-version icedove-source %icedove-locales)) +;;; This hack exists because there's no way to configure extra extension +;;; search paths for IceCat or Icedove. The global extensions directory is +;;; constructed relatively to the executable file name. +(define (make-mozilla-with-l10n project base l10n-package) + "Return a package definition for PROJECT (a symbol such as 'icecat or +'icedove) that combines the BASE package with L10N-PACKAGE." + + (unless (member project '(icecat icedove)) + (error "only icecat or icedove components are currently supported")) + + (let ((name (symbol->string project)) + (icecat? (eq? 'icecat project))) + (package + (inherit base) + (name (symbol->string project)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build union) + (guix build utils)) + #:builder + #~(begin + (use-modules (guix build union) + (guix build utils)) + + (union-build #$output (list #$base #$l10n-package) + #:create-all-directories? #t) + + (define* (expose name #:optional (proc copy-file) + #:key (source #$base)) + (let ((dest (string-append #$output "/" name))) + (mkdir-p (dirname dest)) + (proc (string-append source "/" name) dest))) + + (let ((wrapper (string-append "lib/" #$name "/" #$name)) + (real-binary (string-append "lib/" #$name "/." #$name + "-real")) + (desktop-file (string-append "share/applications/" + #$name ".desktop"))) + ;; Copy wrapper file. + (delete-file (string-append #$output "/" wrapper)) + (expose wrapper) + + ;; Recreate bin symlink. + (delete-file (string-append #$output "/bin/" #$name)) + (symlink (string-append #$output "/" wrapper) + (string-append #$output "/bin/" #$name)) + + ;; Copy actual binary. + (delete-file (string-append #$output "/" real-binary)) + (expose real-binary) + + ;; Copy desktop file. + (delete-file (string-append #$output "/" desktop-file)) + (expose desktop-file) + + ;; Adjust the references in the desktop file and wrapper. + (substitute* (list (string-append #$output "/" desktop-file) + (string-append #$output "/" wrapper)) + ((#$base) #$output))))))))) + +(define-public icecat + (make-mozilla-with-l10n 'icecat icecat-minimal icecat-l10n)) + +(define-public icedove + (make-mozilla-with-l10n 'icedove icedove-minimal icedove-l10n)) + +(define-public icedove/wayland + (package + (inherit icedove) + (name "icedove-wayland") + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((exe (string-append #$output "/bin/icedove"))) + (mkdir-p (dirname exe)) + (call-with-output-file exe + (lambda (port) + (format port "#!~a + MOZ_ENABLE_WAYLAND=1 exec ~a $@" + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) + (chmod exe #o555) + ;; Provide the manual and .desktop file. + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) + (define-public firefox-decrypt (package (name "firefox-decrypt") -- cgit 1.4.1 From 74a5634ad839884767f4c3ce9d84ba80fa7e3053 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 13 Feb 2023 14:39:35 -0500 Subject: gnu: icedove: Use the locale of the system. * gnu/packages/gnuzilla.scm (icedove-source): Set the intl.locale.requested option to the empty string. --- gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b7a96a880e..b48d71bc37 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1281,7 +1281,12 @@ list of languages supported as well as the currently used changeset." ;; system global application directory, such as the language ;; packs. (("\"extensions.autoDisableScopes\", 15") - "\"extensions.autoDisableScopes\", 3")) + "\"extensions.autoDisableScopes\", 3") + + ;; Set the default locale to that of the operating system. + ((".*extensions.autoDisableScopes.*" anchor) + (string-append anchor + "pref(\"intl.locale.requested\", \"\");\n"))) ;; Step out of the directory and create the tarball. (chdir "..") -- cgit 1.4.1 From 25f9d4c4c26ca7c02d785036b9477f0a3373679e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Feb 2023 00:09:50 -0500 Subject: gnu: icecat: Remove gtk+-2 input. * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Remove gtk+-2. --- gnu/packages/gnuzilla.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b48d71bc37..acdbe5ca37 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -685,7 +685,6 @@ variable defined below. It requires guile-json to be installed." gdk-pixbuf glib gtk+ - gtk+-2 ;; UNBUNDLE-ME! graphite2 cairo pango -- cgit 1.4.1 From d318ccc36308171a74b4863ea25a3dded05a2851 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 Feb 2023 00:10:38 -0500 Subject: gnu: icecat: Unbundle nss and nspr. * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and nss-next. [configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss" configure flags. [phases] {remove-bundled-libraries}: Update comment. --- gnu/packages/gnuzilla.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index acdbe5ca37..6a9d3d18ad 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -715,10 +715,8 @@ variable defined below. It requires guile-json to be installed." mit-krb5 hunspell libnotify - ;; See - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss + nspr-next + nss-next shared-mime-info sqlite eudev @@ -813,12 +811,8 @@ variable defined below. It requires guile-json to be installed." ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" - - ;; See - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-nspr" + "--with-system-nss" ;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-graphite2" @@ -867,12 +861,9 @@ variable defined below. It requires guile-json to be installed." ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; . For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" + ;; FIXME: Some of the bundled NSS sources are used + ;; to build third_party/prio. + ;;"security/nss" ;; ;; TODO: Use more system media libraries. See: ;; -- cgit 1.4.1 From 8fa5e0acecf429d562ee849f8465a76e9b245f16 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Feb 2023 11:19:17 +0200 Subject: gnu: Add fcode-utils. * gnu/packages/firmware.scm (fcode-utils): New variable. --- gnu/packages/firmware.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 23975c72e8..f99ee32abf 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -347,6 +348,45 @@ broadband modem as found, for example, on PinePhone.") (home-page "https://gitlab.com/mobian1/devices/eg25-manager") (license license:gpl3+))) +(define-public fcode-utils + (package + (name "fcode-utils") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openbios/fcode-utils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yyqmiqvlf644jrv8x39aqdqywdnm80k62d2assgcammwbc7krya")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "tests" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; No configure script. + (native-inputs + (list tcsh)) + (home-page "https://www.openfirmware.info/FCODE_suite") + (synopsis "Utilities to process FCODE, OpenFirmware's byte code") + (description "This is the OpenBIOS FCODE suite. It contains a set of +utilites used to process FCODE, OpenFirmware's byte code, consisting of: +@enumerate +@item toke - A tokenizer +@item detok - A detokenizer +@item romheaders - A PCI rom header utility +@item localvalues - A portable implementation of Forth local values +@end enumerate") + (license (list license:gpl2 + ;; localvalues implementation and some documentation. + license:cpl1.0)))) + (define* (make-openbios-package name arch) (let ((target (cond ((string-suffix? "ppc" arch) -- cgit 1.4.1 From 042b92edb20648c030dcbaf59acd176731550b70 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 16 Feb 2023 11:21:49 +0200 Subject: gnu: make-openbios-package: Update to 1.1-1.af97fd7. * gnu/packages/firmware.scm (make-openbios-package): Update to 1.1-1.af97fd7. [source]: Remove patch. [native-inputs]: Build with gcc-10. Add fcode-utils. * gnu/packages/patches/openbios-gcc-warnings.patch: Remove file. * ngu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/firmware.scm | 18 +++-- gnu/packages/patches/openbios-gcc-warnings.patch | 95 ------------------------ 3 files changed, 10 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/openbios-gcc-warnings.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f3d8dfcac6..bbde10e756 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1605,7 +1605,6 @@ dist_patch_DATA = \ %D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \ - %D%/packages/patches/openbios-gcc-warnings.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openbox-python3.patch \ diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f99ee32abf..a876aa727a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -395,20 +395,22 @@ utilites used to process FCODE, OpenFirmware's byte code, consisting of: "x86_64-linux-gnu") ((string-suffix? "x86" arch) "i686-linux-gnu") - (else (string-append arch "-linux-gnu"))))) + (else (string-append arch "-linux-gnu")))) + ;; 1.1 was released in May 2013. + (commit "af97fd7af5e7c18f591a7b987291d3db4ffb28b5") + (revision "1")) (package (name name) - (version "1.1") + (version (git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/openbios/openbios") - (commit (string-append "v" version)))) + (commit commit))) (file-name (git-file-name "openbios" version)) - (patches (search-patches "openbios-gcc-warnings.patch")) (sha256 (base32 - "11cr0097aiw4hc07v5hfl95753ikyra5ig4nv899ci7l42ilrrbr")))) + "1xp1b6xgx40i0j3a5y3id0d1p8vdvapai8szganxg3zrvj53fh0n")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests @@ -436,9 +438,9 @@ utilites used to process FCODE, OpenFirmware's byte code, consisting of: "\\.elf$")))))))) (native-inputs (append (if (string-prefix? (%current-system) target) - '() - (list (cross-gcc target) (cross-binutils target))) - (list libxslt which))) + (list gcc-10) + (list (cross-gcc target #:xgcc gcc-10) (cross-binutils target))) + (list fcode-utils libxslt which))) (home-page "https://openfirmware.info/Welcome_to_OpenBIOS") (synopsis "Open Firmware implementation") (description diff --git a/gnu/packages/patches/openbios-gcc-warnings.patch b/gnu/packages/patches/openbios-gcc-warnings.patch deleted file mode 100644 index b96cecc31e..0000000000 --- a/gnu/packages/patches/openbios-gcc-warnings.patch +++ /dev/null @@ -1,95 +0,0 @@ -Fix warnings with recent versions of GCC. - -This is a combination of these commits: - - https://github.com/openbios/openbios/commit/14be7d187a327a89c068c4e2551d5012a3c25703 - https://github.com/openbios/openbios/commit/0e6b8b3cb4a25a4680f238bae76de5e370e706c8 - https://github.com/openbios/openbios/commit/51067854a7606cceb8b1e0a3d2108da69ff46973 - -...with minor adaptations to apply on 1.1. - - -diff --git a/arch/sparc32/context.c b/arch/sparc32/context.c ---- a/arch/sparc32/context.c -+++ b/arch/sparc32/context.c -@@ -86,7 +86,7 @@ struct context *switch_to(struct context *ctx) - __context = ctx; - asm __volatile__ ("\n\tcall __switch_context" - "\n\tnop" ::: "g1", "g2", "g3", "g4", "g5", "g6", "g7", -- "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", -+ "o0", "o1", "o2", "o3", "o4", "o5", "o7", - "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", - "i0", "i1", "i2", "i3", "i4", "i5", "i7", - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", -diff --git a/drivers/cuda.c b/drivers/cuda.c ---- a/drivers/cuda.c -+++ b/drivers/cuda.c -@@ -355,7 +355,7 @@ static void - rtc_init(char *path) - { - phandle_t ph, aliases; -- char buf[64]; -+ char buf[128]; - - snprintf(buf, sizeof(buf), "%s/rtc", path); - REGISTER_NAMED_NODE(rtc, buf); -diff --git a/drivers/ide.c b/drivers/ide.c ---- a/drivers/ide.c -+++ b/drivers/ide.c -@@ -987,7 +987,7 @@ ob_ide_identify_drive(struct ide_drive *drive) - drive->sect = id.sectors; - } - -- strncpy(drive->model, (char*)id.model, sizeof(id.model)); -+ strncpy(drive->model, (char*)id.model, sizeof(drive->model)); - drive->model[40] = '\0'; - return 0; - } -diff --git a/fs/hfs/hfs_fs.c b/fs/hfs/hfs_fs.c ---- a/fs/hfs/hfs_fs.c -+++ b/fs/hfs/hfs_fs.c -@@ -86,7 +86,7 @@ _search( hfsvol *vol, const char *path, const char *sname, hfsfile **ret_fd ) - - strncpy( buf, path, sizeof(buf) ); - if( buf[strlen(buf)-1] != ':' ) -- strncat( buf, ":", sizeof(buf) ); -+ strncat( buf, ":", sizeof(buf) - 1 ); - buf[sizeof(buf)-1] = 0; - p = buf + strlen( buf ); - -@@ -101,7 +101,7 @@ _search( hfsvol *vol, const char *path, const char *sname, hfsfile **ret_fd ) - *p = 0; - topdir = 0; - -- strncat( buf, ent.name, sizeof(buf) ); -+ strncat( buf, ent.name, sizeof(buf) - 1); - if( (status=_search(vol, buf, sname, ret_fd)) != 2 ) - continue; - topdir = 1; -diff --git a/libc/string.c b/libc/string.c ---- a/libc/string.c -+++ b/libc/string.c -@@ -349,10 +349,7 @@ int memcmp(const void * cs,const void * ct,size_t count) - char * - strdup( const char *str ) - { -- char *p; -- if( !str ) -- return NULL; -- p = malloc( strlen(str) + 1 ); -+ char *p = malloc( strlen(str) + 1 ); - strcpy( p, str ); - return p; - } -diff --git a/packages/nvram.c b/packages/nvram.c ---- a/packages/nvram.c -+++ b/packages/nvram.c -@@ -105,7 +105,7 @@ create_free_part( char *ptr, int size ) - nvpart_t *nvp = (nvpart_t*)ptr; - memset( nvp, 0, size ); - -- strncpy( nvp->name, "777777777777", sizeof(nvp->name) ); -+ strncpy( nvp->name, "77777777777", sizeof(nvp->name) ); - nvp->signature = NV_SIG_FREE; - nvp->len_hi = (size /16) >> 8; - nvp->len_lo = size /16; -- cgit 1.4.1 From e8fcf1e42438113d7e4be82dc5a06de45eaceb76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 20 Feb 2023 10:39:03 +0200 Subject: gnu: qemu: Skip additional test of arm kvm features. * gnu/packages/virtualization.scm (qemu)[arguments]: Adjust 'disable-unusable-tests phase to skip an arm test. --- gnu/packages/virtualization.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 64a26edb02..927be39676 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2017, 2020-2022 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver -;;; Copyright © 2016, 2017, 2018. 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2016-2021, 2023 Efraim Flashner ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Andy Patterson @@ -302,7 +302,11 @@ ;; Comment out the test-char test, which needs networking and ;; fails within the build environment. ((".*'test-char':.*" all) - (string-append "# " all))))) + (string-append "# " all))) + (substitute* "tests/qtest/meson.build" + ;; These tests fail to get the expected number of tests + ;; on arm platforms. + (("'arm-cpu-features',") "")))) #$@(if (target-riscv64?) '((add-after 'unpack 'disable-some-tests (lambda _ -- cgit 1.4.1 From fd7c10681ab2eb3ce3466bc40cafd4013ab09abb Mon Sep 17 00:00:00 2001 From: Steve George Date: Thu, 16 Feb 2023 22:57:39 +0000 Subject: gnu: Add rust-downcast-0.11. * gnu/packages/crates-io.scm (rust-downcast-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e615a51b01..1bb55a0a2d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17761,6 +17761,26 @@ from macros.") @code{Cargo.toml}.") (license (list license:expat license:asl2.0)))) +(define-public rust-downcast-0.11 + (package + (name "rust-downcast") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (crate-uri "downcast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wa78ahlc57wmqyq2ncr80l7plrkgz57xsg7kfzgpcnqac8gld8l")))) + (build-system cargo-build-system) + (home-page "https://github.com/fkoep/downcast-rs") + (synopsis + "Trait for downcasting trait objects back to their original types") + (description + "This package provides a trait, and utilities, for downcasting trait +objects back to their original types. The same as the rust-downcast-rs crate.") + (license license:expat))) + (define-public rust-downcast-rs-1 (package (name "rust-downcast-rs") -- cgit 1.4.1 From 16041719bf25c544aa86edb43250a61b3c8fcb9a Mon Sep 17 00:00:00 2001 From: Steve George Date: Thu, 16 Feb 2023 22:57:40 +0000 Subject: gnu: Add rust-mockall-double-0.3. * gnu/packages/crates-io.scm (rust-mockall-double-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1bb55a0a2d..0f1c0c7163 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33733,6 +33733,30 @@ IOCP and Async I/O abstractions.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-mockall-double-0.3 + (package + (name "rust-mockall-double") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (crate-uri "mockall-double" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xk6hjr7m73zly4hg3zmma437vqvrwnjxy2wfxy1hxbk52xwfwdf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/asomers/mockall") + (synopsis "Double test adapter that works well with Mockall") + (description + "This crate makes it even easier to use mocking by providing a way to +select the mock struct at compile time. Used with the Mockall crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-model-0.1 (package (name "rust-model") -- cgit 1.4.1 From 0892d54d201d30f331ac150f98fca7ae681297c6 Mon Sep 17 00:00:00 2001 From: Steve George Date: Thu, 16 Feb 2023 22:57:41 +0000 Subject: gnu: Add rust-mockall-derive-0.11. * gnu/packages/crates-io.scm (rust-mockall-derive-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f1c0c7163..3860eecdad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33733,6 +33733,32 @@ IOCP and Async I/O abstractions.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-mockall-derive-0.11 + (package + (name "rust-mockall-derive") + (version "0.11.1") + (source (origin + (method url-fetch) + (uri (crate-uri "mockall-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ixhmsrg5ky4b2jlvbxhlpr3mbv7frd6wr8msm005vijb5rmcb96")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.7)))) + (home-page "https://github.com/asomers/mockall") + (synopsis "Procedural macros for the Mockall crate") + (description + "This package procides procedural macros for the Mockall crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mockall-double-0.3 (package (name "rust-mockall-double") -- cgit 1.4.1 From 8322c062a99d411d067df4809a864ffd0dbc44f8 Mon Sep 17 00:00:00 2001 From: Steve George Date: Thu, 16 Feb 2023 22:57:42 +0000 Subject: gnu: Add rust-mockall-0.11. * gnu/packages/crates-io.scm (rust-mockall-0.11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3860eecdad..6ff2ec1c71 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33733,6 +33733,42 @@ IOCP and Async I/O abstractions.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-mockall-0.11 + (package + (name "rust-mockall") + (version "0.11.1") + (source (origin + (method url-fetch) + (uri (crate-uri "mockall" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k3g3xxf195vsnzmwza047dv89zlg6h5yj5774wjlndgpdvf8han")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-downcast" ,rust-downcast-0.11) + ("rust-fragile" ,rust-fragile-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-mockall-derive" ,rust-mockall-derive-0.11) + ("rust-predicates" ,rust-predicates-2) + ("rust-predicates-tree" ,rust-predicates-tree-1)) + #:cargo-development-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-futures" ,rust-futures-0.3) + ("rust-mockall-double" ,rust-mockall-double-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/asomers/mockall") + (synopsis "Mock object library for Rust") + (description + "Mockall is a rich mocking library with a terse and ergonomic interface.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mockall-derive-0.11 (package (name "rust-mockall-derive") -- cgit 1.4.1 From 116a16aa3acc670441bb201b80c98f7d9433ce12 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 20 Feb 2023 13:30:50 +0100 Subject: gnu: emacs-wisp-mode: Update to 1.0.10. * gnu/packages/emacs-xyz.scm (emacs-wisp-mode): Update to 1.0.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 97e7a1b844..73e6e0b223 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34521,7 +34521,7 @@ complementary packages.") (define-public emacs-wisp-mode (package (name "emacs-wisp-mode") - (version "1.0.8") + (version "1.0.10") (source (origin (method hg-fetch) @@ -34530,7 +34530,7 @@ complementary packages.") (changeset (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hqwdmx081icv516cyndjkwvgr7b41hi5qdaylkv0jran35jwjiw")))) + (base32 "13xlagkjmnzv0fn6bwb3vrqn6arxx1g2m1b4wg2rzm7dadlpgmpn")))) (build-system emacs-build-system) (home-page "https://www.draketo.de/software/wisp") (synopsis "Syntax highlighting and indentation support for Wisp files") -- cgit 1.4.1 From 79b10602796b6674a365fc4434b73a3b31142be7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 20 Feb 2023 13:32:08 +0100 Subject: gnu: emacs-project: Update to 0.9.8. * gnu/packages/emacs-xyz.scm (emacs-project): Update to 0.9.8. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 73e6e0b223..1645fea869 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -987,13 +987,13 @@ buffer.") (define-public emacs-project (package (name "emacs-project") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar")) (sha256 - (base32 "0lj21hdf0jviwq71bnzy5ffzw23p2slpcgy89chc1fn8gx0flhak")))) + (base32 "0i1q9blvpj3bygjh98gv0kqn2rm01b8lqp9vra82sy3hzzj39pyx")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xref)) (home-page "https://elpa.gnu.org/packages/project.html") -- cgit 1.4.1 From 06212e8c6a6cec0311edf14de465b8004c21f84c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 20 Feb 2023 13:32:13 +0100 Subject: gnu: emacs-vertico-posframe: Update to 0.7.0. * gnu/packages/emacs-xyz.scm (emacs-vertico-posframe): Update to 0.7.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1645fea869..32fc437ef1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35833,7 +35833,7 @@ across sessions.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append @@ -35841,7 +35841,7 @@ across sessions.") ".tar")) (sha256 (base32 - "1cwi26jz9dn8la6zxxai2pfkcpz8lwf4cd8hr44lak6x0ca9bwr3")))) + "19ic4yjm9ccnvrhccfzhn4p3brk760hf8aw6qv53gf6qlj3mcyag")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (home-page "https://github.com/tumashu/vertico-posframe") -- cgit 1.4.1 From 1551bae3de6ac60866fe5666d726205084b69b0e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 20 Feb 2023 13:34:51 +0100 Subject: gnu: emacs-diff-hl: Update to 1.9.2. * gnu/packages/emacs-xyz.scm (emacs-diff-hl): Update to 1.9.2. [description]: Use proper capitalization. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32fc437ef1..79ad285c95 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16407,29 +16407,26 @@ actually changing the buffer's text.") (license license:gpl3+))) (define-public emacs-diff-hl - ;;; XXX: Latest release is not tagged. Use commit matching version bump. - (let ((commit "8f2e4eb345f0639c8fc41e3f7576f77ba6987655")) - (package - (name "emacs-diff-hl") - (version "1.9.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dgutov/diff-hl") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1c265083zyqi33sf3mpkk1n7pyfkrzxg4dacx0b787ypbj1sls16")))) - (build-system emacs-build-system) - (home-page "https://github.com/dgutov/diff-hl") - (synopsis - "Highlight uncommitted changes using VC") - (description - "@code{diff-hl-mode} highlights uncommitted changes on the side of the -window (using the fringe, by default), allows you to jump between -the hunks and revert them selectively.") - (license license:gpl3+)))) + (package + (name "emacs-diff-hl") + (version "1.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dgutov/diff-hl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s")))) + (build-system emacs-build-system) + (home-page "https://github.com/dgutov/diff-hl") + (synopsis "Highlight uncommitted changes using VC") + (description + "Diff Hl mode highlights uncommitted changes on the side of the +window (using the fringe, by default), allows you to jump between the hunks +and revert them selectively.") + (license license:gpl3+))) (define-public emacs-diminish ;; XXX: Upstream did not tag last release. -- cgit 1.4.1 From 940f2d38dfcce08ef04b051971098619da3bc162 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Sun, 19 Feb 2023 17:03:23 +0100 Subject: gnu: emacs-magit: Update to 3.3.0-3.2c91c08. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.3.0-3.2c91c08. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 79ad285c95..32df22bd98 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1152,8 +1152,8 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (license license:gpl2+)))) (define-public emacs-magit - (let ((commit "c883fabe28a74d59d996cbef3f742874f3459bc0") - (revision "2")) + (let ((commit "2c91c080a8e2f35e3b036a2f6b8011fa897d23a1") + (revision "3")) (package (name "emacs-magit") (version (git-version "3.3.0" revision commit)) @@ -1165,7 +1165,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0cq2bgny5jac1n9h7hp0pkipil41sf079h2qh5rh7bj0085dc7wv")))) + (base32 "00ibnr76nfyf4fff3ga324d7dbqnsb4crlxgr94npiy8rsclaszp")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 284229d87a368111baa1b9ae63814a00414d9aa5 Mon Sep 17 00:00:00 2001 From: kiasoc5 via Guix-patches via Date: Sat, 18 Feb 2023 03:21:29 -0500 Subject: gnu: cwm: Update to 7.1. * gnu/packages/wm.scm (cwm): Update to 7.1. [arguments]: Remove trailing #t. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5c391f5e1b..5c3b6c5b05 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1400,14 +1400,14 @@ It is inspired by Xmonad and dwm. Its major features include: (define-public cwm (package (name "cwm") - (version "6.7") + (version "7.1") (source (origin (method url-fetch) (uri (string-append "https://leahneukirchen.org/releases/cwm-" version ".tar.gz")) (sha256 - (base32 "022zld29qawd8gl700g4m24qa89il3aks397zkhh66wvzssdblzx")))) + (base32 "145xjwam11194w2irsvs4z0xgn0jdijxfmx67gqd1n0j8g5wan2a")))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) @@ -1433,8 +1433,7 @@ It is inspired by Xmonad and dwm. Its major features include: TryExec=~@*~a/bin/cwm~@ Icon=~@ Type=Application~%" - output))) - #t)))))) + output))))))))) (inputs (list libxft libxrandr libxinerama)) (native-inputs -- cgit 1.4.1 From 46cdc0b5388346299d6b64a1189e149e7f861f49 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 20 Feb 2023 13:46:05 +0100 Subject: gnu: cwm: Improve package style. * gnu/packages/wm.scm (cwm)[arguments]: Use G-expressions. <#:phases>: Use MAKE-DESKTOP-ENTRY-FILE. [inputs, native-inputs]: Re-order alphabetically. [synopsis]: Use proper capitalization. --- gnu/packages/wm.scm | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5c3b6c5b05..0d3e27e7cc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1410,36 +1410,30 @@ It is inspired by Xmonad and dwm. Its major features include: (base32 "145xjwam11194w2irsvs4z0xgn0jdijxfmx67gqd1n0j8g5wan2a")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)) - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'build 'install-xsession - (lambda* (#:key outputs #:allow-other-keys) - ;; Add a .desktop file to xsessions. - (let* ((output (assoc-ref outputs "out")) - (xsessions (string-append output "/share/xsessions"))) - (mkdir-p xsessions) - (with-output-to-file - (string-append xsessions "/cwm.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=cwm~@ - Comment=OpenBSD Calm Window Manager fork~@ - Exec=~a/bin/cwm~@ - TryExec=~@*~a/bin/cwm~@ - Icon=~@ - Type=Application~%" - output))))))))) - (inputs - (list libxft libxrandr libxinerama)) + (list + #:tests? #f + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'install-xsession + (lambda _ + ;; Add a .desktop file to xsessions. + (let ((xsessions (string-append #$output "/share/xsessions"))) + (mkdir-p xsessions) + (make-desktop-entry-file + (string-append xsessions "/cwm.desktop") + #:name: cwm + #:exec (string-append #$output "/bin/cwm") + #:try-exec (string-append #$output "/bin/cwm") + #:comment '((#f "OpenBSD Calm Window Manager fork"))))))))) (native-inputs - (list pkg-config bison)) + (list bison pkg-config)) + (inputs + (list libxrandr libxft libxinerama)) (home-page "https://github.com/leahneukirchen/cwm") - (synopsis "OpenBSD fork of the calmwm window manager") + (synopsis "OpenBSD fork of the Calm Window Manager") (description "Cwm is a stacking window manager for X11. It is an OpenBSD project derived from the original Calm Window Manager.") (license license:isc))) -- cgit 1.4.1 From 06c5ab08218fe63956c1c114102582141fd7049f Mon Sep 17 00:00:00 2001 From: kiasoc5 via Guix-patches via Date: Sat, 18 Feb 2023 02:46:55 -0500 Subject: gnu: qsynth: Update to 0.9.9. * gnu/packages/audio.scm (qsynth): Update to 0.9.9. [inputs]: Remove QTBASE-5 and QTX11EXTRAS; add QTBASE, QTSVG, and QTWAYLAND. [native-inputs]: Remove QTTOOLS-5; add QTTOOLS. Signed-off-by: Nicolas Goaziou --- gnu/packages/audio.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 707a7b4aa1..124593c67b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4145,7 +4145,7 @@ interface.") (define-public qsynth (package (name "qsynth") - (version "0.5.7") + (version "0.9.9") (source (origin (method url-fetch) @@ -4155,14 +4155,14 @@ interface.") (string-append "mirror://sourceforge/qsynth/qsynth (attic)" "/qsynth-" version ".tar.gz"))) (sha256 - (base32 "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6")))) - (build-system gnu-build-system) + (base32 "1cjg25nva5ivahr0qqlvf6ybnpcx9jgrxbp4vgwkk64b4k9wnd4n")))) + (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no "check" phase (native-inputs - (list qttools-5 pkg-config)) + (list qttools pkg-config)) (inputs - (list fluidsynth qtbase-5 qtx11extras)) + (list fluidsynth qtbase qtsvg qtwayland)) (home-page "https://qsynth.sourceforge.io") (synopsis "Graphical user interface for FluidSynth") (description -- cgit 1.4.1 From 274c59c6bcef78948d2dd519a7c7888fd196667f Mon Sep 17 00:00:00 2001 From: Philippe SWARTVAGHER Date: Wed, 15 Feb 2023 17:19:51 +0100 Subject: gnu: python-pygraphviz: Update to 1.10. * gnu/packages/graphviz.scm (python-pygraphviz): Update to 1.10. Signed-off-by: Nicolas Goaziou --- gnu/packages/graphviz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 7c2cb1eae0..1691658576 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -213,7 +213,7 @@ visualization tool suite.") (define-public python-pygraphviz (package (name "python-pygraphviz") - (version "1.7") + (version "1.10") (source (origin (method git-fetch) @@ -223,7 +223,7 @@ visualization tool suite.") (file-name (string-append "pygraphviz-" version "-checkout")) (sha256 (base32 - "0jqc3dzy9n0hn3b99zq8jp53901zpjzvvi5ns5mbaxg8kdrb1lfx")))) + "1yrzjp5n86ynlj32p5dj1aj67md6bzkk8hac74j5y3mbl94m259g")))) (build-system python-build-system) (inputs (list graphviz)) -- cgit 1.4.1 From 5204f2edf45174673fe8fd912aad7cc50a5747c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 12 Feb 2023 23:49:56 +0000 Subject: gnu: python-construct: Update to 2.10.68. * gnu/packages/python-xyz.scm (python-construct): Update to 2.10.68. [source]: Use Git checkout over PyPI to enable tests. [arguments]<#:phases>: Enable tests with custom phase. [native-inputs]: Add PYTHON-PYTEST, PYTHON-PYTEST-BENCHMARK. [propagated-inputs]: Remove PYTHON-EXTRAS. Add PYTHON-CLOUDPICKLE, PYTHON-LZ4. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12a0c9f983..71a52a7ad8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -94,7 +94,7 @@ ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021, 2022 Morgan Smith -;;; Copyright © 2021, 2022 Sharlatan Hellseher +;;; Copyright © 2021-2023 Sharlatan Hellseher ;;; Copyright © 2021 Ellis Kenyő ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Xinglu Chen @@ -24456,19 +24456,33 @@ class in a @acronym{DRY, Don't Repeat Yourself} way.") (define-public python-construct (package (name "python-construct") - (version "2.10.56") + (version "2.10.68") (source (origin - (method url-fetch) - (uri (pypi-uri "construct" version)) + ;; There are no tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/construct/construct") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0q86jjzsvy835h3c8pjj4619vbp7ihfg8njmyw86ym4qrpni7flp")))) + (base32 "1b59kq8scxhn9afqgmksk45n53gawylqm8gw3k0vmljg274xi7vf")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ; No tests exist. + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v" "tests/"))))))) + (native-inputs + (list python-pytest python-pytest-benchmark)) (propagated-inputs - (list python-extras python-arrow python-numpy python-ruamel.yaml)) + (list python-arrow + python-cloudpickle + python-lz4 + python-numpy + python-ruamel.yaml)) (home-page "https://construct.readthedocs.io") (synopsis "Declarative and symmetrical parser and builder for binary data") (description -- cgit 1.4.1 From ed00a514e5a12912e8731f12c0bb710185f35655 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 12 Feb 2023 23:49:57 +0000 Subject: gnu: python-capablerobot-usbhub: Update to 0.5.0. * gnu/packages/libusb.scm (python-capablerobot-usbhub): Fix build and update to 0.5.0. [source]: Use Git checkout which allows to pass build the package. [build-system]: Use PYPROJECT-BUILD-SYSTEM. [arguments]{tests}: Disable them as not provided. [phases]use-poetry-core}: New phase. [phases]{install-udev-rules}: Remove trailing #T from lambda. [native-inputs]: Add PYTHON-POETRY-CORE. [propagated-inputs]: Replace PYTHON-PYYAML-7 and PYTHON-PYYAML-5 by PYTHON-CLICK and PYTHON-PYYAML. Signed-off-by: Nicolas Goaziou --- gnu/packages/libusb.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index d46f1f8cc2..468f7b1753 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Christopher Howard ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 Jacob Hrbek +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) @@ -51,6 +53,7 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -310,18 +313,28 @@ wrapper for accessing libusb-1.0.") (define-public python-capablerobot-usbhub (package (name "python-capablerobot-usbhub") - (version "0.2.7") + (version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "capablerobot_usbhub" version)) + ;; PyPI tarball fails to build. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1priic4iq2vn1rc711kzxwhxrwa508rkxrr193qdz2lw26kdhvix")))) - (build-system python-build-system) + (base32 "1nfd12612z9a9hby5dxg7lfqw5jcv3wcyqqagbg5izragni646mc")))) + (build-system pyproject-build-system) (arguments - `(#:phases + `(#:tests? #f ; No tests provided. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) (add-after 'install 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -329,10 +342,11 @@ wrapper for accessing libusb-1.0.") (copy-file "50-capablerobot-usbhub.rules" (string-append out "/lib/udev/rules.d/" - "50-capablerobot-usbhub.rules")) - #t)))))) + "50-capablerobot-usbhub.rules")))))))) + (native-inputs + (list python-poetry-core)) (propagated-inputs - (list python-click python-construct python-pyusb python-pyyaml)) + (list python-click-7 python-construct python-pyusb python-pyyaml-5)) (home-page "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") (synopsis -- cgit 1.4.1 From c7aa35f388328fc547e5393de0078a84028a382c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 11:22:23 +0100 Subject: gnu: fet: Update to 6.8.4. * gnu/packages/education.scm (fet): Update to 6.8.4. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c1b6c19508..cc1ef25a83 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -582,7 +582,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.8.3") + (version "6.8.4") (source (origin (method url-fetch) @@ -591,7 +591,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "1iqjdldarh8r92qq7c00m1gkdf53v8csmm7if3h4rhajz91rcnm2")))) + (base32 "0bwm6j0drxkrmx8zbr78a7xbbzb1i9365qv93fkwjg9v92b9clhr")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From c599d309c43fc71160af99ceade5fad16c913a11 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 19 Feb 2023 11:18:32 +0100 Subject: gnu: sshpass: Update to 1.10. * gnu/packages/ssh.scm (sshpass): Update to 1.10. --- gnu/packages/ssh.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 685b5b039a..22cf0e2d45 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari -;;; Copyright © 2016, 2021 Nicolas Goaziou +;;; Copyright © 2016, 2021, 2023 Nicolas Goaziou ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör @@ -695,14 +695,14 @@ manipulating key files.") (define-public sshpass (package (name "sshpass") - (version "1.09") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sshpass/sshpass/" version "/sshpass-" version ".tar.gz")) (sha256 - (base32 "1dwzqknpswa8vjlbwsx9rcq1j2a7px9h9i2anh09pzkz0mg6wx3i")))) + (base32 "1npfvxxqs77qg6l4s6cn8q3b98zwr9n8rb9vra2n3dfb0g10c4dd")))) (build-system gnu-build-system) (home-page "https://sourceforge.net/projects/sshpass/") (synopsis "Non-interactive password authentication with SSH") -- cgit 1.4.1 From c08fda0716aefe1b9bd45df024523fcdf7f7e941 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 8 Feb 2023 02:30:08 +0000 Subject: gnu: stellarium: Update to 1.2. * gnu/packages/astronomy.scm (stellarium): Update to 1.2. [arguments]{tests}: Disable tests, with further review of INDI package. [arguments]{configure-flags}: Explicitly disable Qt6 (prevent failing build) and ShowMySky (not packed yet). [phases]{set-offscreen-display}: Remove trail #T in lambda. [inputs]: Remove labels and add GPSD, INDI, LIBNOVA, OPENSSL, QTCHARTS, QTPOSITIONING, QTTRANSLATIONS, QTWEBENGINE-5, QXLSX. [native-inputs]: Remove labels and add DOXYGEN, GRAPHVIZ, MESA, PYTHON-WRAPPER. Signed-off-by: Nicolas Goaziou --- gnu/packages/astronomy.scm | 77 ++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2f08b656c0..5cee981671 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -44,6 +45,8 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gps) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) @@ -70,6 +73,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages textutils) #:use-module (gnu packages time) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages wxwidgets) @@ -835,45 +839,66 @@ deconvolution). Such post-processing is not performed by Stackistry.") (define-public stellarium (package (name "stellarium") - (version "0.21.1") + (version "1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Stellarium/stellarium" - "/releases/download/v" version - "/stellarium-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Stellarium/stellarium") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "049jlc8vx06pad5h2syrmf7f1l346yr5iraai0wkn8s8pk30j8q7")))) + (base32 "1655lz848k7m4vqs7n3vxjwn5n4pkykwl6x7nbanqcqzlixm5xnk")))) (build-system cmake-build-system) + ;; TODO: Complete documentation build and split into dedicated outputs. + (arguments + (list + ;; FIXME: Tests keep failing on 100% when preparing test-suit for INDI. + #:tests? #f + #:test-target "test" + #:configure-flags + #~(list "-DENABLE_GPS=1" + ;; TODO: Enable when all of the dependencies are availalbe for Qt6. + "-DENABLE_QT6=0" + ;; TODO: Pack missing in Guix https://10110111.github.io/CalcMySky/ + "-DENABLE_SHOWMYSKY=0" + "-DENABLE_TESTING=0" + (string-append "-DCMAKE_CXX_FLAGS=-isystem " + #$(this-package-input "qtserialport") "/include/qt5")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-offscreen-display + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" "/tmp")))))) (inputs - (list qtbase-5 + (list gpsd + indi + libnova + openssl + qtbase-5 + qtcharts qtlocation qtmultimedia-5 + qtpositioning qtscript qtserialport + qttranslations + qtwebengine-5 + qxlsx zlib)) (native-inputs - `(("gettext" ,gettext-minimal) ; xgettext is used at compile time - ("perl" ,perl) ; for pod2man - ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time - ("qttools-5" ,qttools-5))) - (arguments - `(#:test-target "test" - #:configure-flags (list "-DENABLE_TESTING=1" - (string-append - "-DCMAKE_CXX_FLAGS=-isystem " - (assoc-ref %build-inputs "qtserialport") - "/include/qt5")) - #:phases (modify-phases %standard-phases - (add-before 'check 'set-offscreen-display - (lambda _ - ;; Make Qt render "offscreen", required for tests. - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "HOME" "/tmp") - #t))))) + (list doxygen + gettext-minimal + graphviz + mesa + perl + python-wrapper + qttools-5)) (home-page "https://stellarium.org/") (synopsis "3D sky viewer") - (description "Stellarium is a planetarium. It shows a realistic sky in + (description + "Stellarium is a planetarium. It shows a realistic sky in 3D, just like what you see with the naked eye, binoculars, or a telescope. It can be used to control telescopes over a serial port for tracking celestial objects.") -- cgit 1.4.1 From e2435b60f11265ec6a2fffccda3b7a65393535cc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 8 Feb 2023 02:30:06 +0000 Subject: gnu: Add qxlsx. * gnu/packages/qt.scm (qxlsx): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/qt.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b32a78085d..76e9e519c7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Yash Tiwari +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1117,6 +1118,44 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (description "The QtX11Extras module includes the library to access X11 from within Qt 5."))) +(define-public qxlsx + (package + (name "qxlsx") + (version "1.4.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/QtExcel/QXlsx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h95h96vz47cnfp62j7bx6ih725gbv005hm0cfqanfvqd5xd9qsg")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "../source/QXlsx" + "-DCMAKE_BUILD_TYPE=Release" + (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../source/TestExcel" + (invoke "qmake") + (invoke "make" "-j" (number->string (parallel-job-count))) + (invoke "./TestExcel")))))))) + (inputs + (list qtbase-5)) + (home-page "https://qtexcel.github.io/QXlsx/") + (synopsis "C++ library to read/write Excel XLSX files using Qt") + (description + "QXlsx is a successor of QtXlsx and providies a functionality to work with Excel +XLSX document format.") + (license license:expat))) + (define-public qtxmlpatterns (package (inherit qtsvg-5) (name "qtxmlpatterns") -- cgit 1.4.1 From 8320c0c6b6486f1991aa99246460ec955add65c7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Feb 2023 09:16:00 -0500 Subject: gnu: icedove: Install the icons of the 'comm' component. This is a follow-up commit to 47f0e022dc ("gnu: icedove: Install icons.") which installed the icons of the 'browser' component (which are those used by IceCat). * gnu/packages/gnuzilla.scm (icedove-minimal) [phases] {install-icon}: Install the icons of the 'comm' component, which is Icedove. --- gnu/packages/gnuzilla.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6a9d3d18ad..eb6395cb56 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1459,8 +1459,10 @@ ca495991b7852b855")) Exec=~@*~a/bin/icedove -compose~%" #$output)))))) (add-after 'install-desktop-file 'install-icons + ;; TODO: Use actual Icedove branding icons (currently the stock + ;; Thunderbird icon is used). (lambda _ - (with-directory-excursion "browser/branding/official" + (with-directory-excursion "comm/mail/branding/thunderbird" (for-each (lambda (file) (let* ((size (string-filter char-numeric? file)) @@ -1469,8 +1471,7 @@ ca495991b7852b855")) (mkdir-p icons) (copy-file file (string-append icons "/icedove.png")))) '("default16.png" "default22.png" "default24.png" - "default32.png" "default48.png" "content/icon64.png" - "mozicon128.png" "default256.png"))))) + "default32.png" "default48.png" "default256.png"))))) (add-after 'install 'wrap-program (lambda* (#:key inputs #:allow-other-keys) (let* ((lib (string-append #$output "/lib")) -- cgit 1.4.1 From c81d2d448cbd051800867fe3f4b82ef3f4380ebf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Feb 2023 12:20:36 -0500 Subject: gnu: icedove: Truly prevent it from generating a new profile on every upgrade. This fixes a regression introduced in 52cb5cf5b8 ("gnu: icedove: Update to 91.3.2") where the single quotes moved to double quotes, but the substitute* pattern was not correctly adapted. Fixes . * gnu/packages/gnuzilla.scm (icedove-minimal) [phases] {fix-profile-setting}: Include double qutoes in substitute* pattern targeting the MOZ_DEDICATED_PROFILES configuration option. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index eb6395cb56..5fb9afa325 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1335,8 +1335,8 @@ ca495991b7852b855")) (add-after 'patch-source-shebangs 'fix-profile-setting (lambda _ (substitute* "comm/mail/moz.configure" - (("MOZ_DEDICATED_PROFILES, True") - "MOZ_DEDICATED_PROFILES, False")))) + (("\"MOZ_DEDICATED_PROFILES\", True") + "\"MOZ_DEDICATED_PROFILES\", False")))) (add-after 'build 'neutralize-store-references (lambda _ ;; Mangle the store references to compilers & other build tools in -- cgit 1.4.1 From 038981e1287fc97d3a5f19a2d9824e55247c228e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Feb 2023 17:00:11 -0500 Subject: gnu: pjproject-jami: Update to 2.12-2.20e00fc. This resolves a crash because of pjproject leaving too many sockets opened ("Creating pipes for GWakeup: Too many open files"). * gnu/packages/jami.scm (pjproject-jami): Update to 2.12-2.20e00fc. --- gnu/packages/jami.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 83e7157f35..acf57c2772 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -107,8 +107,8 @@ patches)))) (define-public pjproject-jami - (let ((commit "513a3f14c44b2c2652f9219ec20dea64b236b713") - (revision "1")) + (let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297") + (revision "2")) (package (inherit pjproject) (name "pjproject-jami") @@ -127,7 +127,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1vzfpiwhd96a9ibk398z922a60j18xd7mblsmi6355r7ccj2aw7p")))) + "1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:phases phases '%standard-phases) -- cgit 1.4.1 From 73b5c955ae46af2548625fe31afe60193fb83e2a Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Tue, 21 Feb 2023 02:00:18 +0100 Subject: gnu: python-clingo: Fix invalid G-expression input. * gnu/packages/maths.scm (python-clingo)[arguments]: Add 'imported-modules' and 'modules' in order to access to 'python:site-packages'. [version]: Explicitly reuse from the package 'clingo'. --- gnu/packages/maths.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1e40be8722..d32a6354ab 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2703,12 +2703,20 @@ satisfiability checking (SAT).") (package (inherit clingo) (name "python-clingo") + (version (package-version clingo)) ; for #$version in arguments (arguments (substitute-keyword-arguments (package-arguments clingo) ((#:configure-flags flags #~'()) #~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip" "-DCLINGO_USE_LIB=yes" #$flags)) + ((#:imported-modules _ '()) + `(,@%cmake-build-system-modules + (guix build python-build-system))) + ((#:modules _ '()) + '((guix build cmake-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils))) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'fix-failing-tests -- cgit 1.4.1 From 9577d09c59bcc2edf381d47e7789c681755f30b2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 21 Feb 2023 09:25:05 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-39.8c2f97e. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-39.8c2f97e. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 98db004482..e5fb7abfc1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4762,8 +4762,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") license:freebsd-doc)))) ; documentation (define-public guix-data-service - (let ((commit "6be113f99d52cc284ecd0ed07fc88df5ea7bf718") - (revision "38")) + (let ((commit "8c2f97eef82412a4309273e22b6edeaf53dc2d0e") + (revision "39")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4775,7 +4775,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0y2dp83v0180vh33v56rbcqkl2qx8n8by3z2j6fx9ghv7dx5skbp")))) + "12k930vkg07i9xysli3fxbgn3hbqy2l5s9rybm7ayvbcmbdqmgcn")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From fbe04ea4f7fa784828ad5e60705efff08fbbabc7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 21 Feb 2023 13:19:06 +0000 Subject: gnu: guix-build-coordinator: Update to 0-71.c29a46e. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-71.c29a46e. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b492e37541..42d910e5d5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1358,8 +1358,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "6b1aa0654bf576f0adbb6adc68c5f7e4e0bae874") - (revision "70")) + (let ((commit "c29a46e8d298d3a1f16b2d4f75fa96759741afb8") + (revision "71")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1370,7 +1370,7 @@ environments.") (commit commit))) (sha256 (base32 - "1dnwjfax5mdmzd9xcwgsz0i3x4pvwswnz7a264qg684vdb2h4iz0")) + "1wzgl2naymps9k51ggsw8099da81b0skqjamj9r7jkcvg7i46avm")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From e42d1ae6124a934a0926e79e5182e6c420016d1d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 21 Feb 2023 13:20:47 +0000 Subject: gnu: nar-herder: Update to 0-17.8b888de. * gnu/packages/package-management.scm (nar-herder): Update to 0-17.8b888de. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 42d910e5d5..618bb70564 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1667,8 +1667,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "f62a2b3b48ecebf01b0cbd8ddd11e1a45cb27804") - (revision "16")) + (let ((commit "8b888de4cff44b42b8215afac5dcdadba9b7394d") + (revision "17")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1679,7 +1679,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "1j6cpvnq48kywx90y8r24pwhz3bmyzjiwyilbqzz36z2yhjxpq7z")) + "19j8dbn9c25x8lj3sa7b0b9v8lxxlkhvb4qpmwc4kkizpkwrqp2a")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From e1e74336a2b5f39653520b731bdc3696390a1f18 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 18 Feb 2023 01:35:42 +0000 Subject: gnu: python-jupytext: Update to 1.14.4. Fixes test failure in test_multiple_pairing in 1.14.1. * gnu/packages/python-xyz.scm (python-jupytext): Update to 1.14.4. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 71a52a7ad8..1b120399a7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -319,7 +319,7 @@ design}.") (define-public python-jupytext (package (name "python-jupytext") - (version "1.14.1") + (version "1.14.4") (source (origin (method git-fetch) @@ -328,7 +328,7 @@ design}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gqpvphrp2ja9ggadx0rrk0sqbpz6kqqg62qqmw4k17469lphc8c")))) + (base32 "19d443vx597zzxna09qpync9iic3mris80bwm3kd8xaxaq0zq9w4")))) (build-system python-build-system) (arguments (list -- cgit 1.4.1 From 1461bf96e3bd9492ba3af1c98b6b4bce383af20a Mon Sep 17 00:00:00 2001 From: LuHui Date: Sat, 18 Feb 2023 20:32:33 +0800 Subject: gnu: xfel: Update to 1.2.9. * gnu/packages/admin.scm (xfel): Update to 1.2.9. [arguments]: Remove udevadm command. [synopsis,description]: Change D1 computers/devices to just devices as the capabilities are more general. Signed-off-by: Christopher Baines --- gnu/packages/admin.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b79621e279..d4cc8ca6ca 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2022, 2023 Matthew James Kraai ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Juliana Sims +;;; Copyright © 2023 Lu Hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -3740,7 +3741,7 @@ in order to be able to find it. (define-public xfel (package (name "xfel") - (version "1.2.4") + (version "1.2.9") (source (origin (method git-fetch) @@ -3748,7 +3749,7 @@ in order to be able to find it. (url "https://github.com/xboot/xfel.git") (commit (string-append "v" version)))) (sha256 - (base32 "0r4j63vh6279fj1yh71h08d1av3nc0majlad5yh6admsxiig101m")) + (base32 "0gs37w5zjfmyadm49hdalq6vr6gidc683agz3shncgj93x2hxx02")) (file-name (git-file-name name version)))) (native-inputs (list pkg-config)) @@ -3766,12 +3767,14 @@ in order to be able to find it. (("/usr/local") out) (("/usr") out) (("/etc/udev/rules.d") - (string-append out "/lib/udev/rules.d")))))) + (string-append out "/lib/udev/rules.d")) + (("udevadm control --reload") ; next version will remove this + ""))))) (delete 'configure)))) (home-page "https://github.com/xboot/xfel") - (synopsis "Remote debugging tool for Allwinner D1 computers") - (description "This package contains a debugging tool for Allwinner D1 -devices (connects via USB OTG).") + (synopsis "Remote debugging tool for Allwinner devices") + (description "This package contains a debugging tool for Allwinner devices +(connects via USB OTG).") (license license:expat))) (define-public sedsed -- cgit 1.4.1 From 4ab75f7c4857b20bba5139dcf571283a27999f2c Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Mon, 20 Feb 2023 00:16:09 +0000 Subject: gnu: emacs-suneater-theme: Update to 2.2.0. * gnu/packages/emacs-xyz.scm (emacs-suneater-theme): Update to 2.2.0. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32df22bd98..3b12642bc9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1594,7 +1594,7 @@ Apprentice and Sourcerer.") (define-public emacs-suneater-theme (package (name "emacs-suneater-theme") - (version "2.0.0") + (version "2.2.0") (source (origin (method git-fetch) @@ -1603,7 +1603,7 @@ Apprentice and Sourcerer.") (commit version))) (sha256 (base32 - "0nlam8f8ly86y7p2dn10y9ixnm7bhmigsx7si4cjynh6aiyczyds")) + "1g0mf3m1ja70zdhyw1li4m765wvsb0b6hqd1ma42cn5mccz8yxh3")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~plattfot/suneater-theme") -- cgit 1.4.1 From b3844dc99bc830533aa908b7115172a883e856fa Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Wed, 15 Feb 2023 16:59:37 -0500 Subject: gnu: Add guile-proba. * gnu/packages/check.scm (guile-proba): New variable. Signed-off-by: Jelle Licht --- gnu/packages/check.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3d14cb7585..f6553a27bf 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 David Elsing ;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Luis Felipe López Acevedo ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +71,8 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages golang) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -78,6 +81,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) #:use-module (guix utils) @@ -90,6 +94,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system guile) #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -3473,3 +3478,79 @@ directories and files.") tables by saving expected data in a data directory (courtesy of pytest-datadir) that can be used to verify that future runs produce the same data.") (license license:expat))) + +(define-public guile-proba + (package + (name "guile-proba") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/luis-felipe/guile-proba") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mjnrbb6gv5f95i1ihn75yh7ya445pcnj13cy34x2v58h9n2r80s")))) + (build-system guile-build-system) + (inputs (list bash-minimal guile-3.0)) + (native-inputs (list texinfo)) + (propagated-inputs (list guile-config guile-lib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'set-paths 'add-output-to-guile-load-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guile-version (target-guile-effective-version)) + (scm-path (string-append out + "/share/guile/site/" + guile-version)) + (go-path (string-append out + "/lib/guile/" + guile-version + "/site-ccache"))) + (setenv "GUILE_LOAD_PATH" + (string-append scm-path ":" + (getenv "GUILE_LOAD_PATH"))) + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append + go-path ":" + (getenv "GUILE_LOAD_COMPILED_PATH")))))) + (add-after 'build 'build-manual + (lambda _ + (invoke "makeinfo" "manual/main.texi"))) + (add-after 'build 'check + (lambda _ + (invoke "guile" "proba.scm" "run" "tests"))) + (add-after 'install 'install-wrapped-script + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin-dir (string-append out "/bin")) + (script (string-append bin-dir "/proba"))) + (mkdir-p bin-dir) + (copy-file "proba.scm" script) + (chmod script #o555) + (wrap-program script + `("GUILE_LOAD_PATH" = (,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" = + (,(getenv "GUILE_LOAD_COMPILED_PATH"))))))) + (add-after 'install 'install-manual + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info-dir (string-append out "/share/info"))) + (mkdir-p info-dir) + (install-file "guile-proba" info-dir))))) + #:scheme-file-regexp + #~(begin + (use-modules (ice-9 regex)) + (lambda (file stat) (string-match "/proba/.*\\.scm$" file))))) + (home-page "https://luis-felipe.gitlab.io/guile-proba/") + (synopsis "Testing tools for GNU Guile projects with SRFI 64 test suites") + (description + "This software is a set of testing tools for GNU Guile projects +with SRFI 64-based test suites. It comes with a command-line interface +to run test collections, and a library that includes a test runner and +helpers for writing tests.") + (license license:public-domain))) -- cgit 1.4.1 From fbbbc2088ce933d83f5b0be75308fdcb6b40fa57 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Feb 2023 22:47:49 -0500 Subject: gnu: opendht: Update to 2.4.12. * gnu/packages/networking.scm (opendht): Update to 2.4.12. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 44e2de5f08..b5c0758dd5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3732,7 +3732,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.4.10") + (version "2.4.12") (source (origin (method git-fetch) (uri (git-reference @@ -3741,7 +3741,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "1kcc9vmi4swvahq2gikflgba9xfmix80dr9wa3v6xcj1ba2fjd6s")))) + "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From d9368572abd3683bed4263eb5e149bb404baee59 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 20 Feb 2023 20:20:22 +0800 Subject: qtwebengine-5: Enable pulseaudio. Previously it will dlopen libpulse, then fallback to alsa. See also . * gnu/packages/qt.scm (qtwebengine-5)[arguments]: Set link_pulseaudio with gn_args. --- gnu/packages/qt.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 76e9e519c7..01327f6ccf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2708,7 +2708,8 @@ using the Enchant spell-checking library.") "src/buildtools/config/linux.pri" (lambda (in out) (display (get-string-all in) out) - (display "\ngn_args += use_system_openh264=true\n" out))) + (display "\ngn_args += use_system_openh264=true\n" out) + (display "\ngn_args += link_pulseaudio = true\n" out))) ;; Qtwebengine is not installed into the same prefix as ;; qtbase. Some qtbase QTLibraryInfo constants will not ;; work. Replace with the full path to the qtwebengine-5 -- cgit 1.4.1 From 0574aa81543c7053ce6d54a00dd0d0ae83490ad0 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 22 Feb 2023 01:53:25 +0100 Subject: gnu: cl-jzon: Update to 1.0.0. * gnu/packages/lisp-xyz.scm (sbcl-jzon): Update to 1.0.0. [source]: Use version release instead of commit. [inputs]: Add sbcl-float-features and sbcl-trivial-gray-streams. [description]: Fix typo. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 82 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bb5855c7b7..dbe87bba1b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -24096,48 +24096,46 @@ implementation for Common Lisp.") (sbcl-package->ecl-package sbcl-websocket-driver)) (define-public sbcl-jzon - (let ((commit "5364590f5d2e6d6f1932d1ea3acba1ee2a82f31e") - (revision "0")) - (package - (name "sbcl-jzon") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Zulu-Inuoe/jzon") - (commit commit))) - (file-name (git-file-name "cl-jzon" version)) - (sha256 - (base32 "1048f6prz2lp859nxwcgghn6n38pc2pb580azzxpdhfcdi0034mj")))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:asd-systems '("com.inuoe.jzon") - #:asd-test-systems '("com.inuoe.jzon-tests") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-test-asd - (lambda _ - (substitute* "test/com.inuoe.jzon-tests.asd" - ((":depends-on") - (string-append - ":perform (test-op (op c) (symbol-call :fiveam :run!" - " (find-symbol \"JZON\" :com.inuoe.jzon-tests)))" - "\n" - " :depends-on")))))))) - (native-inputs - (list sbcl-alexandria - sbcl-fiveam - sbcl-flexi-streams)) - (inputs - (list sbcl-closer-mop - sbcl-flexi-streams)) - (home-page "https://github.com/Zulu-Inuoe/jzon/") - (synopsis "Correct and safe JSON parser") - (description - "@code{jzon} is a correct and safe JSON RFC 8259 parser for Common -Lisp.") - (license license:expat)))) + (package + (name "sbcl-jzon") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Zulu-Inuoe/jzon") + (commit (string-append "v" version)))) + (file-name (git-file-name "cl-jzon" version)) + (sha256 + (base32 "03k0czc58wlnxavkmr7gbrza6zq40ih4da8yjbxg9ba8m0bzzdw4")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-systems '("com.inuoe.jzon") + #:asd-test-systems '("com.inuoe.jzon-tests") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test-asd + (lambda _ + (substitute* "test/com.inuoe.jzon-tests.asd" + ((":depends-on") + (string-append + ":perform (test-op (op c) (symbol-call :fiveam :run!" + " (find-symbol \"JZON\" :com.inuoe.jzon-tests)))" + "\n" + " :depends-on")))))))) + (native-inputs + (list sbcl-alexandria + sbcl-fiveam)) + (inputs + (list sbcl-closer-mop + sbcl-flexi-streams + sbcl-float-features + sbcl-trivial-gray-streams)) + (home-page "https://github.com/Zulu-Inuoe/jzon/") + (synopsis "Correct and safe JSON parser") + (description + "@code{jzon} is a correct and safe JSON RFC 8259 parser for Common Lisp.") + (license license:expat))) (define-public cl-jzon (sbcl-package->cl-source-package sbcl-jzon)) -- cgit 1.4.1 From 6d53351a6d13039eb076e584d13225e0158c5a08 Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 20 Feb 2023 19:53:03 +0800 Subject: gnu: gnunet: Update to 0.19.3. * gnu/packages/gnunet.scm (gnunet): Update to 0.19.3. [source]: Add snippet. [inputs]: Replace gnurl by curl. [native-inputs]: Add python-sphinx and python-sphinx-rtd-theme. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/gnunet.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index c98ceefad7..902cd42a31 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2023 Adam Faiz ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages text-editors) #:use-module (gnu packages tls) @@ -258,7 +260,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.16.3") + (version "0.19.3") (source (origin (method url-fetch) @@ -266,12 +268,19 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "12n33r9nnkl5xwx8pwf571l2zvnvfllc8vm6mamrlyjk2cphaf9j")))) + "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; This is fixed in the upstream repository but the fix + ;; has not been released. + (substitute* "src/gns/test_proxy.sh" + (("test_gnunet_proxy.conf") "test_gns_proxy.conf")))))) (build-system gnu-build-system) (inputs (list bluez glpk - gnurl + curl gnutls/dane gstreamer jansson @@ -291,7 +300,13 @@ supports HTTP, HTTPS and GnuTLS.") zbar zlib)) (native-inputs - (list curl openssl pkg-config python xxd + (list curl + openssl + pkg-config + python + python-sphinx + python-sphinx-rtd-theme + xxd (@ (gnu packages base) which))) (arguments '(#:parallel-tests? #f ; Parallel tests aren't supported. -- cgit 1.4.1 From 5ef168dfb7ea4217b5637d0cdd2ff7627fd3d74f Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 20 Feb 2023 21:49:05 +0800 Subject: gnu: gnunet-gtk: Update to 0.19.0. * gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.19.0. [inputs]: Add libsodium. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/gnunet.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 902cd42a31..1fe8e95086 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -437,14 +437,14 @@ The following services are supported: (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") - (version "0.13.1") + (version "0.19.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 - "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j")))) + "0z2731l69vnfsa0cdsw8wh8g1d08wz15y5n0a58qjpf7baric01k")))) (arguments `(#:configure-flags (list "--with-libunique" @@ -458,6 +458,7 @@ The following services are supported: ("gtk+" ,gtk+) ("libextractor" ,libextractor) ("libgcrypt" ,libgcrypt) + ("libsodium" ,libsodium) ("libunique" ,libunique) ("qrencode" ,qrencode))) (native-inputs -- cgit 1.4.1 From 454c9731973d15a22967cfd815134ee5d251c053 Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 20 Feb 2023 21:50:30 +0800 Subject: gnu: gnunet-gtk: Use new style inputs and gexps. * gnu/packages/gnunet.scm (gnunet-gtk)[arguments]: Use new style and gexps. [inputs]: Use new style. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/gnunet.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1fe8e95086..3ed18fbdb5 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -446,21 +446,21 @@ The following services are supported: (base32 "0z2731l69vnfsa0cdsw8wh8g1d08wz15y5n0a58qjpf7baric01k")))) (arguments - `(#:configure-flags - (list "--with-libunique" - "--with-qrencode" - (string-append "--with-gnunet=" - (assoc-ref %build-inputs "gnunet"))))) + (list #:configure-flags + #~(list "--with-libunique" + "--with-qrencode" + (string-append "--with-gnunet=" + #$(this-package-input "gnunet"))))) (inputs - `(("glade3" ,glade3) - ("gnunet" ,gnunet) - ("gnutls" ,gnutls/dane) - ("gtk+" ,gtk+) - ("libextractor" ,libextractor) - ("libgcrypt" ,libgcrypt) - ("libsodium" ,libsodium) - ("libunique" ,libunique) - ("qrencode" ,qrencode))) + (list glade3 + gnunet + gnutls/dane + gtk+ + libextractor + libgcrypt + libsodium + libunique + qrencode)) (native-inputs (list pkg-config libglade)) (synopsis "Graphical front-end tools for GNUnet") -- cgit 1.4.1 From 9e47a50de840b17b67d074fcc08bbdba10644ec3 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Wed, 22 Feb 2023 14:44:27 -0500 Subject: gnu: kicad: Fix native-search-paths. * gnu/packages/engineering.scm (kicad)[native-search-paths]: Update environment variables' names for kicad-7. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bf741245bf..36c73e3b5b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1000,16 +1000,16 @@ Emacs).") (variable "KICAD") ;to find kicad-doc (files '(""))) (search-path-specification - (variable "KICAD6_TEMPLATE_DIR") + (variable "KICAD7_TEMPLATE_DIR") (files '("share/kicad/template"))) (search-path-specification - (variable "KICAD6_SYMBOL_DIR") + (variable "KICAD7_SYMBOL_DIR") (files '("share/kicad/symbols"))) (search-path-specification - (variable "KICAD6_FOOTPRINT_DIR") + (variable "KICAD7_FOOTPRINT_DIR") (files '("share/kicad/footprints"))) (search-path-specification - (variable "KICAD6_3DMODEL_DIR") + (variable "KICAD7_3DMODEL_DIR") (files '("share/kicad/3dmodels"))))) (native-inputs (list boost desktop-file-utils -- cgit 1.4.1 From efa091f9f4e77068353dff24f0ccd2d0613c3f48 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 18 Feb 2023 17:32:26 +0100 Subject: gnu: josm: Update to 18646. * gnu/packages/geo.scm (josm): Update to 18646. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ff0dc0b6b0..044606936b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1760,7 +1760,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "18583") + (version "18646") (source (origin (method svn-fetch) (uri (svn-reference @@ -1769,7 +1769,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "01ghh9kl984lr8f70jsks31p6a4cqpxqjpmbc4x6mzbmvy87dfvy")) + "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From 7557d8da98578456ab452a93eb67186bdc6a0b4d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:16:46 -0500 Subject: gnu: linux-libre 6.1: Update to 6.1.13. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.13. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9917f5d135..7358a77d0c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.12") +(define-public linux-libre-6.1-version "6.1.13") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -491,7 +491,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1spdl3i69qwn7cywzs6kql8nlisdnmnwk9za7v4xq1092xsscynl"))) + (hash (base32 "0rvss7g77kp1hldhwrpfc7ck50rd0cjfcxj1bshps1xhyhci7128"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From fa55547bea6f88d92bbb3304ae1b21c927316419 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:17:05 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.95. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.95. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7358a77d0c..42e1dec5aa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.94") +(define-public linux-libre-5.15-version "5.15.95") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0wjsqvhp0jnisypb8yw6dncyp5k7zxbhjivh7jqivpsdwvdp14ns"))) + (hash (base32 "06s4aqkk26fph8hm15m7cssjrwa5y7cqy9y2znfnf0w8sbqd2wga"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 01a6076475bc4ae044c3d385662153343bb232b2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:17:28 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.169. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.169. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 42e1dec5aa..7c8f08fdd4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.168") +(define-public linux-libre-5.10-version "5.10.169") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "171mmgkjdsn6gx6z8kr5d80aygn4jjf8jc9zfh7m2c4dpab2azdn"))) + (hash (base32 "1kxgxdbgymdhf7w416qxv948py0mq8qlhz5ag962322ynmp4yxfr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From aa9ab09569ad9a2a5672095ea88207c6742ea2ed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:17:45 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.232. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.232. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7c8f08fdd4..c2d6c4d967 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -529,7 +529,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.231") +(define-public linux-libre-5.4-version "5.4.232") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -539,7 +539,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "19yydaws3vfiz9qilg665q3lysf1hy9pzx0414dis01ikyd27qr2"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d"))) + (hash (base32 "14qf8ddyhcs1ga1zqj4q2si6nc48sfc67nn9nigsnbcbg5g6lrdh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From d6e718a66f95b690f12624706d544538b5513ce1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:17:58 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.273. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.273. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c2d6c4d967..14f1731dc3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -544,7 +544,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.272") +(define-public linux-libre-4.19-version "4.19.273") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -554,7 +554,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8"))) + (hash (base32 "0wr7sprmqkdr6d44cj3rvaynyvrmyn1rax9wjqa7sk36yhvz47ij"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 31735e0ccfbc61905eb8558c14747bfcaea9b50f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 22 Feb 2023 18:18:11 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.306. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.306. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 14f1731dc3..b26eedfb1b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -559,7 +559,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.305") +(define-public linux-libre-4.14-version "4.14.306") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -569,7 +569,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3"))) + (hash (base32 "17phif2kazp5wykjv7vphjzv8bcanvpv5qq4v3df5nq9gbpypfsq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From deb902ec2fe08e9268dce2dbc2b4dd7497d4285e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 23 Feb 2023 11:08:48 +0100 Subject: gnu: emacs-posframe: Update to 1.4.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 1.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3b12642bc9..650af5df7c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17029,14 +17029,14 @@ the center of the screen and not at the bottom.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "1.3.3") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b")))) + (base32 "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From f6ff45f21f28b617aee6194ae9b774e3d5e602b5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 23 Feb 2023 11:08:58 +0100 Subject: gnu: emacs-xref: Update to 1.6.2. * gnu/packages/emacs-xyz.scm (emacs-xref): Update to 1.6.2. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 650af5df7c..4ca005b267 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34291,14 +34291,14 @@ work on alists, hash-table and arrays. All functions are prefixed with (define-public emacs-xref (package (name "emacs-xref") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xref-" version ".tar")) (sha256 - (base32 "0z9kpbnrdh9y9qlj2fa64v660biakvw6x3z9klqa47qcx8gbyqp6")))) + (base32 "16vzjl2dv5nmb40xfw7mfrk8i64fac3cy4sf2d2hy832rwlg15q0")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") @@ -35830,7 +35830,7 @@ across sessions.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.7.0") + (version "0.7.2") (source (origin (method url-fetch) (uri (string-append @@ -35838,7 +35838,7 @@ across sessions.") ".tar")) (sha256 (base32 - "19ic4yjm9ccnvrhccfzhn4p3brk760hf8aw6qv53gf6qlj3mcyag")))) + "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (home-page "https://github.com/tumashu/vertico-posframe") -- cgit 1.4.1 From 83108a60e77fc97962e98f7db9a78ab85846c879 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 23 Feb 2023 11:10:42 +0100 Subject: gnu: emacs-modus-themes: Update to 4.1.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 4.1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4ca005b267..3fe43fe2e2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31165,7 +31165,7 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "4.0.2") + (version "4.1.0") (source (origin (method git-fetch) @@ -31174,7 +31174,7 @@ Emacs that integrate with major modes like Org-mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f")))) + (base32 "1rfnn7c6qv3qmzpksdzy7623qijbldnmr7hl9ka2kwnhdarsigkk")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From d53e46cabfb176950162b36f7334bf36aa142b36 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:04:58 -0500 Subject: gnu: Add texlive-catchfile. * gnu/packages/tex.scm (texlive-catchfile): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index dafed9d3c3..efccba17cc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5304,6 +5304,26 @@ capabilities of longtable and tabularx; an environment for including plain TeX in LaTeX documents; a jiffy to create slashed characters for physicists.") (license license:lppl))) +(define-public texlive-catchfile + (let ((template (simple-texlive-package + "texlive-catchfile" + (list "/doc/latex/catchfile/" + "/source/latex/catchfile/" + "/tex/generic/catchfile/") + (base32 + "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/catchfile"))) + (home-page "https://ctan.org/macros/latex/contrib/catchfile") + (synopsis "Catch an external file into a macro") + (description + "Catchfile catches the contents of a file and puts it in a macro.") + (license license:lppl1.3+)))) + (define-public texlive-doi (package (inherit (simple-texlive-package -- cgit 1.4.1 From fafa3653fd41f8bcbc9d7805d6b5fd4fe729c3ee Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:04:59 -0500 Subject: gnu: texlive-latex-ifplatform: Add needed propagated-inputs. * gnu/packages/tex.scm (texlive-latex-ifplatform)[propagated-inputs]: Add texlive-catchfile. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index efccba17cc..2fea0e9697 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4957,6 +4957,7 @@ corresponding italics: light, regular, medium, bold, ...") (base32 "157pplavvm2z97b3jl4x41w11k6q9wgy074mfg0dwmsx5lm328jy")))) (build-system texlive-build-system) + (propagated-inputs (list texlive-catchfile)) (arguments '(#:tex-directory "latex/ifplatform")) (home-page "https://www.ctan.org/pkg/ifplatform") (synopsis "Conditionals to test which platform is being used") -- cgit 1.4.1 From 1bcf02465c8ea6dbd6efbb7b6399fdfd348d0f7a Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:05:00 -0500 Subject: gnu: texlive-mdframed: Add needed propagated-inputs. * gnu/packages/tex.scm (texlive-mdframed)[propagated-inputs]: Add texlive-latex-needspace, and texlive-zref. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2fea0e9697..5d82f98f35 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11518,6 +11518,8 @@ Polish of standard ``LaTeX names''.") "tex/latex/mdframed/") (base32 "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8") #:trivial? #t)) + (propagated-inputs (list texlive-latex-needspace + texlive-zref)) (home-page "https://ctan.org/pkg/mdframed") (synopsis "Framed environments that can split at page boundaries") (description -- cgit 1.4.1 From 7a01586afe9b65acc0a298b699a66fb187dd7b4f Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:05:01 -0500 Subject: gnu: texlive-latex-fancyvrb: Add needed propagated-inputs. * gnu/packages/tex.scm (texlive-latex-fancyvrb)[propagated-inputs]: Add TEXLIVE-LATEX-UPQUOTE. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5d82f98f35..bf4a50973b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3174,6 +3174,7 @@ users, via its Plain TeX version.)") (base32 "0pdilgpw4zc0ipp4z9kdi61nymifyjy2mfpk74xk2cw9vhynkk3w") #:trivial? #t)) + (propagated-inputs (list texlive-latex-upquote)) (home-page "https://www.ctan.org/pkg/fancyvrb") (synopsis "Sophisticated verbatim text") (description -- cgit 1.4.1 From 08e46c300195cdf7744b5382227fee181882acf1 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:05:02 -0500 Subject: gnu: Add texlive-fvextra. * gnu/packages/tex.scm (texlive-fvextra): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bf4a50973b..6aef6905a6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11173,6 +11173,28 @@ span the full width of a page; it improves upon floatfig, and allows tables and figures to be set left/right or alternating on even/odd pages.") (license license:lppl1.3+))) +(define-public texlive-fvextra + (let ((template (simple-texlive-package + "texlive-fvextra" + (list "/doc/latex/fvextra/" + "/source/latex/fvextra/" + "/tex/latex/fvextra/") + (base32 + "0nawx1fh55yhqspy5jgss2qmwpqmikfrg7628smk931rph9nq0aa")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/fvextra"))) + (home-page "https://ctan.org/macros/latex/contrib/fvextra") + (synopsis "Extensions and patches for fancyvrb") + (description + "This package provides several extensions to fancyvrb, including +automatic line breaking and improved math mode. It also patches some fancyvrb +internals.") + (license license:lppl1.3+)))) + (define-public bibtool (package (name "bibtool") -- cgit 1.4.1 From adc0e3b4853fa0a9c12e19ad5febc6656722e855 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 20 Feb 2023 16:05:03 -0500 Subject: gnu: Add texlive-minted. * gnu/packages/tex.scm (texlive-minted): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6aef6905a6..592ef6943a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -10035,6 +10035,37 @@ various fonts are provided. An alternative package the bundle.") (license license:lppl1.3c)))) +(define-public texlive-minted + (let ((template (simple-texlive-package + "texlive-minted" + (list "/doc/latex/minted/" + "/source/latex/minted/" + "/tex/latex/minted/") + (base32 + "08pbhp4a9k8v49kji26206zzabp0nn0fz403l4w7gxajw9rj8icr")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/minted"))) + (propagated-inputs (list python-pygments + texlive-etoolbox + texlive-fvextra + texlive-generic-xstring + texlive-latex-fancyvrb + texlive-latex-float + texlive-latex-framed + texlive-latex-ifplatform + texlive-latex-newfloat + texlive-lineno)) + (home-page "https://ctan.org/pkg/minted") + (synopsis "Highlight source code in LaTeX documents") + (description "This package facilitates expressive syntax highlighting in +LaTeX using the Pygments library. This package also provides options to +customize the highlighted source code output using fancyvrb and fvextra.") + (license license:lppl1.3+)))) + (define-public texlive-caption (let ((template (simple-texlive-package "texlive-caption" -- cgit 1.4.1 From 8596f4d3b42d66a28b46966078d7af211ea19585 Mon Sep 17 00:00:00 2001 From: Demis Balbach Date: Tue, 21 Feb 2023 16:02:55 +0100 Subject: gnu: Add emacs-jsdoc. * gnu/packages/emacs-xyz.scm (emacs-jsdoc): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3fe43fe2e2..0ca1f27e61 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -122,6 +122,7 @@ ;;; Copyright © 2023 Simon Streit ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Ivan Vilata-i-Balaguer +;;; Copyright © 2022 Demis Balbach ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,6 +191,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg) #:use-module (gnu packages lesstif) @@ -28685,6 +28687,32 @@ buffers.") JavaScript.") (license license:gpl3+)))) +(define-public emacs-jsdoc + (let ((commit "10ccff7a5cec6fd2f4484c1d55347634e5b46432")) ;version bump + (package + (name "emacs-jsdoc") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/isamert/jsdoc.el") + (commit commit))) + (sha256 + (base32 "0cbchri4117wjcnlk3npi4x1sfx248vck1q61cis8drrrz4c8jyp")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (arguments (list #:emacs emacs-next)) + (propagated-inputs + (list emacs-dash + emacs-s + tree-sitter-javascript)) + (home-page "https://github.com/isamert/jsdoc.el") + (synopsis "Inserts JSDoc function comments/typedefs easily.") + (description "This package provides an easy way to insert JSDoc function +comments and typedefs using Emacs' builtin tree-sitter.") + (license license:gpl3+)))) + (define-public emacs-prettier (let ((commit "e9b73e81d3e1642aec682195f127a42dfb0b5774") (version "0.1.0") -- cgit 1.4.1 From f629053a84d4606c644948e21461e35e65b13589 Mon Sep 17 00:00:00 2001 From: conses Date: Wed, 22 Feb 2023 16:35:52 +0100 Subject: gnu: Add emacs-calc-currency. * gnu/packages/emacs-xyz.scm (emacs-calc-currency): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ca1f27e61..d63f4b6a5d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6275,6 +6275,39 @@ literal programming in Emacs lisp. It extends the Emacs load mechanism so Emacs can load Org files as Lisp source files directly.") (license license:gpl3+))) +(define-public emacs-calc-currency + (let ((commit "7021d892ef38b01b875082aba4bae2517ce47ae6") + (revision "0")) + (package + (name "emacs-calc-currency") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jws85/calc-currency") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y4m0hasg4ji6zfis3088hq90pm9998lnnh8yg9g8yqqaqpfizp8")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "emacs" "--batch" + "-L" "." + "-l" "test/calc-currency-init.el" + "-l" "test/calc-currency-ecb-test.el" + "-l" "test/calc-currency-oxr-test.el" + ;; test/calc-currency-utils-test.el fails + "-f" "ert-run-tests-batch-and-exit"))) + (propagated-inputs (list emacs-f)) + (home-page "https://github.com/jws85/calc-currency") + (synopsis "Add currency units to Emacs Calc") + (description "This package adds custom units to the units table in Emacs +Calc by fetching exchange rates backends.") + (license license:gpl3+)))) + (define-public emacs-literate-calc-mode (let ((commit "ba7d22140a165b0fdd900a8d04916115ca6ab8ff") (revision "2")) -- cgit 1.4.1 From 0dd6b56da57a0b0140c02212d231fca19194f0b7 Mon Sep 17 00:00:00 2001 From: conses Date: Wed, 22 Feb 2023 16:48:26 +0100 Subject: gnu: Add emacs-org-recur. * gnu/packages/emacs-xyz.scm (emacs-org-recur): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d63f4b6a5d..1446f4cd92 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20884,6 +20884,32 @@ a heuristic based on frequency and recency.") as well as functions for navigating between these headings.") (license license:gpl3+)))) +(define-public emacs-org-recur + (package + (name "emacs-org-recur") + (version "1.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/m-cat/org-recur") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "emacs" "--batch" "-l" "org-recur-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (propagated-inputs (list emacs-dash)) + (home-page "https://github.com/m-cat/org-recur") + (synopsis "Simple recurring Org mode tasks") + (description "This package extends Org mode and Org Agenda with support +for defining recurring tasks and easily scheduling them.") + (license license:gpl3+))) + (define-public emacs-org-super-agenda (package (name "emacs-org-super-agenda") -- cgit 1.4.1 From 415db66877a95987755b96779672172fff51ac99 Mon Sep 17 00:00:00 2001 From: conses Date: Wed, 22 Feb 2023 19:58:03 +0100 Subject: gnu: Add emacs-ob-go. * gnu/packages/emacs-xyz.scm (emacs-ob-go): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1446f4cd92..a361635339 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6642,6 +6642,35 @@ your cursor steps onto them, and re-enabled when the cursor leaves.") blocks with @code{org-babel} in @code{org-mode}.") (license license:gpl3+)))) +(define-public emacs-ob-go + (let ((commit "2067ed55f4c1d33a43cb3f6948609d240a8915f5") + (revision "0")) + (package + (name "emacs-ob-go") + (version (git-version "0.02" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pope/ob-go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "069w9dymiv97cvlpzabf193nyw174r38lz5j11x23x956ladvpbw")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "emacs" "--batch" "-L" "." + "--eval=(require 'ob-go)" + "-l" "test-ob-go.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/pope/ob-go") + (synopsis "Org Babel support for evaluating Go code") + (description "@code{ob-go} enables Org Babel support for evaluating Go +code. It was created based on the usage of @code{ob-C}.") + (license license:gpl3+)))) + (define-public emacs-ob-restclient (let ((commit "1b021ce1c67c97fa1aa4d2c0816edb7add129e48")) (package -- cgit 1.4.1 From a694ef48023b83bd2938a62c1830aee6cc2513b4 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Fri, 20 Jan 2023 20:07:09 +0100 Subject: gnu: mpdris2: Remove input labels and add inputs. * gnu/packages/mpd.scm (mpdris2)[arguments]: Use G-expressions. Remove trailing #T from phase. [inputs]: Remove labels. Add BASH-MINIMAL and PYTHON-MUTAGEN. [native-inputs]: Remove labels. [description]: Use complete sentence. --- gnu/packages/mpd.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 74f43ecbb3..5288aeda3e 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2019 Evan Straw ;;; Copyright © 2020, 2021 Ricardo Wurmus ;;; Copyright © 2020 Lars-Dominik Braun -;;; Copyright © 2020–2022 Simon Streit +;;; Copyright © 2020–2023 Simon Streit ;;; Copyright © 2021 Noah Evans ;;; ;;; This file is part of GNU Guix. @@ -444,27 +444,30 @@ other MPD frontends.") (build-system gnu-build-system) ;; Manually wrap the binary, because we’re not using python-build-system. (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/mpDris2") - `("GUIX_PYTHONPATH" ":" prefix (,python-path))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (let ((python-path (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append #$output "/bin/mpDris2") + `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) (inputs - (list python-mpd2 python-dbus python-pygobject python)) ; Sets GUIX_PYTHONPATH. - ;; For bootstrapping. + (list bash-minimal + python + python-dbus + python-mpd2 + python-mutagen + python-pygobject)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("which" ,which) - ("intltool" ,intltool))) + (list autoconf + automake + gettext-minimal + intltool + which)) (synopsis "MPRIS V2.1 support for MPD") - (description "Client for the Music Player Daemon providing MPRIS 2 -support") + (description "mpDris2 is a client for the Music Player Daemon providing +MPRIS 2 support.") (home-page "https://github.com/eonpatapon/mpDris2") (license license:gpl3+))) -- cgit 1.4.1 From be1d2fb2f7fa8c9c121c33513b3a6d98c238feaa Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 26 Jan 2023 23:24:32 +0100 Subject: gnu: Add x11-ssh-askpass. * gnu/packages/ssh.scm (x11-ssh-askpass): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/ssh.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 22cf0e2d45..2618ba2dec 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2023 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages ssh) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -940,3 +942,62 @@ Ed25519 keys. @item Modern browsers are supported. @end itemize") (license license:expat))) + +(define-public x11-ssh-askpass + (package + (name "x11-ssh-askpass") + (version "1.2.4.1") + (source + (origin + (method url-fetch) + ;; The project home page seams to be offline. + (uri (string-append "https://pkgs.fedoraproject.org/repo/pkgs/openssh/" + name "-" version ".tar.gz" + "/8f2e41f3f7eaa8543a2440454637f3c3/" + name "-" version ".tar.gz")) + (sha256 + (base32 "124c1frwvdmg4nv8xqv435ibjhj2y8xc1bmfr6i8a8g75b1y63b2")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no tests + #:make-flags + #~(list (string-append "BINDIR=" #$output "/libexec") + (string-append "MANDIR=" #$output "/share/man")) + #:configure-flags + #~(list (string-append "--mandir=" + "/usr/share/man/test") + (string-append "--libexecdir=" + "/usr/lib/ssh/test") + (string-append "--with-app-defaults-dir=" + "/usr/share/X11/app-defaults/test")) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'xmkmf + (lambda* (#:key inputs #:allow-other-keys) + (let ((imake #$(this-package-native-input "imake"))) + (invoke "xmkmf") + (substitute* "Makefile" + ;; These imake variables somehow remain undefined + (("DefaultGcc2[[:graph:]]*Opt") "-O2") + ;; Reset a few variable defaults that are set in imake + ;; templates. + ((imake) #$output) + (("(MANPATH = )[[:graph:]]*" _ front) + (string-append front #$output "/share/man")))))) + (add-after 'xmkmf 'make-includes + (lambda _ + (invoke "make" "includes"))) + (add-after 'install 'install/doc + (lambda _ + (lambda _ + (invoke "make" + (string-append "MANDIR=" #$output "/share/man") + "install.man"))))))) + (native-inputs (list imake)) + (inputs (list libxt)) + (home-page "http://www.jmknoble.net/software/x11-ssh-askpass/") + (synopsis "Lightweight passphrase dialog for SSH") + (description "code{x11-ssh-askpass} is an X11-based pass-phrase dialog for +use with OpenSSH.") + (license license:gpl2+))) -- cgit 1.4.1 From 8b654bf159ccd1bd55ca794fc26dcec34e69f803 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 26 Jan 2023 15:43:17 -0800 Subject: gnu: Add staticsite. * gnu/packages/python-xyz.scm (staticsite): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1b120399a7..55f8fd3166 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31769,6 +31769,52 @@ shared objects, and lift them up to the executable referenced by absolute path.") (license license:expat))) +(define-public staticsite + (package + (name "staticsite") + (version "2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spanezz/staticsite") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rhr25xydvnlrrcz389j3f6nknmczm5x11cagrji1qww70piwy08")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-themes-in-output + (lambda _ + (substitute* "staticsite/global_settings.py" + (("/usr/share/staticsite") #$output)))) + (add-after 'install 'install-themes + (lambda _ + (let ((themedir (string-append #$output "/themes"))) + (copy-recursively "themes" themedir))))))) + (native-inputs + (list perl-image-exiftool + python-dateutil + python-docutils + python-jinja2 + python-markdown + python-pillow + python-pyinotify + python-pytz + python-pyyaml + python-ruamel.yaml + python-slugify + python-tornado + tzdata-for-tests)) + (home-page "https://github.com/spanezz/staticsite") + (synopsis "Static site generator") + (description "Statistic is a static site generator based on Markdown and +Jinja2.") + (license (list license:gpl3+ license:expat)))) + (define-public python-pymonad (package (name "python-pymonad") -- cgit 1.4.1 From 92984eb93f5ae26faa5ac07258299cafb53dc6da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 23 Feb 2023 16:20:12 +0100 Subject: Revert "gnu: texlive-latex-fancyvrb: Add needed propagated-inputs." This reverts commit 7a01586afe9b65acc0a298b699a66fb187dd7b4f, which causes too many rebuilds. --- gnu/packages/tex.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 592ef6943a..08573a3aeb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3174,7 +3174,6 @@ users, via its Plain TeX version.)") (base32 "0pdilgpw4zc0ipp4z9kdi61nymifyjy2mfpk74xk2cw9vhynkk3w") #:trivial? #t)) - (propagated-inputs (list texlive-latex-upquote)) (home-page "https://www.ctan.org/pkg/fancyvrb") (synopsis "Sophisticated verbatim text") (description -- cgit 1.4.1 From b126eae021bc4af5f0c728fcf7ed136f0b82c08d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 12:59:53 +0100 Subject: gnu: ucx: Mark POWER9 as supported. * gnu/packages/fabric-management.scm (ucx)[supported-systems]: Add "powerpc64le-linux". --- gnu/packages/fabric-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 13851639ae..cbe6dee220 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -228,4 +228,4 @@ memory mechanisms for efficient intra-node communication.") ;; lists only PowerPC64, AArch64, and x86_64 as ;; supported. - (supported-systems '("x86_64-linux" "aarch64-linux")))) + (supported-systems '("x86_64-linux" "aarch64-linux" "powerpc64le-linux")))) -- cgit 1.4.1 From 9b3cc02acb446a55e5c810ad087cf87bcfd69da7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 13:13:52 +0100 Subject: gnu: ucx: Use gexps. * gnu/packages/fabric-management.scm (ucx): Use gexps. --- gnu/packages/fabric-management.scm | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index cbe6dee220..1ed65df0c1 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2023 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages fabric-management) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix licenses) #:use-module (guix download) @@ -187,30 +188,29 @@ testing InfiniBand networks.") "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1")))) (build-system gnu-build-system) (arguments - '( ;; These are some of the flags found in 'contrib/configure-release'. - #:configure-flags (list - "--disable-static" + (list + ;; These are some of the flags found in ;; 'contrib/configure-release'. + #:configure-flags #~(list + "--disable-static" - ;; XXX: Disable optimizations specific to the build - ;; machine (AVX, etc.) There's apparently no way to - ;; have them picked up at load time. - "--disable-optimizations" + ;; XXX: Disable optimizations specific to the build + ;; machine (AVX, etc.) There's apparently no way to + ;; have them picked up at load time. + "--disable-optimizations" - "--disable-logging" - "--disable-debug" - "--disable-assertions" - "--disable-params-check" + "--disable-logging" + "--disable-debug" + "--disable-assertions" + "--disable-params-check" - (string-append "--with-verbs=" - (assoc-ref %build-inputs - "rdma-core")) + (string-append "--with-verbs=" + #$(this-package-input "rdma-core")) - (string-append "--with-rdmacm=" - (assoc-ref %build-inputs - "rdma-core"))) + (string-append "--with-rdmacm=" + #$(this-package-input "rdma-core"))) - ;; Be verbose so that compiler flags are displayed. - #:make-flags '("V=1"))) + ;; Be verbose so that compiler flags are displayed. + #:make-flags #~'("V=1"))) (native-inputs (list autoconf automake libtool pkg-config)) (inputs -- cgit 1.4.1 From 73c738bc9e5374a1dc38237dfc067fa2c320d5bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 14:32:51 +0100 Subject: gnu: infiniband-diags: Use gexps. * gnu/packages/fabric-management.scm (infiniband-diags)[arguments]: Use gexps. Replace reference to '%outputs' with references to #:outputs. --- gnu/packages/fabric-management.scm | 46 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 1ed65df0c1..09e4a2b854 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -109,28 +109,30 @@ running the opensm daemon.") ;; FIXME: needs rst2man for man pages (list perl pkg-config)) (arguments - '(#:configure-flags - (list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "opensm") - "/include/infiniband") - (string-append "--with-perl-installdir=" (assoc-ref %outputs "lib") - "/lib/perl5/vendor_perl") - "--disable-static") - #:phases - (modify-phases %standard-phases - (add-after 'install 'licence - (lambda _ - (let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc"))) - (mkdir-p doc) - (install-file "COPYING" doc)))) - (add-after 'install-file 'move-perl - ;; Avoid perl in lib closure - (lambda _ - (let ((perlout (string-append (assoc-ref %outputs "out") "/lib")) - (perlin (string-append (assoc-ref %outputs "lib") - "/lib/perl5"))) - (mkdir-p perlout) - (rename-file perlin perlout) - #t)))))) + (list #:configure-flags + #~(list (string-append "CPPFLAGS=-I" + #$(this-package-input "opensm") + "/include/infiniband") + (string-append "--with-perl-installdir=" #$output:lib + "/lib/perl5/vendor_perl") + "--disable-static") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'licence + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "lib") + "/share/doc"))) + (mkdir-p doc) + (install-file "COPYING" doc)))) + (add-after 'install-file 'move-perl + ;; Avoid perl in lib closure + (lambda* (#:key outputs #:allow-other-keys) + (let ((perlout (string-append (assoc-ref outputs "out") + "/lib")) + (perlin (string-append (assoc-ref outputs "lib") + "/lib/perl5"))) + (mkdir-p perlout) + (rename-file perlin perlout))))))) (home-page "https://github.com/linux-rdma/infiniband-diags") (synopsis "Infiniband diagnostic tools") (description "This is a set of command-line utilities to help configure, -- cgit 1.4.1 From f30946ce13ab7619ac3747db18003de61a0a651b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 14:34:33 +0100 Subject: gnu: ibutils: Use gexps. * gnu/packages/fabric-management.scm (ibutils)[arguments]: Use gexps. --- gnu/packages/fabric-management.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 09e4a2b854..dc32b163da 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -164,10 +164,12 @@ interface to this library is not guaranteed to be stable.") perl)) (native-inputs (list swig)) (arguments - `(#:configure-flags - (list (string-append "--with-osm=" (assoc-ref %build-inputs "opensm")) - (string-append "--with-tk-lib=" (assoc-ref %build-inputs "tk") "/lib") - "--disable-static"))) + (list #:configure-flags + #~(list (string-append "--with-osm=" + #$(this-package-input "opensm")) + (string-append "--with-tk-lib=" + #$(this-package-input "tk") "/lib") + "--disable-static"))) (synopsis "InfiniBand network utilities") (description "These command-line utilities allow for diagnosing and testing InfiniBand networks.") -- cgit 1.4.1 From 96c335574d25f412ef1dda8b0949e59c32a27174 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 14:37:05 +0100 Subject: gnu: ibutils: Fix compilation. * gnu/packages/fabric-management.scm (ibutils)[arguments]: Add CFLAGS to #:configure-flags. --- gnu/packages/fabric-management.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index dc32b163da..3ab1a35d7c 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -169,7 +169,11 @@ interface to this library is not guaranteed to be stable.") #$(this-package-input "opensm")) (string-append "--with-tk-lib=" #$(this-package-input "tk") "/lib") - "--disable-static"))) + "--disable-static" + + ;; Address this link error: + ;; ld: .libs/ibis.o:/ibis/src/ibis.c:55: multiple definition of `IbisObj'; .libs/ibis_wrap.o:/ibis/src/ibis_wrap.c:3007: first defined here + "CFLAGS=-O2 -g -fcommon"))) (synopsis "InfiniBand network utilities") (description "These command-line utilities allow for diagnosing and testing InfiniBand networks.") -- cgit 1.4.1 From b8d3b9d14b128645756a8102e2e5f8938495b942 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 14:41:14 +0100 Subject: gnu: psm2: Use gexps. * gnu/packages/linux.scm (psm2)[arguments]: Use gexps. --- gnu/packages/linux.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b26eedfb1b..61eaec2876 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2021, 2021-2022 Ludovic Courtès +;;; Copyright © 2012-2021, 2021-2023 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver @@ -8577,25 +8577,23 @@ privileges.") "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg")))) (build-system gnu-build-system) (arguments - '(#:make-flags - `(,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) - #:tests? #f - #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'patch-Makefiles - (lambda _ - (substitute* "Makefile" - (("/lib64") "/lib") - (("/usr") "")) - (substitute* "compat/Makefile" - (("/lib64") "/lib") - (("/usr") "")) - #t)) - (replace 'install - (lambda _ - (setenv "DESTDIR" %output) - (invoke "make" "install") - #t))))) + (list #:make-flags + #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-Makefiles + (lambda _ + (substitute* "Makefile" + (("/lib64") "/lib") + (("/usr") "")) + (substitute* "compat/Makefile" + (("/lib64") "/lib") + (("/usr") "")))) + (replace 'install + (lambda _ + (setenv "DESTDIR" #$output) + (invoke "make" "install")))))) (inputs (list rdma-core numactl)) (synopsis "Intel Performance Scaled Messaging 2 (PSM2) library") -- cgit 1.4.1 From f45fc72c282bc14da7212b4acb8fe9707e53aad0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 15:49:09 +0100 Subject: gnu: openmpi: Use gexps. * gnu/packages/mpi.scm (openmpi)[arguments]: Use gexps. --- gnu/packages/mpi.scm | 130 ++++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 64 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 70b14c30b3..e8c20919d7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -25,6 +25,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages mpi) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) @@ -191,13 +192,13 @@ bind processes, and much more.") (version "4.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://www.open-mpi.org/software/ompi/v" - (version-major+minor version) - "/downloads/openmpi-" version ".tar.bz2")) - (sha256 - (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) - (patches (search-patches "openmpi-mtl-priorities.patch")))) + (method url-fetch) + (uri (string-append "https://www.open-mpi.org/software/ompi/v" + (version-major+minor version) + "/downloads/openmpi-" version ".tar.bz2")) + (sha256 + (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) + (patches (search-patches "openmpi-mtl-priorities.patch")))) (properties ;; Tell the 'generic-html' updater to monitor this URL for updates. @@ -228,68 +229,69 @@ bind processes, and much more.") (list pkg-config perl)) (outputs '("out" "debug")) (arguments - `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work - "--with-sge" + (list + #:configure-flags #~`("--enable-mpi-ext=affinity" ;cr doesn't work + "--with-sge" - ,@(if ,(package? (this-package-input "valgrind")) - `("--enable-memchecker" - "--with-valgrind") - `("--without-valgrind")) + #$@(if (package? (this-package-input "valgrind")) + #~("--enable-memchecker" + "--with-valgrind") + #~("--without-valgrind")) - "--with-hwloc=external" - "--with-libevent" + "--with-hwloc=external" + "--with-libevent" - ;; Help 'orterun' and 'mpirun' find their tools - ;; under $prefix by default. - "--enable-mpirun-prefix-by-default" + ;; Help 'orterun' and 'mpirun' find their tools + ;; under $prefix by default. + "--enable-mpirun-prefix-by-default" - ;; InfiniBand support - "--enable-openib-control-hdr-padding" - "--enable-openib-dynamic-sl" - "--enable-openib-udcm" - "--enable-openib-rdmacm" - "--enable-openib-rdmacm-ibaddr" + ;; InfiniBand support + "--enable-openib-control-hdr-padding" + "--enable-openib-dynamic-sl" + "--enable-openib-udcm" + "--enable-openib-rdmacm" + "--enable-openib-rdmacm-ibaddr" - ;; Enable support for SLURM's Process Manager - ;; Interface (PMI). - ,(string-append "--with-pmi=" - (assoc-ref %build-inputs "slurm"))) - #:phases (modify-phases %standard-phases - ;; opensm is needed for InfiniBand support. - (add-after 'unpack 'find-opensm-headers - (lambda* (#:key inputs #:allow-other-keys) - (setenv "C_INCLUDE_PATH" - (search-input-directory inputs - "/include/infiniband")) - (setenv "CPLUS_INCLUDE_PATH" - (search-input-directory inputs - "/include/infiniband")))) - (add-before 'build 'remove-absolute - (lambda _ - ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE - ;; etc.) to reduce the closure size. See - ;; - ;; and - ;; . - (substitute* '("orte/tools/orte-info/param.c" - "oshmem/tools/oshmem_info/param.c" - "ompi/tools/ompi_info/param.c") - (("_ABSOLUTE") "")) - ;; Avoid valgrind (which pulls in gdb etc.). - (substitute* - '("./ompi/mca/io/romio321/src/io_romio321_component.c") - (("MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS") - "\"[elided to reduce closure]\"")))) - (add-before 'build 'scrub-timestamps ;reproducibility - (lambda _ - (substitute* '("ompi/tools/ompi_info/param.c" - "orte/tools/orte-info/param.c" - "oshmem/tools/oshmem_info/param.c") - ((".*(Built|Configured) on.*") "")))) - (add-after 'install 'remove-logs ;reproducibility - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each delete-file (find-files out "config.log")))))))) + ;; Enable support for SLURM's Process Manager + ;; Interface (PMI). + ,(string-append "--with-pmi=" + #$(this-package-input "slurm"))) + #:phases #~(modify-phases %standard-phases + ;; opensm is needed for InfiniBand support. + (add-after 'unpack 'find-opensm-headers + (lambda* (#:key inputs #:allow-other-keys) + (setenv "C_INCLUDE_PATH" + (search-input-directory inputs + "/include/infiniband")) + (setenv "CPLUS_INCLUDE_PATH" + (search-input-directory inputs + "/include/infiniband")))) + (add-before 'build 'remove-absolute + (lambda _ + ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE + ;; etc.) to reduce the closure size. See + ;; + ;; and + ;; . + (substitute* '("orte/tools/orte-info/param.c" + "oshmem/tools/oshmem_info/param.c" + "ompi/tools/ompi_info/param.c") + (("_ABSOLUTE") "")) + ;; Avoid valgrind (which pulls in gdb etc.). + (substitute* + '("./ompi/mca/io/romio321/src/io_romio321_component.c") + (("MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS") + "\"[elided to reduce closure]\"")))) + (add-before 'build 'scrub-timestamps ;reproducibility + (lambda _ + (substitute* '("ompi/tools/ompi_info/param.c" + "orte/tools/orte-info/param.c" + "oshmem/tools/oshmem_info/param.c") + ((".*(Built|Configured) on.*") "")))) + (add-after 'install 'remove-logs ;reproducibility + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each delete-file (find-files out "config.log")))))))) (home-page "https://www.open-mpi.org") (synopsis "MPI-3 implementation") (description -- cgit 1.4.1 From 437e858e6c18ee82f3e6c5fe942cfb85ef9297f0 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Tue, 21 Feb 2023 16:34:57 -0800 Subject: gnu: lightning: Update to 2.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/assembly.scm (lightning): Update to 2.2.1 Signed-off-by: Ludovic Courtès --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 7e36bbcc71..ff8fe69e64 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -133,14 +133,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.") (define-public lightning (package (name "lightning") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/lightning/lightning-" version ".tar.gz")) (sha256 (base32 - "03kwvn00qggys203vpzb2kq2asy0ql7x84ajk05a62yg3kzq8faf")))) + "1aiwx9cl9c7swqcgrsjnvd5laah3iwxzl1van3670iv8sn0icrwq")))) (build-system gnu-build-system) (native-inputs (list zlib)) (arguments -- cgit 1.4.1 From 84c9a94b451fb46eeef5d56ff58921ea0b8ce510 Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Tue, 21 Feb 2023 22:12:24 +0200 Subject: gnu: Add aspell-dict-bg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/aspell.scm (aspell-dict-bg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/aspell.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 8978b4e087..18d19027a4 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Noah Landis ;;; Copyright © 2021 Sergiu Ivanov +;;; Copyright © 2023 Yovan Naumovski ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,6 +172,14 @@ dictionaries, including personal ones.") (base32 "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"))) +(define-public aspell-dict-bg + (aspell-dictionary "bg" "Bulgarian" + #:version "4.1-0" + #:prefix "aspell6-" + #:sha256 + (base32 + "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"))) + (define-public aspell-dict-bn (aspell-dictionary "bn" "Bengali" #:version "0.01.1-1" -- cgit 1.4.1 From 3809aa01a1287dbe5be90e7aa4407bf27a6467ed Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Feb 2023 07:49:58 +0100 Subject: gnu: gnulib: Allow only one directory name in GNULIB_SRCDIR. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/build-tools.scm (gnulib-checkout) [search-path-specification GNULIB_SRCDIR]: Set separator to #f. Signed-off-by: Ludovic Courtès --- gnu/packages/build-tools.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3d03c37a2c..00b8f8caf3 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -997,7 +997,8 @@ maintenance-related files, for convenience.") (native-search-paths (list (search-path-specification (variable "GNULIB_SRCDIR") - (files (list "src/gnulib"))))) + (files (list "src/gnulib")) + (separator #f)))) (license (list license:lgpl2.0+ license:gpl3+)))) (define-public gnulib -- cgit 1.4.1 From 1e6ddceb8318d413745ca1c9d91fde01b1e0364b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:00 +0100 Subject: gnu: Use HTTPS package home pages wherever possible. * gnu/packages/accessibility.scm (florence)[home-page]: Use HTTPS. * gnu/packages/admin.scm (netcat, nmon)[home-page]: Likewise. * gnu/packages/algebra.scm (mpfrcx, cm, flint, fftw, r-dtt)[home-page]: Likewise. * gnu/packages/apr.scm (apr, apr-util)[home-page]: Likewise. * gnu/packages/aspell.scm (aspell-dict-it)[home-page]: Likewise. * gnu/packages/astronomy.scm (casacore, sextractor, libnova) (xplanet)[home-page]: Likewise. * gnu/packages/audio.scm (libtimidity, alsa-modular-synth, azr3, tao) (freepats, rakarrack, liblo, libshout-idjc, timidity++, libsbsms) (libmodplug, libxmp, xmp, sox, drc, gsm, gnaural) (streamripper)[home-page]: Likewise. * gnu/packages/authentication.scm (pamtester)[home-page]: Likewise. * gnu/packages/backup.scm (grsync)[home-page]: Likewise. * gnu/packages/bioconductor.scm (r-nmf, r-edger, r-limma) (r-plgem)[home-page]: Likewise. * gnu/packages/bioinformatics.scm (python-biom-format, bowtie, bowtie1) (bwa, crossmap, java-htsjdk, java-htsjdk-latest, java-picard) (java-picard-2.10.3, kaiju, proteinortho, rsem, rseqc, seek, samtools) (snap-aligner, subread, stringtie, r-centipede, prinseq, emboss, phylip) (libsbml)[home-page]: Likewise. * gnu/packages/build-tools.scm (tup)[home-page]: Likewise. * gnu/packages/cdrom.scm (libcddb, cdrdao, cdrtools) (cd-discid)[home-page]: Likewise. * gnu/packages/check.scm (cunit, python-nose) (python-pyhamcrest)[home-page]: Likewise. * gnu/packages/chemistry.scm (gromacs)[home-page]: Likewise. * gnu/packages/chez.scm (chez-fmt)[home-page]: Likewise. * gnu/packages/code.scm (lcov, uncrustify, cscope)[home-page]: Likewise. * gnu/packages/compression.scm (p7zip)[home-page]: Likewise. * gnu/packages/cran.scm (r-emdist, r-proj4, r-zoo, r-ggalluvial) (r-orgmassspecr, r-polychrome, r-partykit, r-rcpp, r-ff, r-emdbook) (r-fitdistrplus, r-linprog, r-geometry, r-dtw, r-fst, r-rjags) (r-intergraph, r-qualv, r-labelled, r-survey, r-coin, r-fmsb, r-tm) (r-corpcor, r-rmpfr, r-spatialextremes, r-longitudinal, r-genenet) (r-bayesm, r-seqinr, r-mpm, r-text2vec, r-rgdal, r-seewave, r-hdrcde) (r-shapes, r-anytime, r-stm, r-d3network, r-tam, r-directlabels) (r-spatstat-utils, r-spatstat-sparse, r-spatstat-data, r-spatstat-geom) (r-spatstat-core, r-spatstat-linnet, r-spatstat-random, r-spatstat) (r-rcpptoml, r-mlecens, r-seurat, r-mlearning, r-zooimage)[home-page]: Likewise. * gnu/packages/crates-io.scm (rust-nickel-0.11, rust-thrift-0.13) (rust-trust-dns-https-0.20, rust-trust-dns-native-tls-0.20) (rust-trust-dns-openssl-0.20, rust-trust-dns-proto-0.20) (rust-trust-dns-resolver-0.20, rust-trust-dns-rustls-0.20) (rust-uint-0.9, rust-yaml-rust-0.4)[home-page]: Likewise. * gnu/packages/crypto.scm (libdecaf, ccrypt)[home-page]: Likewise. * gnu/packages/curl.scm (curlpp)[home-page]: Likewise. * gnu/packages/databases.scm (python-pylibmc, unixodbc, wiredtiger) (libpqxx, mdbtools, virtuoso-ose, libdbi, libdbi-drivers) (soci)[home-page]: Likewise. * gnu/packages/debian.scm (apt-mirror)[home-page]: Likewise. * gnu/packages/debug.scm (remake)[home-page]: Likewise. * gnu/packages/disk.scm (sdparm, idle3-tools, duc)[home-page]: Likewise. * gnu/packages/django.scm (python-django-haystack)[home-page]: Likewise. * gnu/packages/djvu.scm (djvulibre, djview)[home-page]: Likewise. * gnu/packages/dns.scm (dnsmasq)[home-page]: Likewise. * gnu/packages/docbook.scm (dblatex, docbook2x)[home-page]: Likewise. * gnu/packages/documentation.scm (scrollkeeper)[home-page]: Likewise. * gnu/packages/ebook.scm (liblinebreak)[home-page]: Likewise. * gnu/packages/electronics.scm (xoscope)[home-page]: Likewise. * gnu/packages/emacs-xyz.scm (emacs-bbdb, emacs-caps-lock, emacs-djvu) (emacs-pabbrev, emacs-twittering-mode, emacs-filladapt, emacs-rudel) (emacs-stream, emacspeak, emacs-cc-mode, emacs-eldoc, emacs-jsonrpc) (emacs-gtk-look, emacs-xclip, emacs-slime-volleyball, emacs-minimap) (emacs-auto-dictionary-mode, emacs-persist, emacs-shell-command+) (emacs-map, emacs-xref, emacs-dictionary)[home-page]: Likewise. * gnu/packages/embedded.scm (sdcc)[home-page]: Likewise. * gnu/packages/engineering.scm (asco, libngspice, libspnav) (openctm)[home-page]: Likewise. * gnu/packages/erlang.scm (erlang-erlware-commons)[home-page]: Likewise. * gnu/packages/file-systems.scm (jfsutils, curlftpfs)[home-page]: Likewise. * gnu/packages/finance.scm (gbonds)[home-page]: Likewise. * gnu/packages/flashing-tools.scm (dfu-util, srecord)[home-page]: Likewise. * gnu/packages/fltk.scm (ntk)[home-page]: Likewise. * gnu/packages/fonts.scm (font-terminus, font-tex-gyre) (font-comic-neue)[home-page]: Likewise. * gnu/packages/fontutils.scm (ttf2pt1, potrace, libspiro)[home-page]: Likewise. * gnu/packages/fpga.scm (icestorm, gtkwave, gtkwave) (python-myhdl)[home-page]: Likewise. * gnu/packages/freedesktop.scm (libatasmart)[home-page]: Likewise. * gnu/packages/ftp.scm (weex)[home-page]: Likewise. * gnu/packages/game-development.scm (dds, python-tmx, sfxr, quesoglc) (eureka, plib)[home-page]: Likewise. * gnu/packages/games.scm (abe, alex4, armagetronad, barony) (foobillard++, golly, ltris, pipewalker, prboom-plus, trigger-rally) (cmatrix, pinball, pioneers, tennix, chromium-bsu, freeciv, kiki) (quakespasm, frotz, frotz-dumb-terminal, frotz-sdl, btanks) (flare-engine, chessx, barrage, cgoban, passage)[home-page]: Likewise. * gnu/packages/geo.scm (python-geopandas, saga)[home-page]: Likewise. * gnu/packages/gl.scm (freeglut, gl2ps)[home-page]: Likewise. * gnu/packages/gnome.scm (cogl, clutter-gtk, clutter-gst, bluefish) (workrave)[home-page]: Likewise. * gnu/packages/gnustep.scm (wmnd, wmfire, wmfire)[home-page]: Likewise. * gnu/packages/graph.scm (mscgen)[home-page]: Likewise. * gnu/packages/graphics.scm (assimp, alembic, ctl, agg) (opencsg)[home-page]: Likewise. * gnu/packages/graphviz.scm (gts)[home-page]: Likewise. * gnu/packages/gtk.scm (gtkspell3)[home-page]: Likewise. * gnu/packages/guile-xyz.scm (guile-irregex)[home-page]: Likewise. * gnu/packages/haskell-apps.scm (cpphs)[home-page]: Likewise. * gnu/packages/haskell-check.scm (ghc-hunit)[home-page]: Likewise. * gnu/packages/haskell-web.scm (ghc-http-client-restricted) (ghc-blaze-html, ghc-happstack-server, ghc-sourcemap)[home-page]: Likewise. * gnu/packages/haskell-xyz.scm (ghc-assoc, ghc-cairo, ghc-cborg) (ghc-csv, ghc-glob, ghc-gtk2hs-buildtools, ghc-hmatrix-gsl-stats) (ghc-intervalmap, ghc-lens-family-core, ghc-managed, ghc-mountpoints) (ghc-network-multicast, ghc-optional-args, ghc-regex, ghc-spoon) (ghc-transformers, ghc-turtle, ghc-utf8-light, ghc-wizards) (ghc-template-haskell, ghc-boot-th, ghc-binary-orphans) (ghc-postgresql-simple)[home-page]: Likewise. * gnu/packages/hexedit.scm (ht, bvi)[home-page]: Likewise. * gnu/packages/hunspell.scm (hunspell-dict-hu)[home-page]: Likewise. * gnu/packages/image-processing.scm (mia)[home-page]: Likewise. * gnu/packages/image-viewers.scm (geeqie, gpicview, luminance-hdr) (qiv)[home-page]: Likewise. * gnu/packages/image.scm (libuemf, devil, steghide, optipng, niftilib) (sng, mtpaint)[home-page]: Likewise. * gnu/packages/java-xml.scm (java-simple-xml, java-jaxp) (java-apache-xml-commons-resolver)[home-page]: Likewise. * gnu/packages/java.scm (java-cisd-base, java-cisd-args4j) (java-hamcrest-core, java-jsr305, java-eclipse-osgi) (java-eclipse-equinox-common, java-eclipse-core-jobs) (java-eclipse-equinox-registry, java-eclipse-equinox-app) (java-eclipse-equinox-preferences, java-eclipse-core-contenttype) (java-eclipse-text, java-treelayout, java-aopalliance, java-jeromq) (java-cdi-api)[home-page]: Likewise. * gnu/packages/jemalloc.scm (jemalloc-4.5.0)[home-page]: Likewise. * gnu/packages/julia-xyz.scm (julia-recipespipeline)[home-page]: Likewise. * gnu/packages/kde-internet.scm (kget)[home-page]: Likewise. * gnu/packages/kde-systemtools.scm (dolphin-plugins) (konsole)[home-page]: Likewise. * gnu/packages/kodi.scm (fstrcmp)[home-page]: Likewise. * gnu/packages/language.scm (hime, libchewing)[home-page]: Likewise. * gnu/packages/lego.scm (nqc)[home-page]: Likewise. * gnu/packages/lesstif.scm (lesstif)[home-page]: Likewise. * gnu/packages/libcanberra.scm (libcanberra)[home-page]: Likewise. * gnu/packages/libdaemon.scm (libdaemon)[home-page]: Likewise. * gnu/packages/libffi.scm (libffi)[home-page]: Likewise. * gnu/packages/libreoffice.scm (libwpd, libwpg, libwps)[home-page]: Likewise. * gnu/packages/libusb.scm (libmtp, gmtp)[home-page]: Likewise. * gnu/packages/linux.scm (e2fsprogs, extundelete, lsscsi, net-tools) (kbd, sysfsutils, cpuid, libpfm4)[home-page]: Likewise. * gnu/packages/lisp-check.scm (sbcl-ptester, sbcl-xlunit)[home-page]: Likewise. * gnu/packages/lisp-xyz.scm (sbcl-html-encode, sbcl-py-configparser) (sbcl-cl-utilities, sbcl-series, sbcl-uffi, sbcl-clsql, sbcl-sycamore) (sbcl-osicat, sbcl-hu.dwim.common, sbcl-caveman, sbcl-trivial-shell) (sbcl-trivial-benchmark, sbcl-screamer, sbcl-smug)[home-page]: Likewise. * gnu/packages/lisp.scm (lush2)[home-page]: Likewise. * gnu/packages/logging.scm (log4cpp)[home-page]: Likewise. * gnu/packages/lua.scm (lua-ldoc)[home-page]: Likewise. * gnu/packages/machine-learning.scm (mcl, openfst, rxcpp)[home-page]: Likewise. * gnu/packages/mail.scm (muchsync, procmail, sendmail) (opensmtpd-filter-dkimsign, crm114)[home-page]: Likewise. * gnu/packages/man.scm (libpipeline, man-db)[home-page]: Likewise. * gnu/packages/maths.scm (lapack, scalapack, hdf-eos5, itpp, gmsh) (metamath, p4est, armadillo, suitesparse, atlas, lpsolve, wcalc, why3) (frama-c)[home-page]: Likewise. * gnu/packages/mcrypt.scm (mcrypt, libmcrypt, libmhash)[home-page]: Likewise. * gnu/packages/minetest.scm (minetest-advtrains)[home-page]: Likewise. * gnu/packages/monitoring.scm (python-whisper, python-carbon) (hostscope)[home-page]: Likewise. * gnu/packages/mp3.scm (id3lib, libmp3splt, mp3splt, mpg321) (lame)[home-page]: Likewise. * gnu/packages/multiprecision.scm (mpc)[home-page]: Likewise. * gnu/packages/music.scm (aria-maestosa, lingot, setbfree, bristol) (portmidi, python-pyportmidi, zynaddsubfx, yoshimi, aj-snapshot) (schismtracker, midicsv, midicsv, qmidiarp, qmidiroute, dssi, tap-lv2) (shiru-lv2)[home-page]: Likewise. * gnu/packages/ncurses.scm (stfl)[home-page]: Likewise. * gnu/packages/networking.scm (lksctp-tools, mbuffer, ifstatus, bird) (tunctl, traceroute)[home-page]: Likewise. * gnu/packages/node-xyz.scm (node-mersenne)[home-page]: Likewise. * gnu/packages/ntp.scm (openntpd)[home-page]: Likewise. * gnu/packages/ocaml.scm (opam, hevea, ocaml-menhir, ocaml-piqilib) (ocaml-graph, cubicle)[home-page]: Likewise. * gnu/packages/opencl.scm (python-pyopencl)[home-page]: Likewise. * gnu/packages/package-management.scm (xstow, modules)[home-page]: Likewise. * gnu/packages/parallel.scm (xjobs)[home-page]: Likewise. * gnu/packages/pdf.scm (podofo, qpdf, xournal, impressive)[home-page]: Likewise. * gnu/packages/perl.scm (perl-math-vecstat, perltidy)[home-page]: Likewise. * gnu/packages/photo.scm (libpano13, enblend-enfuse, hugin)[home-page]: Likewise. * gnu/packages/plan9.scm (drawterm)[home-page]: Likewise. * gnu/packages/plotutils.scm (guile-charting, ploticus)[home-page]: Likewise. * gnu/packages/popt.scm (argtable, popt)[home-page]: Likewise. * gnu/packages/profiling.scm (otf2)[home-page]: Likewise. * gnu/packages/pulseaudio.scm (pulseaudio)[home-page]: Likewise. * gnu/packages/python-check.scm (python-mypy)[home-page]: Likewise. * gnu/packages/python-web.scm (python-cssutils) (python-translationstring)[home-page]: Likewise. * gnu/packages/python-xyz.scm (python-diskcache, python-doxyqml) (python-docutils, python-pexpect, python-importlib-resources) (python-simplegeneric, python-urwid, python-xlrd, python-xlwt) (python-pyasn1, python-pythondialog, python-tftpy, python-random2) (python-arcp, python-pyopengl, python-sortedcollections) (python-sortedcontainers, python-yapsy, python-pydispatcher) (python-posix-ipc)[home-page]: Likewise. * gnu/packages/qt.scm (qwt, libqglviewer, signond)[home-page]: Likewise. * gnu/packages/radio.scm (unixcw, gnuais)[home-page]: Likewise. * gnu/packages/raspberry-pi.scm (bcm2835)[home-page]: Likewise. * gnu/packages/rdf.scm (clucene, rasqal, redland)[home-page]: Likewise. * gnu/packages/regex.scm (tre)[home-page]: Likewise. * gnu/packages/rsync.scm (librsync)[home-page]: Likewise. * gnu/packages/ruby.scm (ruby-packnga, ruby-nokogiri, ruby-oj, ruby-ox) (ruby-sinatra, ruby-citrus, ruby-cbor, ruby-roda)[home-page]: Likewise. * gnu/packages/scheme.scm (scheme48, tinyscheme)[home-page]: Likewise. * gnu/packages/screen.scm (dtach)[home-page]: Likewise. * gnu/packages/scsi.scm (sg3-utils)[home-page]: Likewise. * gnu/packages/sdl.scm (libmikmod, sdl-pango)[home-page]: Likewise. * gnu/packages/shellutils.scm (hstr, rig)[home-page]: Likewise. * gnu/packages/simulation.scm (python-dolfin-adjoint)[home-page]: Likewise. * gnu/packages/smalltalk.scm (smalltalk)[home-page]: Likewise. * gnu/packages/speech.scm (espeak)[home-page]: Likewise. * gnu/packages/stalonetray.scm (stalonetray)[home-page]: Likewise. * gnu/packages/statistics.scm (jags, r-mass, r-class, r-lattice) (r-matrix, r-nnet, r-spatial, r-bit, r-bit64, r-digest, r-xtable) (python-statsmodels, r-ade4, r-latticeextra, r-rcurl, r-xml, r-mvtnorm) (r-robustbase, r-minqa, r-fdrtool, java-jdistlib, xlispstat)[home-page]: Likewise. * gnu/packages/swig.scm (swig)[home-page]: Likewise. * gnu/packages/task-management.scm (wtime)[home-page]: Likewise. * gnu/packages/tcl.scm (itcl, tclxml, tclx)[home-page]: Likewise. * gnu/packages/terminals.scm (libtermkey, mlterm, libvterm) (libvterm)[home-page]: Likewise. * gnu/packages/tex.scm (texlive-lm, texlive-lm-math, texlive-cs) (texlive-csplain, biber, texmaker)[home-page]: Likewise. * gnu/packages/text-editors.scm (joe)[home-page]: Likewise. * gnu/packages/textutils.scm (drm-tools, docx2txt)[home-page]: Likewise. * gnu/packages/tv.scm (tvtime)[home-page]: Likewise. * gnu/packages/unicode.scm (libunibreak)[home-page]: Likewise. * gnu/packages/upnp.scm (libupnp)[home-page]: Likewise. * gnu/packages/version-control.scm (cvs)[home-page]: Likewise. * gnu/packages/video.scm (transcode, libquicktime, mjpegtools, aalib) (liba52, libmpeg2, x265, libdv, dvdauthor, aegisub, pitivi, gavl) (dvdbackup, guvcview, video-contact-sheet)[home-page]: Likewise. * gnu/packages/virtualization.scm (bochs)[home-page]: Likewise. * gnu/packages/w3m.scm (w3m)[home-page]: Likewise. * gnu/packages/web.scm (qjson, libquvi-scripts, libquvi, quvi) (tidy-html, htmlcxx)[home-page]: Likewise. * gnu/packages/wm.scm (evilwm, menumaker)[home-page]: Likewise. * gnu/packages/wv.scm (wv)[home-page]: Likewise. * gnu/packages/wxwidgets.scm (wxsvg)[home-page]: Likewise. * gnu/packages/xdisorg.scm (mtdev, xsel)[home-page]: Likewise. * gnu/packages/xfig.scm (xfig, transfig)[home-page]: Likewise. * gnu/packages/xml.scm (openjade, python-pyxb, xmlstarlet, xmlrpc-c) (opensp)[home-page]: Likewise. * gnu/packages/xorg.scm (xf86-video-qxl)[home-page]: Likewise. --- gnu/packages/accessibility.scm | 2 +- gnu/packages/admin.scm | 4 +- gnu/packages/algebra.scm | 10 ++-- gnu/packages/apr.scm | 4 +- gnu/packages/aspell.scm | 2 +- gnu/packages/astronomy.scm | 8 +-- gnu/packages/audio.scm | 36 ++++++------ gnu/packages/authentication.scm | 2 +- gnu/packages/backup.scm | 2 +- gnu/packages/bioconductor.scm | 8 +-- gnu/packages/bioinformatics.scm | 46 +++++++-------- gnu/packages/build-tools.scm | 2 +- gnu/packages/cdrom.scm | 8 +-- gnu/packages/check.scm | 6 +- gnu/packages/chemistry.scm | 2 +- gnu/packages/chez.scm | 2 +- gnu/packages/code.scm | 8 +-- gnu/packages/compression.scm | 2 +- gnu/packages/cran.scm | 108 ++++++++++++++++++------------------ gnu/packages/crates-io.scm | 20 +++---- gnu/packages/crypto.scm | 4 +- gnu/packages/curl.scm | 2 +- gnu/packages/databases.scm | 18 +++--- gnu/packages/debian.scm | 2 +- gnu/packages/debug.scm | 2 +- gnu/packages/disk.scm | 6 +- gnu/packages/django.scm | 2 +- gnu/packages/djvu.scm | 4 +- gnu/packages/dns.scm | 2 +- gnu/packages/docbook.scm | 4 +- gnu/packages/documentation.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/electronics.scm | 2 +- gnu/packages/emacs-xyz.scm | 44 +++++++-------- gnu/packages/embedded.scm | 2 +- gnu/packages/engineering.scm | 8 +-- gnu/packages/erlang.scm | 2 +- gnu/packages/file-systems.scm | 4 +- gnu/packages/finance.scm | 2 +- gnu/packages/flashing-tools.scm | 4 +- gnu/packages/fltk.scm | 2 +- gnu/packages/fonts.scm | 6 +- gnu/packages/fontutils.scm | 6 +- gnu/packages/fpga.scm | 8 +-- gnu/packages/freedesktop.scm | 2 +- gnu/packages/ftp.scm | 2 +- gnu/packages/game-development.scm | 12 ++-- gnu/packages/games.scm | 58 +++++++++---------- gnu/packages/geo.scm | 4 +- gnu/packages/gl.scm | 4 +- gnu/packages/gnome.scm | 10 ++-- gnu/packages/gnustep.scm | 6 +- gnu/packages/graph.scm | 2 +- gnu/packages/graphics.scm | 10 ++-- gnu/packages/graphviz.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/haskell-apps.scm | 2 +- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-web.scm | 8 +-- gnu/packages/haskell-xyz.scm | 46 +++++++-------- gnu/packages/hexedit.scm | 4 +- gnu/packages/hunspell.scm | 2 +- gnu/packages/image-processing.scm | 2 +- gnu/packages/image-viewers.scm | 8 +-- gnu/packages/image.scm | 14 ++--- gnu/packages/java-bootstrap.scm | 4 +- gnu/packages/java-xml.scm | 6 +- gnu/packages/java.scm | 36 ++++++------ gnu/packages/jemalloc.scm | 2 +- gnu/packages/julia-xyz.scm | 2 +- gnu/packages/kde-internet.scm | 2 +- gnu/packages/kde-systemtools.scm | 4 +- gnu/packages/kodi.scm | 2 +- gnu/packages/language.scm | 4 +- gnu/packages/lego.scm | 2 +- gnu/packages/lesstif.scm | 2 +- gnu/packages/libcanberra.scm | 2 +- gnu/packages/libdaemon.scm | 2 +- gnu/packages/libffi.scm | 2 +- gnu/packages/libreoffice.scm | 6 +- gnu/packages/libusb.scm | 4 +- gnu/packages/linux.scm | 16 +++--- gnu/packages/lisp-check.scm | 4 +- gnu/packages/lisp-xyz.scm | 28 +++++----- gnu/packages/lisp.scm | 6 +- gnu/packages/logging.scm | 2 +- gnu/packages/lua.scm | 4 +- gnu/packages/machine-learning.scm | 6 +- gnu/packages/mail.scm | 10 ++-- gnu/packages/man.scm | 4 +- gnu/packages/maths.scm | 28 +++++----- gnu/packages/mcrypt.scm | 6 +- gnu/packages/minetest.scm | 2 +- gnu/packages/monitoring.scm | 6 +- gnu/packages/mp3.scm | 10 ++-- gnu/packages/multiprecision.scm | 2 +- gnu/packages/music.scm | 34 ++++++------ gnu/packages/ncurses.scm | 2 +- gnu/packages/netpbm.scm | 2 +- gnu/packages/networking.scm | 12 ++-- gnu/packages/node-xyz.scm | 2 +- gnu/packages/ntp.scm | 2 +- gnu/packages/ocaml.scm | 12 ++-- gnu/packages/opencl.scm | 2 +- gnu/packages/package-management.scm | 4 +- gnu/packages/parallel.scm | 2 +- gnu/packages/pdf.scm | 8 +-- gnu/packages/perl.scm | 4 +- gnu/packages/photo.scm | 6 +- gnu/packages/plan9.scm | 2 +- gnu/packages/plotutils.scm | 4 +- gnu/packages/popt.scm | 4 +- gnu/packages/profiling.scm | 4 +- gnu/packages/pulseaudio.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-web.scm | 4 +- gnu/packages/python-xyz.scm | 40 ++++++------- gnu/packages/qt.scm | 6 +- gnu/packages/radio.scm | 4 +- gnu/packages/raspberry-pi.scm | 2 +- gnu/packages/rdf.scm | 6 +- gnu/packages/regex.scm | 2 +- gnu/packages/rsync.scm | 2 +- gnu/packages/ruby.scm | 16 +++--- gnu/packages/scheme.scm | 6 +- gnu/packages/screen.scm | 2 +- gnu/packages/scsi.scm | 2 +- gnu/packages/sdl.scm | 4 +- gnu/packages/shellutils.scm | 4 +- gnu/packages/simulation.scm | 2 +- gnu/packages/smalltalk.scm | 2 +- gnu/packages/speech.scm | 2 +- gnu/packages/stalonetray.scm | 2 +- gnu/packages/statistics.scm | 44 +++++++-------- gnu/packages/swig.scm | 2 +- gnu/packages/task-management.scm | 2 +- gnu/packages/tcl.scm | 6 +- gnu/packages/terminals.scm | 8 +-- gnu/packages/tex.scm | 12 ++-- gnu/packages/text-editors.scm | 2 +- gnu/packages/textutils.scm | 4 +- gnu/packages/tv.scm | 2 +- gnu/packages/unicode.scm | 2 +- gnu/packages/upnp.scm | 2 +- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 30 +++++----- gnu/packages/virtualization.scm | 2 +- gnu/packages/w3m.scm | 2 +- gnu/packages/web.scm | 18 +++--- gnu/packages/wm.scm | 4 +- gnu/packages/wv.scm | 2 +- gnu/packages/wxwidgets.scm | 2 +- gnu/packages/xdisorg.scm | 4 +- gnu/packages/xfig.scm | 4 +- gnu/packages/xml.scm | 10 ++-- gnu/packages/xorg.scm | 2 +- 157 files changed, 614 insertions(+), 614 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 21387ff0d4..3613bd8c45 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -230,7 +230,7 @@ incorporated.") libnotify)) (native-inputs (list gettext-minimal intltool pkg-config)) - (home-page "http://florence.sourceforge.net/") + (home-page "https://florence.sourceforge.net/") (synopsis "Extensible, scalable virtual keyboard for X11") (description "Florence is an extensible scalable virtual keyboard for X11. diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d4cc8ca6ca..2d70a13511 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1163,7 +1163,7 @@ ONC RPC numbers.") (let ((out (assoc-ref %outputs "out"))) (list (string-append "--mandir=" out "/share/man") (string-append "--infodir=" out "/share/info"))))) - (home-page "http://netcat.sourceforge.net") + (home-page "https://netcat.sourceforge.net") (synopsis "Read and write data over TCP/IP") (description "Netcat is a featured networking utility which reads and writes data @@ -1280,7 +1280,7 @@ IPv6, proxies, and Unix sockets.") "1gpvd2kjyhs18sh6sga5bk9wj8s78blfd4c0m38r0wl92jx2yv1b")))))) (inputs (list ncurses)) - (home-page "http://nmon.sourceforge.net/") + (home-page "https://nmon.sourceforge.net/") (synopsis "Monitor system performance in a terminal or to a @file{.csv} log file") (description diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 91de046a08..c3414a3f57 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -103,7 +103,7 @@ implement the floating point approach to complex multiplication are implemented. On the other hand, these comprise asymptotically fast multiplication routines such as Toom–Cook and the FFT.") (license license:lgpl3+) - (home-page "http://www.multiprecision.org/mpfrcx/"))) + (home-page "https://www.multiprecision.org/mpfrcx/"))) (define-public gf2x (package @@ -153,7 +153,7 @@ multiplication via floating point approximations. It consists of libraries that can be called from within a C program and of executable command line applications.") (license license:gpl3+) - (home-page "http://www.multiprecision.org/cm/"))) + (home-page "https://www.multiprecision.org/cm/"))) (define-public fplll (package @@ -464,7 +464,7 @@ GCDs, factoring, solving linear systems, and evaluating special functions. In addition, FLINT provides various low-level routines for fast arithmetic.") (license license:lgpl2.1+) - (home-page "http://flintlib.org/") + (home-page "https://flintlib.org/") (properties '((release-monitoring-url . "http://flintlib.org/downloads.html"))))) @@ -768,7 +768,7 @@ a C program.") ;; different machine. "ax_cv_c_flags__mtune_native=no"))) (native-inputs (list perl)) - (home-page "http://fftw.org") + (home-page "https://fftw.org") (synopsis "Computing the discrete Fourier transform") (description "FFTW is a C subroutine library for computing the discrete Fourier @@ -1776,7 +1776,7 @@ no more than about 20 bits long).") "0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn")))) (properties `((upstream-name . "dtt"))) (build-system r-build-system) - (home-page "http://www.r-project.org") + (home-page "https://www.r-project.org") (synopsis "Discrete Trigonometric Transforms") (description "This package provides functions for 1D and 2D Discrete Cosine Transform diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index 3b4968089b..aedddd8644 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -49,7 +49,7 @@ '(#:parallel-build? #f #:parallel-tests? #f)) (inputs (list perl libltdl)) - (home-page "http://apr.apache.org/") + (home-page "https://apr.apache.org/") (synopsis "The Apache Portable Runtime Library") (description "The mission of the Apache Portable Runtime (APR) project is to create and @@ -96,7 +96,7 @@ around or take advantage of platform-specific deficiencies or features.") ;; to run it. See ;; . #:parallel-tests? #f)) - (home-page "http://apr.apache.org/") + (home-page "https://apr.apache.org/") (synopsis "One of the Apache Portable Runtime Library companions") (description "APR-util provides a number of helpful abstractions on top of APR.") diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 18d19027a4..0f9a07895d 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -310,7 +310,7 @@ dictionaries, including personal ones.") "aspell6-it-" version ".tar.bz2")) (hash (content-hash sha256)))) (home-page - "http://linguistico.sourceforge.net/pages/dizionario_italiano.html")))) + "https://linguistico.sourceforge.net/pages/dizionario_italiano.html")))) (define-public aspell-dict-mi (aspell-dictionary "mi" "Maori" diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5cee981671..02d6dc0aa1 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -350,7 +350,7 @@ wide set of telescopes.") python python-numpy wcslib)) - (home-page "http://casacore.github.io/casacore/") + (home-page "https://casacore.github.io/casacore/") (synopsis "Suite of C++ libraries for radio astronomy data processing") (description "The casacore package contains the core libraries of the old @@ -654,7 +654,7 @@ programs for the manipulation and analysis of astronomical data.") (inputs `(("openblas" ,openblas) ("fftw" ,fftwf))) - (home-page "http://www.astromatic.net/software/sextractor") + (home-page "https://www.astromatic.net/software/sextractor") (synopsis "Extract catalogs of sources from astronomical images") (description "SExtractor is a program that builds a catalogue of objects from an @@ -1708,7 +1708,7 @@ elevation, solar azimuth, rahukaalam, and the phases of the moon.") (synopsis "Celestial mechanics, astrometry and astrodynamics library") (description "Libnova is a general purpose, double precision, Celestial Mechanics, Astrometry and Astrodynamics library.") - (home-page "http://libnova.sourceforge.net/") + (home-page "https://libnova.sourceforge.net/") (license (list license:lgpl2.0+ license:gpl2+)))) ; examples/transforms.c & lntest/*.c @@ -1914,7 +1914,7 @@ on FITS files: (string-append "CPPFLAGS=-I" netpbm "/include/netpbm") ;; no nasa jpl cspice support "--without-cspice" ))))) - (home-page "http://xplanet.sourceforge.net/") + (home-page "https://xplanet.sourceforge.net/") (synopsis "Planetary body renderer") (description "Xplanet renders an image of a planet into an X window or file. diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 124593c67b..ffb972175e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -502,7 +502,7 @@ by MusicIP.") (description "LibTiMidity is a MIDI to WAVE converter library that uses Gravis Ultrasound-compatible patch files to generate digital audio data from General MIDI files.") - (home-page "http://libtimidity.sourceforge.net/") + (home-page "https://libtimidity.sourceforge.net/") (license ;; This project is dual-licensed. ;; Either of the following licenses can be exercised. @@ -573,7 +573,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband qtbase-5)) (native-inputs (list pkg-config qttools-5)) - (home-page "http://alsamodular.sourceforge.net/") + (home-page "https://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") (description "AlsaModularSynth is a digital implementation of a classical analog @@ -1132,7 +1132,7 @@ formant warp.") (list gtkmm-2 jack-2 lvtk)) (native-inputs (list pkg-config)) - (home-page "http://ll-plugins.nongnu.org/azr3/") + (home-page "https://ll-plugins.nongnu.org/azr3/") (synopsis "Tonewheel organ synthesizer") (description "AZR-3 is a port of the free VST plugin AZR-3. It is a tonewheel organ @@ -1488,7 +1488,7 @@ formats used to store information about DJ record libraries.") bison sed grep)) - (home-page "http://taopm.sourceforge.net/") + (home-page "https://taopm.sourceforge.net/") (synopsis "Sound Synthesis with Physical Models") (description "Tao is a software package for sound synthesis using physical models. It provides a virtual acoustic material constructed from masses and @@ -2159,7 +2159,7 @@ also play midifiles using a Soundfont.") #t)))) (native-inputs (list tar bzip2)) - (home-page "http://freepats.zenvoid.org") + (home-page "https://freepats.zenvoid.org") (synopsis "GUS compatible patches for MIDI players") (description "FreePats is a project to create a free and open set of GUS compatible @@ -2313,7 +2313,7 @@ auto-wah.") libsndfile libsamplerate zlib)) - (home-page "http://rakarrack.sourceforge.net/") + (home-page "https://rakarrack.sourceforge.net/") (synopsis "Audio effects processor") (description "Rakarrack is a richly featured multi-effects processor emulating a @@ -2752,7 +2752,7 @@ with applications that support them (e.g. PulseAudio).") `(;; liblo test FAILED ;; liblo server error 19 in setsockopt(IP_ADD_MEMBERSHIP): No such device #:tests? #f)) - (home-page "http://liblo.sourceforge.net") + (home-page "https://liblo.sourceforge.net") (synopsis "Implementation of the Open Sound Control protocol") (description "liblo is a lightweight library that provides an easy to use @@ -3522,7 +3522,7 @@ using Guix System.") (list pkg-config)) (inputs (list libogg libtheora libvorbis speex)) - (home-page "http://idjc.sourceforge.net/") + (home-page "https://idjc.sourceforge.net/") (synopsis "Broadcast streaming library with IDJC extensions") (description "This package provides libshout plus IDJC extensions.") ;; GNU Library (not Lesser) General Public License. @@ -3758,7 +3758,7 @@ for loudness normalisation.") freepats)) (native-inputs (list pkg-config)) - (home-page "http://timidity.sourceforge.net/") + (home-page "https://timidity.sourceforge.net/") (synopsis "Software synthesizer for playing MIDI files") (description "TiMidity++ is a software synthesizer. It can play MIDI files by @@ -3843,7 +3843,7 @@ analysis plugins or audio feature extraction plugins.") "/ar-lib")) "ar-lib") #t))))) - (home-page "http://sbsms.sourceforge.net/") + (home-page "https://sbsms.sourceforge.net/") (synopsis "Library for time stretching and pitch scaling of audio") (description "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time @@ -3921,7 +3921,7 @@ encode and decode wavpack files.") (base32 "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25")))) (build-system gnu-build-system) - (home-page "http://modplug-xmms.sourceforge.net/") + (home-page "https://modplug-xmms.sourceforge.net/") (synopsis "Mod file playing library") (description "Libmodplug renders mod music files as raw audio data, for playing or @@ -3942,7 +3942,7 @@ surround and reverb.") (base32 "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m")))) (build-system gnu-build-system) - (home-page "http://xmp.sourceforge.net/") + (home-page "https://xmp.sourceforge.net/") (synopsis "Module player library") (description "Libxmp is a library that renders module files to PCM data. It supports @@ -3966,7 +3966,7 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).") (list pkg-config)) (inputs (list libxmp pulseaudio)) - (home-page "http://xmp.sourceforge.net/") + (home-page "https://xmp.sourceforge.net/") (synopsis "Extended module player") (description "Xmp is a portable module player that plays over 90 mainstream and @@ -4030,7 +4030,7 @@ control functionality, or just for playing around with the sound effects.") libpng libvorbis pulseaudio)) - (home-page "http://sox.sourceforge.net") + (home-page "https://sox.sourceforge.net") (synopsis "Sound processing utility") (description "SoX (Sound eXchange) is a command line utility that can convert @@ -4527,7 +4527,7 @@ with support for HD extensions.") '(modify-phases %standard-phases (delete 'configure)))) (inputs (list fftw)) - (home-page "http://drc-fir.sourceforge.net/") + (home-page "https://drc-fir.sourceforge.net/") (synopsis "Digital room correction") (description "DRC is a program used to generate correction filters for acoustic @@ -4653,7 +4653,7 @@ code, used in @code{libtoxcore}.") (synopsis "GSM 06.10 lossy speech compression library") (description "This C library provides an encoder and a decoder for the GSM 06.10 RPE-LTP lossy speech compression algorithm.") - (home-page "http://quut.com/gsm/") + (home-page "https://quut.com/gsm/") (license (license:non-copyleft "file://COPYRIGHT")))) (define-public python-pyalsaaudio @@ -5172,7 +5172,7 @@ developing fully accurate DirectX Audio runtime libraries.") (list alsa-lib gtk+-2 libsndfile portaudio)) (native-inputs (list pkg-config)) - (home-page "http://gnaural.sourceforge.net/") + (home-page "https://gnaural.sourceforge.net/") (synopsis "Binaural beat synthesizer") (description "Gnaural is a programmable auditory binaural beat synthesizer intended to be used for brainwave entrainment. Gnaural supports creation of @@ -6162,7 +6162,7 @@ managed by PipeWire.") (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list faad2 glib libmad libvorbis)) - (home-page "http://streamripper.sourceforge.net") + (home-page "https://streamripper.sourceforge.net") (synopsis "Record audio streams to your hard drive") (description "Streamripper records shoutcast-compatible streams. For shoutcast style streams it finds the “meta data” or track diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index d9dd6fac3d..a73f2cbc14 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -161,7 +161,7 @@ YubiKey into your existing user authentication infrastructure.") (list pkg-config)) (inputs (list linux-pam)) - (home-page "http://pamtester.sourceforge.net/") + (home-page "https://pamtester.sourceforge.net/") (synopsis "Utility for testing pluggable authentication modules (PAM) facility") (description "Pamtester is a tiny utility program to test the pluggable authentication diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 8a25d0d116..7be0c813bb 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1370,7 +1370,7 @@ archives.") (native-inputs (list intltool pkg-config)) (inputs (list gtk+)) (propagated-inputs (list rsync)) - (home-page "http://www.opbyte.it/grsync/") + (home-page "https://www.opbyte.it/grsync/") (synopsis "GTK frontend for rsync") (description "Grsync is a simple graphical interface using GTK for the @command{rsync} diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4b5ec7db28..bc3bd8c930 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4747,7 +4747,7 @@ mapping.") r-stringr)) (native-inputs (list r-knitr)) - (home-page "http://renozao.github.io/NMF") + (home-page "https://renozao.github.io/NMF") (synopsis "Algorithms and framework for nonnegative matrix factorization") (description "This package provides a framework to perform Non-negative Matrix @@ -5898,7 +5898,7 @@ global-scaling and full-quantile normalization.") (build-system r-build-system) (propagated-inputs (list r-limma r-locfit r-rcpp)) - (home-page "http://bioinf.wehi.edu.au/edgeR") + (home-page "https://bioinf.wehi.edu.au/edgeR") (synopsis "EdgeR does empirical analysis of digital gene expression data") (description "This package can do differential expression analysis of RNA-seq expression profiles with biological replication. It implements a range @@ -6525,7 +6525,7 @@ Binomial data via estimation of latent structure in the natural parameter.") (base32 "1jy75nbkhl0kgv4gw88acx58r9f1kywrd36405x6g05xy05bprma")))) (build-system r-build-system) - (home-page "http://bioinf.wehi.edu.au/limma") + (home-page "https://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") (description "This package can be used for the analysis of gene expression studies, especially the use of linear models for analysing designed experiments @@ -9735,7 +9735,7 @@ in omics data.") (build-system r-build-system) (propagated-inputs (list r-biobase r-mass)) - (home-page "http://www.genopolis.it") + (home-page "https://www.genopolis.it") (synopsis "Detect differential expression in microarray and proteomics datasets") (description "The Power Law Global Error Model (PLGEM) has been shown to faithfully diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9470e6eb1a..b5d132749f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1576,7 +1576,7 @@ use-case, we encourage users to compose functions to achieve their goals.") python-scipy)) (native-inputs (list python-cython python-pytest python-pytest-cov python-nose)) - (home-page "http://www.biom-format.org") + (home-page "https://www.biom-format.org") (synopsis "Biological Observation Matrix (BIOM) format utilities") (description "The BIOM file format is designed to be a general-use format for @@ -2503,7 +2503,7 @@ errors at the end of reads.") ("python" ,python-wrapper))) (native-inputs (list perl perl-clone perl-test-deep perl-test-simple)) - (home-page "http://bowtie-bio.sourceforge.net/bowtie2/index.shtml") + (home-page "https://bowtie-bio.sourceforge.net/bowtie2/index.shtml") (synopsis "Fast and sensitive nucleotide sequence read aligner") (description "Bowtie 2 is a fast and memory-efficient tool for aligning sequencing @@ -2545,7 +2545,7 @@ gapped, local, and paired-end alignment modes.") (inputs (list python-wrapper tbb-2020 zlib)) (supported-systems '("x86_64-linux")) - (home-page "http://bowtie-bio.sourceforge.net/index.shtml") + (home-page "https://bowtie-bio.sourceforge.net/index.shtml") (synopsis "Fast aligner for short nucleotide sequence reads") (description "Bowtie is a fast, memory-efficient short read aligner. It aligns short @@ -2666,7 +2666,7 @@ splice junctions between exons.") ;; Non-portable SSE instructions are used so building fails on platforms ;; other than x86_64. (supported-systems '("x86_64-linux")) - (home-page "http://bio-bwa.sourceforge.net/") + (home-page "https://bio-bwa.sourceforge.net/") (synopsis "Burrows-Wheeler sequence aligner") (description "BWA is a software package for mapping low-divergent sequences against a @@ -3259,7 +3259,7 @@ time.") zlib)) (native-inputs (list python-cython python-nose)) - (home-page "http://crossmap.sourceforge.net/") + (home-page "https://crossmap.sourceforge.net/") (synopsis "Convert genome coordinates between assemblies") (description "CrossMap is a program for conversion of genome coordinates or annotation @@ -4883,7 +4883,7 @@ high-throughput sequencing (HTS) assays") ("java-xz" ,java-xz))) (native-inputs (list java-testng)) - (home-page "http://samtools.github.io/htsjdk/") + (home-page "https://samtools.github.io/htsjdk/") (synopsis "Java API for high-throughput sequencing data (HTS) formats") (description "HTSJDK is an implementation of a unified Java library for accessing @@ -4926,7 +4926,7 @@ manipulating HTS data.") ("java-xz" ,java-xz))) (native-inputs (list java-junit)) - (home-page "http://samtools.github.io/htsjdk/") + (home-page "https://samtools.github.io/htsjdk/") (synopsis "Java API for high-throughput sequencing data (HTS) formats") (description "HTSJDK is an implementation of a unified Java library for accessing @@ -5031,7 +5031,7 @@ manipulating HTS data.") (list java-htsjdk java-guava)) (native-inputs (list java-testng)) - (home-page "http://broadinstitute.github.io/picard/") + (home-page "https://broadinstitute.github.io/picard/") (synopsis "Tools for manipulating high-throughput sequencing data and formats") (description "Picard is a set of Java command line tools for manipulating high-throughput sequencing (HTS) data and formats. Picard is implemented @@ -5120,7 +5120,7 @@ Class-Path: /~a \ (list java-htsjdk-2.10.1)) (native-inputs (list java-testng java-guava)) - (home-page "http://broadinstitute.github.io/picard/") + (home-page "https://broadinstitute.github.io/picard/") (synopsis "Tools for manipulating high-throughput sequencing data and formats") (description "Picard is a set of Java command line tools for manipulating high-throughput sequencing (HTS) data and formats. Picard is implemented @@ -5719,7 +5719,7 @@ data.") tar wget zlib)) - (home-page "http://kaiju.binf.ku.dk/") + (home-page "https://kaiju.binf.ku.dk/") (synopsis "Fast and sensitive taxonomic classification for metagenomics") (description "Kaiju is a program for sensitive taxonomic classification of high-throughput sequencing reads from metagenomic whole genome sequencing @@ -6235,7 +6235,7 @@ predicts the locations of structural units in the sequences.") ("openblas" ,openblas))) (native-inputs (list which)) - (home-page "http://www.bioinf.uni-leipzig.de/Software/proteinortho") + (home-page "https://www.bioinf.uni-leipzig.de/Software/proteinortho") (synopsis "Detect orthologous genes across species") (description "Proteinortho is a tool to detect orthologous genes across different @@ -6510,7 +6510,7 @@ phylogenies.") "rsem-run-prsem-testing-procedure")))))))) (inputs (list boost r-minimal perl htslib-1.3 zlib)) - (home-page "http://deweylab.biostat.wisc.edu/rsem/") + (home-page "https://deweylab.biostat.wisc.edu/rsem/") (synopsis "Estimate gene expression levels from RNA-Seq data") (description "RSEM is a software package for estimating gene and isoform expression @@ -6545,7 +6545,7 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.") zlib)) (native-inputs (list python-nose)) - (home-page "http://rseqc.sourceforge.net/") + (home-page "https://rseqc.sourceforge.net/") (synopsis "RNA-seq quality control package") (description "RSeQC provides a number of modules that can comprehensively evaluate @@ -6605,7 +6605,7 @@ distribution, coverage uniformity, strand specificity, etc.") ("readline" ,readline))) (native-inputs (list pkg-config)) - (home-page "http://seek.princeton.edu") + (home-page "https://seek.princeton.edu") (synopsis "Gene co-expression search engine") (description "SEEK is a computational gene co-expression search engine. SEEK provides @@ -6646,7 +6646,7 @@ to the user's query of interest.") (native-inputs (list pkg-config)) (inputs (list htslib ncurses perl python zlib)) - (home-page "http://samtools.sourceforge.net") + (home-page "https://samtools.sourceforge.net") (synopsis "Utilities to efficiently manipulate nucleotide sequence alignments") (description "Samtools implements various utilities for post-processing nucleotide @@ -7724,7 +7724,7 @@ optionally compressed by gzip.") (install-file "SNAPCommand" bin))))))) (native-inputs (list zlib)) - (home-page "http://snap.cs.berkeley.edu/") + (home-page "https://snap.cs.berkeley.edu/") (synopsis "Short read DNA sequence aligner") (description "SNAP is a fast and accurate aligner for short DNA reads. It is @@ -7991,7 +7991,7 @@ sequences.") ;; no "configure" script (delete 'configure)))) (inputs (list zlib)) - (home-page "http://subread.sourceforge.net/") + (home-page "https://subread.sourceforge.net/") (synopsis "Tool kit for processing next-gen sequencing data") (description "The subread package contains the following tools: subread aligner, a @@ -8038,7 +8038,7 @@ against local background noises.") (install-file "stringtie" bin))))))) (inputs (list bzip2 htslib-for-stringtie libdeflate zlib)) - (home-page "http://ccb.jhu.edu/software/stringtie/") + (home-page "https://ccb.jhu.edu/software/stringtie/") (synopsis "Transcript assembly and quantification for RNA-Seq data") (description "StringTie is a fast and efficient assembler of RNA-Seq sequence @@ -9152,7 +9152,7 @@ of contact distributions around selected landmarks.") (base32 "1hsx6qgwr0i67fhy9257zj7s0ppncph2hjgbia5nn6nfmj0ax6l9")))) (build-system r-build-system) - (home-page "http://centipede.uchicago.edu/") + (home-page "https://centipede.uchicago.edu/") (synopsis "Predict transcription factor binding sites") (description "CENTIPEDE applies a hierarchical Bayesian mixture model to infer regions @@ -9390,7 +9390,7 @@ experience substantial biological insertions and deletions.") perl-getopt-long perl-json perl-statistics-pca)) - (home-page "http://prinseq.sourceforge.net/") + (home-page "https://prinseq.sourceforge.net/") (synopsis "Preprocess sequence data in FASTA or FASTQ formats") (description "PRINSEQ is a bioinformatics tool to help you preprocess your genomic or @@ -9875,7 +9875,7 @@ AM_CONDITIONAL(AMPNG, true)")) zlib)) (native-inputs (list autoconf automake libtool pkg-config)) - (home-page "http://emboss.sourceforge.net") + (home-page "https://emboss.sourceforge.net") (synopsis "Molecular biology analysis suite") (description "EMBOSS is the \"European Molecular Biology Open Software Suite\". EMBOSS is an analysis package specially developed for the needs of @@ -10552,7 +10552,7 @@ remove biased methylation positions for RRBS sequence files.") (for-each (lambda (file) (install-file file target)) (find-files "../exe" ".*")))))))) - (home-page "http://evolution.genetics.washington.edu/phylip/") + (home-page "https://evolution.genetics.washington.edu/phylip/") (synopsis "Tools for inferring phylogenies") (description "PHYLIP (the PHYLogeny Inference Package) is a package of programs for inferring phylogenies (evolutionary trees).") @@ -16831,7 +16831,7 @@ The output is in SAM format.") (list libxml2)) (native-inputs (list check swig)) - (home-page "http://sbml.org/Software/libSBML") + (home-page "https://sbml.org/Software/libSBML") (synopsis "Process SBML files and data streams") (description "LibSBML is a library to help you read, write, manipulate, translate, and validate SBML files and data streams. The @dfn{Systems Biology diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 00b8f8caf3..28ab77bbb4 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -661,7 +661,7 @@ software.") sqlite)) (native-inputs (list pkg-config)) - (home-page "http://gittup.org/tup/") + (home-page "https://gittup.org/tup/") (synopsis "Fast build system that's hard to get wrong") (description "Tup is a generic build system based on a directed acyclic graphs of commands to be executed. Tup instruments your build to detect the diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b544f0e59d..cfb2b6b686 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -87,7 +87,7 @@ "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; tests rely on access to external servers - (home-page "http://libcddb.sourceforge.net/") + (home-page "https://libcddb.sourceforge.net/") (synopsis "C library to access data on a CDDB server") (description "Libcddb is a C library to access data on a CDDB server (freedb.org). It @@ -281,7 +281,7 @@ reconstruction capability.") (list autoconf automake pkg-config)) (inputs (list ao lame libmad libvorbis)) - (home-page "http://cdrdao.sourceforge.net") + (home-page "https://cdrdao.sourceforge.net") (synopsis "Read and write CDs in disk-at-once mode") (description "cdrdao records audio or data CDs in disk-at-once (DAO) mode, based on a textual description of the contents. This mode writes the complete @@ -350,7 +350,7 @@ CD's, DVD's or Blue Ray discs. The most important components are @command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper which uses libparanoia, and @command{mkisofs}, which can create various disc images.") - (home-page "http://cdrtools.sourceforge.net/private/cdrecord.html") + (home-page "https://cdrtools.sourceforge.net/private/cdrecord.html") ;; mkisofs is GPL, the other programs are CDDL. (license (list cddl1.0 gpl2)))) @@ -573,7 +573,7 @@ the data.") (package (name "cd-discid") (version "1.4") - (home-page "http://linukz.org/cd-discid.shtml") + (home-page "https://linukz.org/cd-discid.shtml") (source (origin (method url-fetch) (uri (string-append "http://linukz.org/download/cd-discid-" diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f6553a27bf..0866558ac2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -355,7 +355,7 @@ testing of Unix command lines.") (lambda _ (invoke "autoreconf" "-vfi")))))) (native-inputs (list automake autoconf libtool)) - (home-page "http://cunit.sourceforge.net/") + (home-page "https://cunit.sourceforge.net/") (synopsis "Automated testing framework for C") (description "CUnit is a lightweight system for writing, administering, and running @@ -1119,7 +1119,7 @@ available via the @code{unittest.mock} module.") (add-after 'unpack 'invoke-2to3 (lambda _ (invoke "2to3" "-w" ".")))))) - (home-page "http://readthedocs.org/docs/nose/") + (home-page "https://readthedocs.org/docs/nose/") (synopsis "Python testing library") (description "Nose extends the unittest library to make testing easier.") @@ -3101,7 +3101,7 @@ retried.") (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "pytest" "-vv")))))) - (home-page "http://hamcrest.org/") + (home-page "https://hamcrest.org/") (synopsis "Hamcrest matchers for Python") (description "PyHamcrest is a framework for writing matcher objects, allowing you to declaratively define \"match\" rules.") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 529d013f3d..3c6d47464a 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -424,7 +424,7 @@ stored with user-specified precision.") perl tinyxml2 tng)) - (home-page "http://www.gromacs.org/") + (home-page "https://www.gromacs.org/") (synopsis "Molecular dynamics software package") (description "GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 0b3c813658..c6420a980e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -1238,7 +1238,7 @@ syntax, with various aliases for commonly used patterns.") (replace 'install (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "chez-install" make-flags)))))) - (home-page "http://synthcode.com/scheme/fmt") + (home-page "https://synthcode.com/scheme/fmt") (synopsis "Combinator formatting library for Chez Scheme") (description "This package provides a library of procedures for formatting Scheme objects to text in various ways, and for easily diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index e8bc0e4307..88c251f770 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -580,7 +580,7 @@ stack traces.") `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) #t))))) (inputs (list perl perl-io-compress perl-json)) - (home-page "http://ltp.sourceforge.net/coverage/lcov.php") + (home-page "https://ltp.sourceforge.net/coverage/lcov.php") (synopsis "Code coverage tool that enhances GNU gcov") (description "LCOV is an extension of @command{gcov}, a tool part of the GNU@tie{}Binutils, which provides information about what parts of a program @@ -809,7 +809,7 @@ independent targets.") (install-file l etcdir)) (find-files "etc" "\\.cfg$"))) #t))))) - (home-page "http://uncrustify.sourceforge.net/") + (home-page "https://uncrustify.sourceforge.net/") (synopsis "Code formatter for C and other related languages") (description "Beautify source code in many languages of the C family (C, C++, C#, @@ -875,7 +875,7 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: (make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3 (find-files libdir "lib.*\\.so\\..*"))) #t))))) - (home-page "http://astyle.sourceforge.net/") + (home-page "https://astyle.sourceforge.net/") (synopsis "Source code indenter, formatter, and beautifier") (description "Artistic Style is a source code indenter, formatter, and beautifier for @@ -1076,7 +1076,7 @@ Readline library.") ;; on SysV curses. (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses"))))) - (home-page "http://cscope.sourceforge.net") + (home-page "https://cscope.sourceforge.net") (synopsis "Tool for browsing source code") (description "Cscope is a text screen based source browsing tool. Although it is diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 42766a707a..0d14078fb7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1400,7 +1400,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to ((target-x86-32?) (list nasm)) (else '()))) - (home-page "http://p7zip.sourceforge.net/") + (home-page "https://p7zip.sourceforge.net/") (synopsis "Command-line file archiver with high compression ratio") (description "p7zip is a command-line port of 7-Zip, a file archiver that handles the 7z format which features very high compression ratios.") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c7a81b96eb..c80e98134a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -534,7 +534,7 @@ by Luis Torgo, published by CRC Press.") "05mv6xhm15b0mq9kzyiblkb14bdqmjrwl64ghdk66il0w8i7p6nh")))) (properties `((upstream-name . "emdist"))) (build-system r-build-system) - (home-page "http://www.rforge.net/emd") + (home-page "https://www.rforge.net/emd") (synopsis "Earth mover's distance") (description "This package provides tools to calculate the Earth Mover's @@ -919,7 +919,7 @@ can read and write both the metadata and the cell data in a Sheet.") (build-system r-build-system) (inputs (list proj-7 zlib)) (native-inputs (list pkg-config)) - (home-page "http://www.rforge.net/proj4/") + (home-page "https://www.rforge.net/proj4/") (synopsis "Simple interface to the PROJ.4 cartographic projections library") (description "This package provides a simple interface to lat/long projection and @@ -1484,7 +1484,7 @@ proposals for count data.") (build-system r-build-system) (propagated-inputs (list r-lattice)) - (home-page "http://zoo.R-Forge.R-project.org/") + (home-page "https://zoo.R-Forge.R-project.org/") (synopsis "S3 infrastructure for regular and irregular time series") (description "This package contains an S3 class with methods for totally ordered indexed observations. It is particularly aimed at irregular time @@ -1584,7 +1584,7 @@ in good performances with large files.") r-tidyselect)) (native-inputs (list r-knitr)) - (home-page "http://corybrunson.github.io/ggalluvial/") + (home-page "https://corybrunson.github.io/ggalluvial/") (synopsis "Alluvial plots for ggplot2") (description "This package provides alluvial plots for @code{ggplot2}. Alluvial plots use variable-width ribbons and stacked bar plots to represent @@ -1972,7 +1972,7 @@ higher.") (properties `((upstream-name . "OrgMassSpecR"))) (build-system r-build-system) (native-inputs (list r-knitr)) - (home-page "http://OrgMassSpec.github.io/") + (home-page "https://OrgMassSpec.github.io/") (synopsis "Organic or biological mass spectrometry data analysis") (description "This package @code{OrgMassSpecR} is an extension of the @code{R} @@ -2194,7 +2194,7 @@ with default R plot functions.") (list r-colorspace r-scatterplot3d)) (native-inputs (list r-knitr)) - (home-page "http://oompa.r-forge.r-project.org/") + (home-page "https://oompa.r-forge.r-project.org/") (synopsis "Qualitative palettes with many colors") (description "This package provides tools for creating, viewing, and assessing @@ -4768,7 +4768,7 @@ initiative to bring PASSTEC 2000 functionalities to R.") r-mvtnorm r-rpart r-survival)) - (home-page "http://partykit.R-Forge.R-project.org/partykit") + (home-page "https://partykit.R-Forge.R-project.org/partykit") (synopsis "Toolkit for recursive partytioning") (description "This package provides a toolkit with infrastructure for representing, @@ -4937,7 +4937,7 @@ value for each cluster in a dendrogram.") (sha256 (base32 "0inmnmi0pqmbqnl00d5yal1bmd7awigxd7sgzjsil9c1k55f4r8y")))) (build-system r-build-system) - (home-page "http://www.rcpp.org") + (home-page "https://www.rcpp.org") (synopsis "Seamless R and C++ integration") (description "The Rcpp package provides R functions as well as C++ classes which offer @@ -5370,7 +5370,7 @@ any subsequent lookup as it keeps the hash table in memory.") "0krwxq4985x3n5mzx8i9smwpkd5sifbfgy9z7ikwk84734km683j")))) (build-system r-build-system) (propagated-inputs (list r-bit)) - (home-page "http://ff.r-forge.r-project.org/") + (home-page "https://ff.r-forge.r-project.org/") (synopsis "Memory-efficient storage of large data on disk and access functions") (description "This package provides data structures that are stored on disk but @@ -6046,7 +6046,7 @@ classes in the @code{stats4} package.") (build-system r-build-system) (propagated-inputs (list r-bbmle r-coda r-lattice r-mass r-plyr)) - (home-page "http://www.math.mcmaster.ca/bolker/emdbook") + (home-page "https://www.math.mcmaster.ca/bolker/emdbook") (synopsis "Support functions and data for \"Ecological Models and Data\"") (description "This package provides auxiliary functions and data sets for \"Ecological @@ -6125,7 +6125,7 @@ functions from LINPACK.") (list r-mass r-survival)) (native-inputs (list r-knitr)) - (home-page "http://riskassessment.r-forge.r-project.org") + (home-page "https://riskassessment.r-forge.r-project.org") (synopsis "Fitting a parametric distribution from data") (description "This package extends the @code{fitdistr} function of the MASS package @@ -6591,7 +6591,7 @@ interface to @code{PostgreSQL}, a relational database.") "1d34m2nyk7m6j2dci69bhy5mlw479xax1517j7f14pq7vhpsm9l1")))) (build-system r-build-system) (propagated-inputs (list r-lpsolve)) - (home-page "http://linprog.r-forge.r-project.org/") + (home-page "https://linprog.r-forge.r-project.org/") (synopsis "Linear programming and optimization") (description "This package can be used to solve Linear Programming / Linear @@ -6612,7 +6612,7 @@ Optimization problems by using the simplex algorithm.") (build-system r-build-system) (propagated-inputs (list r-magic r-linprog r-lpsolve r-rcpp r-rcppprogress)) - (home-page "http://geometry.r-forge.r-project.org/") + (home-page "https://geometry.r-forge.r-project.org/") (synopsis "Mesh generator and surface tessellator") (description "This package makes the qhull library available in R, in a similar manner @@ -7644,7 +7644,7 @@ phylogenies and ancestral character states.") "0vc2is1hf1g0sw92kzl8mddck264qwiqgm5q2wkcwwz65fss7mkf")))) (build-system r-build-system) (propagated-inputs (list r-proxy)) - (home-page "http://dtw.r-forge.r-project.org/") + (home-page "https://dtw.r-forge.r-project.org/") (synopsis "Dynamic Time Warping Algorithms") (description "This package provides a comprehensive implementation of @dfn{dynamic time warping} (DTW) algorithms in R. DTW computes the @@ -10280,7 +10280,7 @@ stored data and compression with the LZ4 and ZSTD compressors.") (properties `((upstream-name . "fst"))) (build-system r-build-system) (propagated-inputs (list r-fstcore r-rcpp)) - (home-page "http://www.fstpackage.org") + (home-page "https://www.fstpackage.org") (synopsis "Fast serialization of data frames") (description "The fst package for R provides a fast, easy and flexible way to @@ -11359,7 +11359,7 @@ functions.") (list jags)) (native-inputs (list pkg-config)) - (home-page "http://mcmc-jags.sourceforge.net") + (home-page "https://mcmc-jags.sourceforge.net") (synopsis "Bayesian graphical models using MCMC") (description "This package provides an R interface to the JAGS MCMC library. JAGS is @@ -12480,7 +12480,7 @@ through permutation testing.") (list r-igraph r-network)) (native-inputs (list r-knitr)) - (home-page "http://mbojan.github.io/intergraph") + (home-page "https://mbojan.github.io/intergraph") (synopsis "Coercion routines for network data objects") (description "Functions implemented in this package allow coercing (i.e. convert) @@ -12830,7 +12830,7 @@ data with multiple data types.") (build-system r-build-system) (propagated-inputs (list r-kernsmooth)) - (home-page "http://qualV.R-Forge.R-Project.org/") + (home-page "https://qualV.R-Forge.R-Project.org/") (synopsis "Qualitative Validation Methods") (description "This package provides qualitative methods for the validation of dynamic @@ -12891,7 +12891,7 @@ subsequence} (LCS) using a dynamic programming algorithm.") r-vctrs)) (native-inputs (list r-knitr)) - (home-page "http://larmarange.github.io/labelled/") + (home-page "https://larmarange.github.io/labelled/") (synopsis "Manipulating labelled data") (description "This package provides useful functions to deal with the @@ -13608,7 +13608,7 @@ console, resulting in an interactive editing environment.") r-mitools r-numderiv r-survival)) - (home-page "http://r-survey.r-forge.r-project.org/survey/") + (home-page "https://r-survey.r-forge.r-project.org/survey/") (synopsis "Analysis of complex survey samples") (description "This package provides tools for the analysis of complex survey samples. @@ -14109,7 +14109,7 @@ and permutation inference in the framework of Strasser and Weber (1999).") r-multcomp r-mvtnorm r-survival)) - (home-page "http://coin.r-forge.r-project.org") + (home-page "https://coin.r-forge.r-project.org") (synopsis "Conditional inference procedures in a permutation test framework") (description "This package provides conditional inference procedures for the general @@ -15747,7 +15747,7 @@ al. (2010) , Tabelow and Polzehl (2011) (base32 "082qj08kzyzwvjacwq0sl3xxdx6iz5hgx6q24jv1mnvx7z5xn5ry")))) (build-system r-build-system) - (home-page "http://minato.sip21c.org/msb/") + (home-page "https://minato.sip21c.org/msb/") (synopsis "Functions for medical statistics book with demographic data") (description "This package provides several utility functions for the book entitled @@ -16050,7 +16050,7 @@ Processing.") (build-system r-build-system) (propagated-inputs (list r-bh r-nlp r-rcpp r-slam r-xml2)) - (home-page "http://tm.r-forge.r-project.org/") + (home-page "https://tm.r-forge.r-project.org/") (synopsis "Text mining package") (description "This package provides a framework for text mining applications within R.") @@ -16411,7 +16411,7 @@ structure of any data type.") (base32 "028fw61n61i79fhnaqx7gmdifdpbvp3yiaq9vvfrbv4k7i84r83i")))) (build-system r-build-system) - (home-page "http://strimmerlab.org/software/corpcor/") + (home-page "https://strimmerlab.org/software/corpcor/") (synopsis "Efficient estimation of covariance and (partial) correlation") (description "This package implements a James-Stein-type shrinkage estimator for the @@ -17177,7 +17177,7 @@ limitations\" using the GNU Multiple Precision library.") (list r-gmp)) (native-inputs (list pkg-config)) - (home-page "http://rmpfr.r-forge.r-project.org/") + (home-page "https://rmpfr.r-forge.r-project.org/") (synopsis "R bindings to the MPFR library") (description "This package supports arithmetic (via S4 classes and methods) for @@ -17708,7 +17708,7 @@ covariance functions for large data sets.") (build-system r-build-system) (propagated-inputs (list r-fields r-maps)) - (home-page "http://spatialextremes.r-forge.r-project.org/") + (home-page "https://spatialextremes.r-forge.r-project.org/") (synopsis "Modelling spatial extremes") (description "This package provides tools for the statistical modelling of spatial @@ -17902,7 +17902,7 @@ covariates of each feature, making the downstream analysis easy.") "046w3xbr535c5jyd68adv42a7limxp1mv57b5w6w673w707lmw2p")))) (build-system r-build-system) (propagated-inputs (list r-corpcor)) - (home-page "http://strimmerlab.org/software/longitudinal/") + (home-page "https://strimmerlab.org/software/longitudinal/") (synopsis "Analysis of multiple time course data") (description "This package contains general data structures and functions for @@ -17926,7 +17926,7 @@ dynamical correlation and dynamical covariance.") (build-system r-build-system) (propagated-inputs (list r-corpcor r-fdrtool r-longitudinal)) - (home-page "http://strimmerlab.org/software/genenet/") + (home-page "https://strimmerlab.org/software/genenet/") (synopsis "Modeling and inferring gene networks") (description "This package analyzes gene expression (time series) data with focus on @@ -18720,7 +18720,7 @@ identifying outliers.") (propagated-inputs (list r-rcpp r-rcpparmadillo)) (native-inputs (list r-knitr)) - (home-page "http://www.perossi.org/home/bsm-1") + (home-page "https://www.perossi.org/home/bsm-1") (synopsis "Bayesian inference for marketing/micro-econometrics") (description "This package covers many important models used in marketing and @@ -19787,7 +19787,7 @@ barplots or heatmaps.") (list r-ade4 r-segmented)) (inputs (list zlib)) - (home-page "http://seqinr.r-forge.r-project.org/") + (home-page "https://seqinr.r-forge.r-project.org/") (synopsis "Biological sequences retrieval and analysis") (description "This package provides tools for exploratory data analysis and data @@ -21573,7 +21573,7 @@ repository.") (build-system r-build-system) (propagated-inputs (list r-kernsmooth r-mass)) - (home-page "http://mpm.r-forge.r-project.org") + (home-page "https://mpm.r-forge.r-project.org") (synopsis "Multivariate projection methods") (description "This is a package for exploratory graphical analysis of multivariate @@ -22212,7 +22212,7 @@ Row} (CSR) format.") r-stringi)) (native-inputs (list r-knitr)) - (home-page "http://text2vec.org") + (home-page "https://text2vec.org") (synopsis "Text mining framework for R") (description "This package provides fast and memory-friendly tools for text @@ -23594,7 +23594,7 @@ effect size.") (list r-sp)) (native-inputs (list pkg-config r-knitr)) - (home-page "http://rgdal.r-forge.r-project.org") + (home-page "https://rgdal.r-forge.r-project.org") (synopsis "Bindings for the Geospatial Data Abstraction Library") (description "This package provides bindings to the Geospatial Data Abstraction @@ -25276,7 +25276,7 @@ transcription, ...") (list libsndfile)) (propagated-inputs (list r-tuner)) - (home-page "http://rug.mnhn.fr/seewave") + (home-page "https://rug.mnhn.fr/seewave") (synopsis "Sound analysis and synthesis") (description "This package provides functions for analysing, manipulating, displaying, @@ -25846,7 +25846,7 @@ R.") r-locfit r-rcolorbrewer)) (native-inputs (list gfortran)) - (home-page "http://pkg.robjhyndman.com/hdrcde") + (home-page "https://pkg.robjhyndman.com/hdrcde") (synopsis "Highest density regions and conditional density estimation") (description "This is a package for the computation of highest density regions in one @@ -26632,7 +26632,7 @@ different conceptual parts of the algorithm.") (build-system r-build-system) (propagated-inputs (list r-mass r-minpack-lm r-rgl r-scatterplot3d)) - (home-page "http://www.maths.nottingham.ac.uk/~ild/shapes") + (home-page "https://www.maths.nottingham.ac.uk/~ild/shapes") (synopsis "Statistical shape analysis") (description "This package provides routines for the statistical analysis of landmark @@ -26748,7 +26748,7 @@ statistical shape analysis and archetypal analysis.") (propagated-inputs (list r-bh r-rcpp)) - (home-page "http://dirk.eddelbuettel.com/code/anytime.html") + (home-page "https://dirk.eddelbuettel.com/code/anytime.html") (synopsis "Converter of input to POSIXct or Date") (description "The package converts the input in any one of character, integer, numeric, @@ -27689,7 +27689,7 @@ Gibbs sampling by Xuan-Hieu Phan and co-authors.") r-rcpparmadillo r-slam r-stringr)) - (home-page "http://www.structuraltopicmodel.com/") + (home-page "https://www.structuraltopicmodel.com/") (synopsis "Estimation of the Structural Topic Model") (description "The @dfn{Structural Topic Model} (STM) allows researchers to estimate @@ -28196,7 +28196,7 @@ model objects and help reduce the size of model objects saved to disk.") (build-system r-build-system) (propagated-inputs (list r-plyr r-rjson r-whisker)) - (home-page "http://christophergandrud.github.io/d3Network/") + (home-page "https://christophergandrud.github.io/d3Network/") (synopsis "Create D3 JavaScript network, tree, dendrogram, and Sankey graphs") (description "This package is intended to make it easy to create D3 JavaScript @@ -28329,7 +28329,7 @@ well as Ravand and Robitzsch (2015).") (build-system r-build-system) (propagated-inputs (list r-cdm r-rcpp r-rcpparmadillo)) - (home-page "http://www.edmeasurementsurveys.com/TAM/Tutorials/") + (home-page "https://www.edmeasurementsurveys.com/TAM/Tutorials/") (synopsis "Test analysis modules") (description "This package includes tools for marginal maximum likelihood estimation @@ -29942,7 +29942,7 @@ permuted copies (shadows).") (list r-quadprog)) (native-inputs (list r-knitr)) - (home-page "http://directlabels.r-forge.r-project.org/") + (home-page "https://directlabels.r-forge.r-project.org/") (synopsis "Direct labels for multicolor plots") (description "This package provides an extensible framework for automatically placing @@ -30543,7 +30543,7 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) - (home-page "http://www.spatstat.org") + (home-page "https://www.spatstat.org") (synopsis "Utility functions for spatstat") (description "This package contains utility functions for the @code{spatstat} package @@ -30566,7 +30566,7 @@ which may also be useful for other purposes.") (build-system r-build-system) (propagated-inputs (list r-abind r-matrix r-spatstat-utils r-tensor)) - (home-page "http://spatstat.org/") + (home-page "https://spatstat.org/") (synopsis "Sparse three-dimensional arrays and linear algebra utilities") (description "This package defines sparse three-dimensional arrays and supports @@ -30589,7 +30589,7 @@ matrix calculations that are common in statistics, such as quadratic forms.") (build-system r-build-system) (propagated-inputs (list r-matrix r-spatstat-utils)) - (home-page "http://www.spatstat.org") + (home-page "https://www.spatstat.org") (synopsis "Datasets for spatstat") (description "This package contains all the datasets for the @code{spatstat} @@ -30611,7 +30611,7 @@ package.") (build-system r-build-system) (propagated-inputs (list r-deldir r-polyclip r-spatstat-data r-spatstat-utils)) - (home-page "http://spatstat.org/") + (home-page "https://spatstat.org/") (synopsis "Geometrical functionality of the spatstat package") (description "This is a subset of the original spatstat package, containing the @@ -30645,7 +30645,7 @@ for the geometry of linear networks.") r-spatstat-sparse r-spatstat-utils r-tensor)) - (home-page "http://spatstat.org/") + (home-page "https://spatstat.org/") (synopsis "Core functionality of the spatstat package") (description "This is a subset of the original spatstat package, containing all of the @@ -30675,7 +30675,7 @@ user-level code from spatstat, except for the code for linear networks.") r-spatstat-random r-spatstat-sparse r-spatstat-utils)) - (home-page "http://spatstat.org/") + (home-page "https://spatstat.org/") (synopsis "Linear networks functionality of the spatstat package") (description "This is a subset of the spatstat package, containing its functionality @@ -30695,7 +30695,7 @@ for spatial data on a linear network.") (properties `((upstream-name . "spatstat.random"))) (build-system r-build-system) (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-utils)) - (home-page "http://spatstat.org/") + (home-page "https://spatstat.org/") (synopsis "Random Generation Functionality for the 'spatstat' Family") (description "This package provides functionality for random generation of spatial @@ -30727,7 +30727,7 @@ sampler).") (list r-spatstat-data r-spatstat-explore r-spatstat-geom r-spatstat-linnet r-spatstat-model r-spatstat-random r-spatstat-utils)) - (home-page "http://www.spatstat.org") + (home-page "https://www.spatstat.org") (synopsis "Spatial Point Pattern analysis, model-fitting, simulation, tests") (description "This package provides a comprehensive toolbox for analysing Spatial @@ -30803,7 +30803,7 @@ semantics and supports interaction with @code{ALTREP} vectors.") (properties `((upstream-name . "RcppTOML"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) - (home-page "http://dirk.eddelbuettel.com/code/rcpp.toml.html") + (home-page "https://dirk.eddelbuettel.com/code/rcpp.toml.html") (synopsis "Rcpp bindings to TOML parser") (description "The TOML configuration format specifies an excellent format suitable for @@ -32468,7 +32468,7 @@ this variability problem can be overcome.") "1kdnm5ilfn5fclry3f1d518761hykrqgjhv69kc881r2fpcfa1lv")))) (properties `((upstream-name . "MLEcens"))) (build-system r-build-system) - (home-page "http://stat.ethz.ch/~maathuis/") + (home-page "https://stat.ethz.ch/~maathuis/") (synopsis "Computation of the MLE for bivariate (interval) censored data") (description "This package contains functions to compute the nonparametric @@ -32786,7 +32786,7 @@ other R users.") r-spatstat-geom r-tibble r-uwot)) - (home-page "http://www.satijalab.org/seurat") + (home-page "https://www.satijalab.org/seurat") (synopsis "Seurat is an R toolkit for single cell genomics") (description "This package is an R package designed for QC, analysis, and @@ -36132,7 +36132,7 @@ large datasets.") r-mass r-nnet r-randomforest)) - (home-page "http://www.sciviews.org/zooimage") + (home-page "https://www.sciviews.org/zooimage") (synopsis "Machine learning algorithms with unified interface") (description "This package provides a unified interface to various machine learning @@ -36165,7 +36165,7 @@ algorithms. Confusion matrices are provided too.") r-svdialogs r-svmisc r-tiff)) - (home-page "http://www.sciviews.org/zooimage") + (home-page "https://www.sciviews.org/zooimage") (synopsis "Analysis of numerical plankton images") (description "This package provides a solution for analyzing digital images of diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ff2ec1c71..df8ec29022 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35416,7 +35416,7 @@ structures.") ("rust-time" ,rust-time-0.1) ("rust-typemap" ,rust-typemap-0.3) ("rust-url" ,rust-url-1)))) - (home-page "http://nickel-org.github.io/") + (home-page "https://nickel-org.github.io/") (synopsis "Web application framework for Rust") (description "@code{nickel.rs} is a simple and lightweight foundation for web @@ -59639,7 +59639,7 @@ fixed set of worker threads.") ("rust-log" ,rust-log-0.4) ("rust-ordered-float" ,rust-ordered-float-1) ("rust-threadpool" ,rust-threadpool-1)))) - (home-page "http://thrift.apache.org") + (home-page "https://thrift.apache.org") (synopsis "Rust bindings for the Apache Thrift RPC system") (description "This crate provides Rust bindings for the Apache Thrift RPC system.") @@ -62744,7 +62744,7 @@ etc. distance calculations and string search.") ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) ("rust-webpki" ,rust-webpki-0.21) ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "DNS over HTTPS extension for the Trust-DNS client") (description "Trust-DNS is a safe and secure DNS library. This is an extension for @@ -62878,7 +62878,7 @@ the Trust-DNS client to use DNS over HTTPS.") ("rust-tokio" ,rust-tokio-1) ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "native-tls extension for the Trust-DNS client") (description "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use native-tls for TLS.") @@ -62976,7 +62976,7 @@ extension for the Trust-DNS client to use native-tls for TLS.") ("rust-tokio" ,rust-tokio-1) ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "tokio-openssl extension for the Trust-DNS client") (description "Trust-DNS is a safe and secure DNS library. This is an extension for the Trust-DNS client to use tokio-openssl for TLS.") @@ -63094,7 +63094,7 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.") ("rust-tokio" ,rust-tokio-1) ("rust-url" ,rust-url-2) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "Safe and secure DNS library") (description "Trust-DNS is a safe and secure DNS library. This is the foundational @@ -63254,7 +63254,7 @@ DNS protocol library for all Trust-DNS projects.") ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "Safe and secure DNS library") (description "Trust-DNS is a safe and secure DNS library. This Resolver library uses @@ -63403,7 +63403,7 @@ other queries.") ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) ("rust-webpki" ,rust-webpki-0.21)))) - (home-page "http://www.trust-dns.org/index.html") + (home-page "https://www.trust-dns.org/index.html") (synopsis "rustls extension for the Trust-DNS client") (description "Trust-DNS is a safe and secure DNS library. This is an extension for @@ -64172,7 +64172,7 @@ panic-free alternative to @code{core::fmt}.") (("rust-criterion" ,rust-criterion-0.3) ("rust-num-bigint" ,rust-num-bigint-0.4) ("rust-rug" ,rust-rug-1)))) - (home-page "http://parity.io") + (home-page "https://parity.io") (synopsis "Large, fixed-size integer arithmetic in Rust") (description "This package is a Rust library for large, fixed-size integer arithmetic.") @@ -68239,7 +68239,7 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "http://chyh1990.github.io/yaml-rust/") + (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "YAML 1.2 parser for Rust") (description "This package is a YAML 1.2 parser for Rust.") (license (list license:expat license:asl2.0)))) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 57a42a6a84..b4bef33b06 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -149,7 +149,7 @@ (description "The libdecaf library is an implementation of elliptic curve cryptography using the Montgomery and Edwards curves Curve25519, Ed25519, Ed448-Goldilocks and Curve448, using the Decaf encoding.") - (home-page "http://ed448goldilocks.sourceforge.net/") + (home-page "https://ed448goldilocks.sourceforge.net/") (license (list license:expat ;library license:bsd-2)))) ;python bindings @@ -1013,7 +1013,7 @@ using ctypes is included, and several other language bindings are available.") (base32 "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i")))) (build-system gnu-build-system) - (home-page "http://ccrypt.sourceforge.net") + (home-page "https://ccrypt.sourceforge.net") (synopsis "Command-line utility for encrypting and decrypting files and streams") (description "@command{ccrypt} is a utility for encrypting and decrypting files and streams. It was designed as a replacement for the standard unix diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index eb88c10f24..45bd2e6d36 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -333,7 +333,7 @@ FILE and LDAP; in particular it supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, http proxy tunneling and more!") - (home-page "http://www.curlpp.org") + (home-page "https://www.curlpp.org") (license license:expat))) (define-public h2c diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f32c1f2d07..15cae58c55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -594,7 +594,7 @@ the API, and provides features such as: (list memcached python-pytest)) (inputs (list libmemcached zlib cyrus-sasl)) - (home-page "http://sendapatch.se/projects/pylibmc/") + (home-page "https://sendapatch.se/projects/pylibmc/") (synopsis "Python client for memcached") (description "@code{pylibmc} is a client in Python for memcached. It is a wrapper @@ -2344,7 +2344,7 @@ data sources. Data sources include SQL Servers and any software with an ODBC Driver.") (license license:lgpl2.1+) ;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL" - (home-page "http://www.unixodbc.org"))) + (home-page "https://www.unixodbc.org"))) (define-public nanodbc (package @@ -2668,7 +2668,7 @@ organized in hash table, B+ tree, or fixed-length array.") #t))))) (inputs (list lz4 zlib snappy)) - (home-page "http://source.wiredtiger.com/") + (home-page "https://source.wiredtiger.com/") (synopsis "NoSQL data engine") (description "WiredTiger is an extensible platform for data management. It supports @@ -2861,7 +2861,7 @@ semantics.") "Libpqxx is a C++ library to enable user programs to communicate with the PostgreSQL database back-end. The database back-end can be local or it may be on another machine, accessed via TCP/IP.") - (home-page "http://pqxx.org/") + (home-page "https://pqxx.org/") (license license:bsd-3))) (define-public go-go-etcd-io-bbolt @@ -3190,7 +3190,7 @@ for ODBC.") pkg-config txt2man which)) - (home-page "http://mdbtools.sourceforge.net/") + (home-page "https://mdbtools.sourceforge.net/") (synopsis "Read Microsoft Access databases") (description "MDB Tools is a set of tools and applications to read the proprietary MDB file format used in Microsoft's Access database package. This @@ -3354,7 +3354,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (list autoconf automake bison flex gperf libtool)) (inputs (list openssl net-tools readline zlib)) - (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") + (home-page "https://vos.openlinksw.com/owiki/wiki/VOS/") (synopsis "Multi-model database system") (description "Virtuoso is a scalable cross-platform server that combines relational, graph, and document data management with web application server @@ -4683,7 +4683,7 @@ SQLAlchemy.") similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework.") - (home-page "http://libdbi.sourceforge.net/") + (home-page "https://libdbi.sourceforge.net/") (license license:lgpl2.1+))) (define-public libdbi-drivers @@ -4754,7 +4754,7 @@ The drivers officially supported by @code{libdbi} are: @item PostgreSQL, @item SQLite. @end itemize") - (home-page "http://libdbi-drivers.sourceforge.net/") + (home-page "https://libdbi-drivers.sourceforge.net/") (license license:lgpl2.1+))) (define-public soci @@ -4789,7 +4789,7 @@ The drivers officially supported by @code{libdbi} are: (description "SOCI is an abstraction layer for several database backends, including PostreSQL, SQLite, ODBC and MySQL.") - (home-page "http://soci.sourceforge.net/") + (home-page "https://soci.sourceforge.net/") (license license:boost1.0))) (define-public freetds diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 4319d3a518..c962adf27f 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -328,7 +328,7 @@ debian/copyright for more information."))))) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs (list wget perl)) - (home-page "http://apt-mirror.github.io/") + (home-page "https://apt-mirror.github.io/") (synopsis "Script for mirroring a Debian repository") (description "apt-mirror is a small tool that provides the ability to selectively diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 625a072218..154232ed50 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -620,7 +620,7 @@ the position of the variable and allows you to modify its value.") (inputs (modify-inputs (package-inputs gnu-make) (prepend readline))) - (home-page "http://bashdb.sourceforge.net/remake/") + (home-page "https://bashdb.sourceforge.net/remake/") (description "Remake is an enhanced version of GNU Make that adds improved error reporting, better tracing, profiling, and a debugger.") (license license:gpl3+))) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f9fe9c5989..6fc69a8a63 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -527,7 +527,7 @@ and a @command{fsck.vfat} compatibility symlink for use in an initrd.") (sha256 (base32 "1gmdxr36allrgap2j4dv238d8awkj327ww0jjwpjwrpbvfpyzjf4")))) (build-system gnu-build-system) - (home-page "http://sg.danny.cz/sg/sdparm.html") + (home-page "https://sg.danny.cz/sg/sdparm.html") (synopsis "Provide access to SCSI device parameters") (description "Sdparm reads and modifies SCSI device parameters. These devices can be @@ -562,7 +562,7 @@ and unloading removable media and some other housekeeping functions.") (string-append "manprefix=") (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) - (home-page "http://idle3-tools.sourceforge.net") + (home-page "https://idle3-tools.sourceforge.net") (synopsis "Change or disable Western Digital hard drives' Idle3 timer") (description "Idle3-tools provides a utility to get, set, or disable the Idle3 timer @@ -1448,7 +1448,7 @@ reliably with @code{bmaptool} than with traditional tools, like @code{dd} or (list autoconf automake libtool pkg-config)) (inputs (list cairo pango tokyocabinet ncurses)) - (home-page "http://duc.zevv.nl") + (home-page "https://duc.zevv.nl") (synopsis "Library and suite of tools for inspecting disk usage") (description "Duc maintains a database of accumulated sizes of directories of the file system, and allows you to query this database with diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index d73a1bb94b..1915ec66f1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -460,7 +460,7 @@ useful tools for testing Django applications and projects.") python-setuptools-scm python-pysolr python-whoosh)) - (home-page "http://haystacksearch.org/") + (home-page "https://haystacksearch.org/") (synopsis "Pluggable search for Django") (description "Haystack provides modular search for Django. It features a unified, familiar API that allows you to plug in different search backends diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 92b4b6dce7..10974c93cb 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -85,7 +85,7 @@ (substitute* "desktopfiles/Makefile.am" (("gzip") "gzip -n")) #t))))) - (home-page "http://djvu.sourceforge.net/") + (home-page "https://djvu.sourceforge.net/") (synopsis "Implementation of DjVu, the document format") (description "DjVuLibre is an implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and @@ -124,7 +124,7 @@ utilities.") (for-each make-file-writable (find-files ".")) #t))))) - (home-page "http://djvu.sourceforge.net/djview4.html") + (home-page "https://djvu.sourceforge.net/djview4.html") (synopsis "Viewer for the DjVu image format") (description "DjView is a standalone viewer for DjVu files. diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1a4099dc8e..c15017e03f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -316,7 +316,7 @@ prompt the user with the option to go with insecure DNS only.") (string-append "PKG_CONFIG=" ,(pkg-config-for-target)) "COPTS=\"-DHAVE_DBUS\"") #:tests? #f)) ; no ‘check’ target - (home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html") + (home-page "https://www.thekelleys.org.uk/dnsmasq/doc.html") (synopsis "Small caching DNS proxy and DHCP/TFTP server") (description "Dnsmasq is a light-weight DNS forwarder and DHCP server. It is designed diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 9f2869ed25..8d4892b93b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -632,7 +632,7 @@ the in DocBook SGML DTDs.") "/bin")) '("libxslt" "texlive" "imagemagick" "inkscape")))))))))) - (home-page "http://dblatex.sourceforge.net") + (home-page "https://dblatex.sourceforge.net") (synopsis "DocBook to LaTeX Publishing") (description "DocBook to LaTeX Publishing transforms your SGML/XML DocBook documents @@ -818,7 +818,7 @@ Detect the differences in markup between two SGML files. (map (lambda (prog) (symlink prog (string-append out "/bin/db2x_" prog))) '("docbook2man" "docbook2texi")))))))) - (home-page "http://docbook2x.sourceforge.net") + (home-page "https://docbook2x.sourceforge.net") (synopsis "Convert DocBook to man page and Texinfo format") (description "docbook2X is a software package that converts DocBook documents into the diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index b701f2936e..a372e1a6ca 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -360,7 +360,7 @@ additional metadata about the object to which the docstring belongs.") docbook-xml-4.2)) (native-inputs (list intltool)) - (home-page "http://scrollkeeper.sourceforge.net/") + (home-page "https://scrollkeeper.sourceforge.net/") (synopsis "Open Documentation Cataloging Project") (description "ScrollKeeper is a cataloging system for documentation. It manages diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 6d645fba38..8e6f2bbc09 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -434,7 +434,7 @@ accessing and converting various ebook file formats.") (base32 "1f36dbq7nc77lln1by2n1yl050g9dc63viawhs3gc3169mavm36x")))) (build-system gnu-build-system) - (home-page "http://vimgadgets.sourceforge.net/liblinebreak/") + (home-page "https://vimgadgets.sourceforge.net/liblinebreak/") (synopsis "Library for detecting where linebreaks are allowed in text") (description "@code{liblinebreak} is an implementation of the line breaking algorithm as described in Unicode 6.0.0 Standard Annex 14, diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 15e7318926..98b71e041e 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -429,5 +429,5 @@ individual low-level driver modules.") (description "Xoscope is a digital oscilloscope that can acquire signals from ALSA, ESD, and COMEDI sources. This package currently does not include support for ESD sources.") - (home-page "http://xoscope.sourceforge.net/") + (home-page "https://xoscope.sourceforge.net/") (license license:gpl2+))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a361635339..0ad5dc35d4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3100,7 +3100,7 @@ directories or regex patterns.") ;; `vm-autoloads', from the VM package, with is neither in Emacs nor ;; packaged in Guix. So, don't bother for now. `(#:exclude '("bbdb-vm\\.el"))) - (home-page "http://elpa.gnu.org/packages/bbdb.html") + (home-page "https://elpa.gnu.org/packages/bbdb.html") (synopsis "Contact management utility for Emacs") (description "BBDB is the Insidious Big Brother Database for GNU Emacs. It provides @@ -3693,7 +3693,7 @@ Some of its major features include: (sha256 (base32 "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/caps-lock.html") + (home-page "https://elpa.gnu.org/packages/caps-lock.html") (synopsis "Caps Lock as a minor mode") (description "This package provides a minor mode to emulate the behavior of a Caps @@ -4322,7 +4322,7 @@ filters, new key bindings and faces. It can be enabled by (emacs-substitute-variables file ("djvu-djview-command" (search-input-file inputs "/bin/djview"))))))))) - (home-page "http://elpa.gnu.org/packages/djvu.html") + (home-page "https://elpa.gnu.org/packages/djvu.html") (synopsis "Edit and view Djvu files via djvused") (description "This package is a front end for the command-line program djvused from @@ -4380,7 +4380,7 @@ the previous session (sha256 (base32 "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/pabbrev.html") + (home-page "https://elpa.gnu.org/packages/pabbrev.html") (synopsis "Predictive abbreviation expansion") (description "The code provides a abbreviation expansion for Emacs. It is @@ -5292,7 +5292,7 @@ Markdown files.") (sha256 (base32 "02imis1gxz90lah0b5n37j2hlsaw5igss11d85vpsm5d1bgw8j28")))) (build-system emacs-build-system) - (home-page "http://twmode.sourceforge.net") + (home-page "https://twmode.sourceforge.net") (synopsis "Emacs major mode for Twitter") (description "Twittering mode is an Emacs major mode for Twitter. @@ -5851,7 +5851,7 @@ interface to pause.") (base32 "1cxyxfdjg1dsmn1jrl6b7xy03xr42fb6vyggh27s4dk417ils6yg")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/filladapt.html") + (home-page "https://elpa.gnu.org/packages/filladapt.html") (synopsis "Adaptive fill for Emacs") (description "This package provides functions which enhance the default behavior of @@ -11239,7 +11239,7 @@ line program.") (sha256 (base32 "03hcvpp6ykavidwn5x48gs986w1i5icvh7ks6p74pdaagpgw4jmk")))) (build-system emacs-build-system) - (home-page "http://rudel.sourceforge.net/") + (home-page "https://rudel.sourceforge.net/") (synopsis "Collaborative editing framework") (description "Rudel is a collaborative editing environment for GNU Emacs. Its purpose @@ -15380,7 +15380,7 @@ editing nginx config files.") (sha256 (base32 "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/stream.html") + (home-page "https://elpa.gnu.org/packages/stream.html") (synopsis "Implementation of streams for Emacs") (description "This library provides an implementation of streams for Emacs. Streams are implemented as delayed evaluation of cons cells.") @@ -16436,7 +16436,7 @@ highlights quasi-quoted expressions.") #:tests? #f)) ; no check target (inputs (list emacs espeak-ng perl tcl tclx)) - (home-page "http://emacspeak.sourceforge.net") + (home-page "https://emacspeak.sourceforge.net") (synopsis "Audio desktop interface for Emacs") (description "Emacspeak is a speech interface that allows visually impaired users to @@ -16841,7 +16841,7 @@ reached with the right hand.") (invoke "make" "info")))))) (native-inputs (list texinfo)) - (home-page "http://cc-mode.sourceforge.net/") + (home-page "https://cc-mode.sourceforge.net/") (synopsis "Framework for creating major modes for C-style languages") (description "CC Mode is an Emacs and XEmacs mode for editing C and other languages with @@ -17761,7 +17761,7 @@ more information.") (sha256 (base32 "0c05dzrs7vrhibj46jpz625482ah6xywji7way6wcvwc711y74fz")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/eldoc.html") + (home-page "https://elpa.gnu.org/packages/eldoc.html") (synopsis "Show function arglist or variable docstring in echo area") (description "This program was inspired by the behavior of the ``mouse documentation @@ -18020,7 +18020,7 @@ highlighting.") (chdir "source") (copy-file (string-append source "/lisp/jsonrpc.el") "jsonrpc.el")))))) - (home-page "http://elpa.gnu.org/packages/jsonrpc.html") + (home-page "https://elpa.gnu.org/packages/jsonrpc.html") (synopsis "JSON-RPC library") (description "This library implements the JSONRPC 2.0 specification as @@ -26612,7 +26612,7 @@ scratch buffer. ("gtk-lookup-devhelp-indices" '(list (expand-file-name "~/.guix-profile/share/gtk-doc/html/*/*.devhelp*")))) #t))))) - (home-page "http://user42.tuxfamily.org/gtk-look/index.html") + (home-page "https://user42.tuxfamily.org/gtk-look/index.html") (synopsis "Find and display HTML documentation for GTK, GNOME and Glib") (description "@command{gtk-look} finds and displays HTML documentation for GTK, GNOME and Glib functions and variables in Emacs, similar to what @@ -30418,7 +30418,7 @@ deletion of the frame.") (sha256 (base32 "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/xclip.html") + (home-page "https://elpa.gnu.org/packages/xclip.html") (synopsis "Copy and paste GUI clipboard from Emacs in text terminal") (description "This package allows Emacs to copy to and paste from the GUI clipboard @@ -31028,7 +31028,7 @@ JIRA issue servers.") (base32 "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.svg$" "\\.b64$" "slime\\.el\\.gz$"))) - (home-page "http://elpa.gnu.org/packages/slime-volleyball.html") + (home-page "https://elpa.gnu.org/packages/slime-volleyball.html") (synopsis "SVG slime volleyball game") (description "Emacs Slime Volleyball is a volleyball game. Win points by @@ -31460,7 +31460,7 @@ variable and the @code{minibuffer-line} face.") (sha256 (base32 "09fm0ziy8cdzzw08l7l6p63dxz2a27p3laia2v51mvbva8177ls1")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/minimap.html") + (home-page "https://elpa.gnu.org/packages/minimap.html") (synopsis "Sidebar showing a @emph{mini-map} of a buffer") (description "Minimap provides Emacs with a minimap sidebar, which is a smaller @@ -33083,7 +33083,7 @@ uses BBDB and Message-X.") (sha256 (base32 "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk")))) (build-system emacs-build-system) - (home-page "http://nschum.de/src/emacs/auto-dictionary/") + (home-page "https://nschum.de/src/emacs/auto-dictionary/") (synopsis "Automatic dictionary switcher for Emacs spell checking") (description "@code{auto-dictionary} is a minor mode that hooks into Flyspell's on-the-fly spell checking and extends these checks to also detect @@ -33103,7 +33103,7 @@ detected language.") (sha256 (base32 "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/persist.html") + (home-page "https://elpa.gnu.org/packages/persist.html") (synopsis "Persist variables between Emacs sessions") (description "This package provides variables which persist across sessions. @@ -33801,7 +33801,7 @@ rather excellent completion provided by both Bash and Zsh.") (sha256 (base32 "14akj7pavfhch6ljwl26mhv7qczgmqn7mld62cf6mh4ghmhy3z4y")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/shell-command+.html") + (home-page "https://elpa.gnu.org/packages/shell-command+.html") (synopsis "Extended Emacs @code{shell-command}") (description "Shell-command+ is a @code{shell-command} substitute that extends the @@ -34397,7 +34397,7 @@ s-expression.") (base32 "1gvywhdfg27nx6pyq7yfwq9x6j96jama59i5s9rp41pvg2dlmvm0")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/map.html") + (home-page "https://elpa.gnu.org/packages/map.html") (synopsis "Map manipulation functions") (description "This package provides Emacs map-manipulation functions that work on alists, hash-table and arrays. All functions are prefixed with @@ -34416,7 +34416,7 @@ work on alists, hash-table and arrays. All functions are prefixed with (sha256 (base32 "16vzjl2dv5nmb40xfw7mfrk8i64fac3cy4sf2d2hy832rwlg15q0")))) (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/xref.html") + (home-page "https://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") (description "This library provides a generic infrastructure for cross referencing @@ -34712,7 +34712,7 @@ shorter than usual, using mostly unprefixed keys.") (sha256 (base32 "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi")))) (build-system emacs-build-system) - (home-page "http://www.myrkr.in-berlin.de/dictionary/index.html") + (home-page "https://www.myrkr.in-berlin.de/dictionary/index.html") (synopsis "Emacs client for dictionary servers") (description "This package provides commands for interacting with a dictionary server (as defined by RFC 2229; by default, the public server at diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 87c572ba0f..8d854c7e6d 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1585,7 +1585,7 @@ plus many of their variants.") "TARGETS += sdcc-misc\n" "PKGS += $(SDCC_MISC)"))) #t))))) - (home-page "http://sdcc.sourceforge.net") + (home-page "https://sdcc.sourceforge.net") (synopsis "C compiler suite for 8-bit microcontrollers") (description "SDCC is a retargetable, optimizing Standard C compiler suite that targets 8-bit microcontrollers in the Intel MCS-51 (8051); MOS Technology diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 36c73e3b5b..f62e31d631 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1769,7 +1769,7 @@ it suitable for security research and analysis.") `(("mpi" ,openmpi))) (inputs (list coreutils-minimal)) - (home-page "http://asco.sourceforge.net/") + (home-page "https://asco.sourceforge.net/") (synopsis "SPICE circuit optimizer") (description "ASCO brings circuit optimization capabilities to existing SPICE simulators using a @@ -1824,7 +1824,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") (list bison flex)) (inputs (list libxaw openmpi)) - (home-page "http://ngspice.sourceforge.net/") + (home-page "https://ngspice.sourceforge.net/") (synopsis "Mixed-level/mixed-signal circuit simulator") (description "Ngspice is a mixed-level/mixed-signal circuit simulator. It includes @@ -2766,7 +2766,7 @@ operations.") (inputs (list libx11)) (arguments `(#:tests? #f)) - (home-page "http://spacenav.sourceforge.net/") + (home-page "https://spacenav.sourceforge.net/") (synopsis "Library for communicating with spacenavd or 3dxsrv") (description @@ -2839,7 +2839,7 @@ for compression of 3D triangle meshes. The geometry is compressed to a fraction of comparable file formats (3DS, STL, COLLADA...), and the format is accessible through a simple API") (license license:zlib) - (home-page "http://openctm.sourceforge.net/")))) + (home-page "https://openctm.sourceforge.net/")))) (define-public lib3ds (package diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index dc9a932aec..57350a523c 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -383,7 +383,7 @@ Markdown.") (add-before 'check 'check-setup (lambda _ (setenv "TERM" "xterm")))))) ; enable color in logs - (home-page "http://erlware.github.io/erlware_commons/") + (home-page "https://erlware.github.io/erlware_commons/") (synopsis "Additional standard library for Erlang") (description "Erlware Commons is an Erlware project focused on all aspects of reusable Erlang components.") diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index bbf308186c..5ed6d964af 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -706,7 +706,7 @@ single file can be mounted.") (build-system gnu-build-system) (inputs (list `(,util-linux "lib"))) - (home-page "http://jfs.sourceforge.net/home.html") + (home-page "https://jfs.sourceforge.net/home.html") (synopsis "Utilities for managing JFS file systems") (description "The JFSutils are a collection of utilities for managing the @acronym{JFS, @@ -926,7 +926,7 @@ All of this is accomplished without a centralized metadata server.") (list curl glib fuse)) (native-inputs (list pkg-config)) - (home-page "http://curlftpfs.sourceforge.net/") + (home-page "https://curlftpfs.sourceforge.net/") (synopsis "Mount remote file systems over FTP") (description "This is a file system client based on the FTP File Transfer Protocol.") diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4fd6b11ffb..a0c9a2a72a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1553,7 +1553,7 @@ information.") patch pkg-config)) (build-system glib-or-gtk-build-system) - (home-page "http://gbonds.sourceforge.net") + (home-page "https://gbonds.sourceforge.net") (synopsis "@acronym{U.S.} Savings Bond inventory program for GNOME") (description "GBonds is a @acronym{U.S.} Savings Bond inventory program for the diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index e7165efe79..028631cbd2 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -216,7 +216,7 @@ intended to download and upload firmware to devices connected over USB. It ranges from small devices like micro-controller boards up to mobile phones. With dfu-util you are able to download firmware to your device or upload firmware from it.") - (home-page "http://dfu-util.sourceforge.net/") + (home-page "https://dfu-util.sourceforge.net/") (license license:gpl2+))) (define-public teensy-loader-cli @@ -507,7 +507,7 @@ Unifinished Extensible Firmware Interface (UEFI) images.") groff libtool which)) - (home-page "http://srecord.sourceforge.net/") + (home-page "https://srecord.sourceforge.net/") (synopsis "Tools for EPROM files") (description "The SRecord package is a collection of powerful tools for manipulating EPROM load files. It reads and writes numerous EPROM file diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index dee77d6aa4..5a1582b1bc 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -138,7 +138,7 @@ UI builder called FLUID that can be used to create applications in minutes.") (list cairo libxft libx11)) (native-inputs (list pkg-config)) - (home-page "http://non.tuxfamily.org/ntk/") + (home-page "https://non.tuxfamily.org/ntk/") (synopsis "Fork of FLTK with graphics rendering via Cairo") (description "The Non Tool Kit (NTK) is a fork of the Fast Light ToolKit library, adding improved graphics rendering via Cairo, a streamlined and diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9b7d965e76..4e7b7d0ac3 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -546,7 +546,7 @@ The unified Libertinus family consists of: make-flags))))))) (native-inputs (list bdftopcf font-util mkfontdir pkg-config python)) - (home-page "http://terminus-font.sourceforge.net/") + (home-page "https://terminus-font.sourceforge.net/") (synopsis "Simple bitmap programming font") (description "Terminus Font is a clean, fixed-width bitmap font, designed for long periods of working with computers (8 or more hours per day).") @@ -753,7 +753,7 @@ printing old Malayalam books without compromising the writing style.") (base32 "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31")))) (build-system font-build-system) - (home-page "http://www.gust.org.pl/projects/e-foundry/tex-gyre/") + (home-page "https://www.gust.org.pl/projects/e-foundry/tex-gyre/") (synopsis "Remake of Ghostscript fonts") (description "The TeX Gyre collection of fonts is the result of an extensive remake and extension of the freely available base PostScript fonts @@ -1532,7 +1532,7 @@ later hand-tweaked with the gbdfed(1) editor: \n")))) #t))))) - (home-page "http://www.comicneue.com/") + (home-page "https://www.comicneue.com/") (synopsis "Font that fixes the shortcomings of Comic Sans") (description "Comic Neue is a font that attempts to create a respectable casual diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 72621cc006..5638560b9e 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1079,7 +1079,7 @@ poorly hinted Adobe Type 1 font through the FreeType library and get it back with freshly generated hints. The files produced by default are in human-readable form, which further needs to be encoded with t1utilities to work with most software requiring Type 1 fonts.") - (home-page "http://ttf2pt1.sourceforge.net/") + (home-page "https://ttf2pt1.sourceforge.net/") (license license:bsd-3))) (define-public woff2 @@ -1378,7 +1378,7 @@ company or university logos, handwritten notes, etc. The resulting image is not \"jaggy\" like a bitmap, but smooth. It can then be rendered at any resolution.") (license license:gpl2+) - (home-page "http://potrace.sourceforge.net/"))) + (home-page "https://potrace.sourceforge.net/"))) (define-public libotf (package @@ -1423,7 +1423,7 @@ using the above tables.") "Raph Levien's Spiro package as a library. A mechanism for drawing smooth contours with constant curvature at the spline joins.") (license license:gpl2+) - (home-page "http://libspiro.sourceforge.net/"))) + (home-page "https://libspiro.sourceforge.net/"))) (define-public libuninameslist (package diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index cc7420f37f..31fc0bc5c6 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -259,7 +259,7 @@ For synthesis, the compiler generates netlists in the desired format.") (native-inputs `(("python-3" ,python) ("pkg-config" ,pkg-config))) - (home-page "http://www.clifford.at/icestorm/") + (home-page "https://www.clifford.at/icestorm/") (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools") (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools. Includes the actual FTDI connector.") @@ -353,7 +353,7 @@ FOSS FPGA place and route tool.") (uri (list (string-append "mirror://sourceforge/gtkwave/" "gtkwave-" version "/" "gtkwave-" version ".tar.gz") - (string-append "http://gtkwave.sourceforge.net/" + (string-append "https://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 (base32 "1zqkfchmns5x90qxa8kg39bfhax3vxf1mrdz3lhyb9fz1gp4difn")))) @@ -373,7 +373,7 @@ FOSS FPGA place and route tool.") (synopsis "Waveform viewer for FPGA simulator trace files") (description "This package is a waveform viewer for FPGA simulator trace files (@dfn{FST}).") - (home-page "http://gtkwave.sourceforge.net/") + (home-page "https://gtkwave.sourceforge.net/") ;; Exception against free government use in tcl_np.c and tcl_np.h. (license (list license:gpl2+ license:expat license:tcl/tk)))) @@ -416,7 +416,7 @@ constructed by a Python program.") (base32 "04fi59cyn5dsci0ai7djg74ybkqfcjzhj1jfmac2xanbcrw9j3yk")))) (build-system python-build-system) - (home-page "http://www.myhdl.org/") + (home-page "https://www.myhdl.org/") (synopsis "Python as a Hardware Description Language") (description "This package provides a library to turn Python into a hardware description and verification language.") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8fc030a493..08f3c3f56f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1537,7 +1537,7 @@ formats.") (list pkg-config)) (inputs (list eudev)) - (home-page "http://0pointer.de/blog/projects/being-smart.html") + (home-page "https://0pointer.de/blog/projects/being-smart.html") (synopsis "ATA S.M.A.R.T. reading and parsing library") (description "This library supports a subset of the ATA S.M.A.R.T. (Self-Monitoring, diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 80ffa927e3..5edbc412ea 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -165,7 +165,7 @@ FTP browser, as well as non-interactive commands such as @code{ncftpput} and (build-system gnu-build-system) (native-inputs (list automake autoconf gettext-minimal)) - (home-page "http://weex.sourceforge.net/") + (home-page "https://weex.sourceforge.net/") (synopsis "Non-interactive client for FTP synchronization") (description "Weex is a utility designed to automate the task of remotely diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index da9c63b799..a0de1b339e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -242,7 +242,7 @@ is used in some video games and movies.") (list gawk procps)) (inputs (list boost)) - (home-page "http://privat.bahnhof.se/wb758135/") + (home-page "https://privat.bahnhof.se/wb758135/") (synopsis "Double dummy solver for the bridge card game") (description "DDS is a double-dummy solver of bridge hands. It supports single-threading and multi-threading for improved performance. DDS @@ -466,7 +466,7 @@ possible, and it also makes the SGE easy to learn.") (build-system python-build-system) (propagated-inputs (list python-six)) - (home-page "http://python-tmx.nongnu.org") + (home-page "https://python-tmx.nongnu.org") (synopsis "Python library for the @code{Tiled} TMX format") (description "Python TMX reads and writes the @code{Tiled} TMX format in a simple way. @@ -797,7 +797,7 @@ window, graphics, audio and network.") (description "Sfxr is a tool for quickly generating simple sound effects. Originally created for use in video game prototypes, it can generate random sounds from presets such as \"explosion\" or \"powerup\".") - (home-page "http://www.drpetter.se/project_sfxr.html") + (home-page "https://www.drpetter.se/project_sfxr.html") (license license:expat))) (define-public surgescript @@ -1184,7 +1184,7 @@ It offers the following features: (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig freeglut fribidi glew)) - (home-page "http://quesoglc.sourceforge.net") + (home-page "https://quesoglc.sourceforge.net") (synopsis "Implementation of the OpenGL Character Renderer (GLC)") (description "The OpenGL Character Renderer (GLC) is a state machine that provides @@ -2047,7 +2047,7 @@ scripted in a Python-like language.") (description "Eureka is a map editor for the classic DOOM games, and a few related games such as Heretic and Hexen. It comes with a 3d preview mode and a 2D editor view.") - (home-page "http://eureka-editor.sourceforge.net/") + (home-page "https://eureka-editor.sourceforge.net/") (license license:gpl2+))) (define-public guile-chickadee @@ -2176,7 +2176,7 @@ joystick support."))) (list mesa libxi libxmu)) (native-inputs (list pkg-config)) - (home-page "http://plib.sourceforge.net/") + (home-page "https://plib.sourceforge.net/") (synopsis "Suite of portable game libraries") (description "PLIB is a set of libraries that will permit programmers to write games and other realtime interactive applications that are 100% portable diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e1639a8c64..a3d093fa5e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -287,7 +287,7 @@ ("libxmu" ,libxmu) ("libxt" ,libxt) ("sdl" ,(sdl-union (list sdl sdl-mixer))))) - (home-page "http://abe.sourceforge.net") + (home-page "https://abe.sourceforge.net") (synopsis "Scrolling, platform-jumping, ancient pyramid exploring game") (description "Abe's Amazing Adventure is a scrolling, @@ -401,7 +401,7 @@ mouse and joystick control, and original music.") (inputs `(("allegro" ,allegro-4) ("dumb" ,dumb-allegro4))) - (home-page "http://allegator.sourceforge.net/") + (home-page "https://allegator.sourceforge.net/") (synopsis "Retro platform game") (description "Guide Alex the Allegator through the jungle in order to save his @@ -432,7 +432,7 @@ The game includes a built-in editor so you can design and share your own maps.") freeglut libpng libjpeg-turbo)) - (home-page "http://www.armagetronad.org") + (home-page "https://www.armagetronad.org") (synopsis "Tron clone in 3D") (description "Armagetron Advanced is a multiplayer game in 3d that attempts to emulate and expand on the lightcycle sequence from the movie Tron. @@ -544,7 +544,7 @@ regret their insolence.") zlib)) (native-inputs (list pkg-config)) - (home-page "http://baronygame.com") + (home-page "https://baronygame.com") (synopsis "3D first-person roguelike game") (description "Barony is a first-person roguelike role-playing game with cooperative @@ -1287,7 +1287,7 @@ should be placed in @file{~/.local/share/falltergeist}.") ("glu" ,glu) ("libpng" ,libpng) ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net))))) - (home-page "http://foobillardplus.sourceforge.net/") + (home-page "https://foobillardplus.sourceforge.net/") (synopsis "3D billiard game") (description "FooBillard++ is an advanced 3D OpenGL billiard game based on the original foobillard 3.0a sources from Florian Berger. @@ -1473,7 +1473,7 @@ real-time combat.") (list lua)) (inputs (list glu mesa python sdl2 wxwidgets zlib)) - (home-page "http://golly.sourceforge.net/") + (home-page "https://golly.sourceforge.net/") (synopsis "Software for exploring cellular automata") (description "Golly simulates Conway's Game of Life and many other types of cellular @@ -1977,7 +1977,7 @@ Chess). It is similar to standard chess but this variant is far more complicate ":" (or (getenv "CPATH") "")))))))) (inputs (list (sdl-union (list sdl sdl-mixer)))) - (home-page "http://lgames.sourceforge.net/LTris/") + (home-page "https://lgames.sourceforge.net/LTris/") (synopsis "Tetris clone based on the SDL library") (description "LTris is a tetris clone: differently shaped blocks are falling down the @@ -2144,7 +2144,7 @@ role, and your gender.") #t))))) (inputs (list libpng mesa sdl)) - (home-page "http://pipewalker.sourceforge.net/") + (home-page "https://pipewalker.sourceforge.net/") (synopsis "Logical tile puzzle") (description "PipeWalker is a simple puzzle game with many diffent themes: connect all @@ -2193,7 +2193,7 @@ Every puzzle has a complete solution, although there may be more than one.") pcre portmidi (sdl-union (list sdl sdl-image sdl-mixer sdl-net)))) - (home-page "http://prboom-plus.sourceforge.net/") + (home-page "https://prboom-plus.sourceforge.net/") (synopsis "Version of the classic 3D shoot'em'up game Doom") (description "PrBoom+ is a Doom source port developed from the original PrBoom project.") @@ -2822,7 +2822,7 @@ saved automatically, and you can select between currently in progress games.") Keywords=racing;tracks;~@ Keywords[de]=Rennstrecke;~%" out))))))))) - (home-page "http://trigger-rally.sourceforge.net") + (home-page "https://trigger-rally.sourceforge.net") (synopsis "Fast-paced single-player racing game") (description "Trigger-rally is a 3D rally simulation with great physics for drifting on over 200 maps. Different terrain materials like dirt, @@ -3299,7 +3299,7 @@ is very small), and shoot at the adversaries that keep appear on the screen.") (invoke "./configure" (string-append "--prefix=" out)))))))) (inputs (list ncurses)) - (home-page "http://www.asty.org/cmatrix") + (home-page "https://www.asty.org/cmatrix") (synopsis "Simulate the display from \"The Matrix\"") (description "CMatrix simulates the display from \"The Matrix\" and is based on the screensaver from the movie's website. It works with terminal @@ -3738,7 +3738,7 @@ match, cannon keep, and grave-itation pit.") (install-file "libglkterm.a" lib)) #t)) (delete 'configure)))) ; no configure script - (home-page "http://www.eblong.com/zarf/glk/") + (home-page "https://www.eblong.com/zarf/glk/") (synopsis "Curses Implementation of the Glk API") (description "Glk defines a portable API for applications with text UIs. It was @@ -4863,7 +4863,7 @@ logging, so games can be viewed again.") (symlink "README.md" "README") (display (which "autoreconf")) (newline) (invoke "autoreconf" "-vif")))))) - (home-page "http://pinball.sourceforge.net") + (home-page "https://pinball.sourceforge.net") (synopsis "Pinball simulator") (description "The Emilia Pinball Project is a pinball simulator. There are only two levels to play with, but they are very addictive.") @@ -4897,7 +4897,7 @@ are only two levels to play with, but they are very addictive.") (description "Pioneers is an emulation of the board game The Settlers of Catan. It can be played on a local network, on the internet, and with AI players.") - (home-page "http://pio.sourceforge.net/") + (home-page "https://pio.sourceforge.net/") (license license:gpl2+))) (define-public einstein @@ -5254,7 +5254,7 @@ fullscreen, use F5 or Alt+Enter.") (inputs `(("python" ,python-wrapper) ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net))))) - (home-page "http://icculus.org/tennix/") + (home-page "https://icculus.org/tennix/") (synopsis "Play tennis against the computer or a friend") (description "Tennix is a 2D tennis game. You can play against the computer or against another player using the keyboard. The game runs @@ -5499,7 +5499,7 @@ in strikes against the evil corporation.") (native-inputs (list pkg-config)) (inputs (list gettext-minimal glu quesoglc (sdl-union (list sdl sdl-image sdl-mixer)))) - (home-page "http://chromium-bsu.sourceforge.net/") + (home-page "https://chromium-bsu.sourceforge.net/") (synopsis "Fast-paced, arcade-style, top-scrolling space shooter") (description "In this game you are the captain of the cargo ship Chromium B.S.U. and @@ -6037,7 +6037,7 @@ for Un*x systems with X11.") (list curl cyrus-sasl gtk+ sdl-mixer zlib)) (native-inputs (list pkg-config)) - (home-page "http://www.freeciv.org/") + (home-page "https://www.freeciv.org/") (synopsis "Turn-based empire building strategy game") (description "Freeciv is a turn-based empire building strategy game inspired by the history of human civilization. The game commences in @@ -6341,7 +6341,7 @@ over 100 user-created campaigns.") ("python" ,python-2))) (native-inputs (list swig)) - (home-page "http://kiki.sourceforge.net/") + (home-page "https://kiki.sourceforge.net/") (synopsis "3D puzzle game") (description "Kiki the nano bot is a 3D puzzle game. It is basically a mixture of the games Sokoban and Kula-World. Your task is to help Kiki, a @@ -7142,7 +7142,7 @@ Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") (description "Quakespasm is a modern engine for id software's Quake 1. It includes support for 64 bit CPUs, custom music playback, a new sound driver, some graphical niceities, and numerous bug-fixes and other improvements.") - (home-page "http://quakespasm.sourceforge.net/") + (home-page "https://quakespasm.sourceforge.net/") (license license:gpl2+))) (define-public vkquake @@ -7725,7 +7725,7 @@ original.") (string-append xonotic "/data")) (copy-recursively "server" (string-append xonotic "/server")))))) - (home-page "http://xonotic.org") + (home-page "https://xonotic.org") (synopsis "Data files for Xonotic") (description "Xonotic-data provides the data files required by the game Xonotic.") @@ -7923,7 +7923,7 @@ games in the text adventure/interactive fiction genre. This version of Frotz complies with standard 1.0 of Graham Nelson's specification. It plays all Z-code games V1-V8, including V6, with sound support through libao, and uses ncurses for text display.") - (home-page "http://frotz.sourceforge.net") + (home-page "https://frotz.sourceforge.net") (license license:gpl2+))) (define-public naev @@ -8024,7 +8024,7 @@ scrolling. Maybe you'd like to experience what it's like to play Adventure on a teletype. A much cooler use for compiling Frotz with the dumb interface is that it can be wrapped in CGI scripting, PHP, and the like to allow people to play games on webpages. It can also be made into a chat bot.") - (home-page "http://frotz.sourceforge.net") + (home-page "https://frotz.sourceforge.net") (license license:gpl2+))) (define-public frotz-sdl @@ -8084,7 +8084,7 @@ using SDL fully supports all these versions of the Z-Machine including the graphical version 6. Graphics and sound are created through the use of the SDL libraries. AIFF sound effects and music in MOD and OGG formats are supported when packaged in Blorb container files or optionally from individual files.") - (home-page "http://frotz.sourceforge.net") + (home-page "https://frotz.sourceforge.net") (license license:gpl2+)))) (define-public frozen-bubble @@ -8563,7 +8563,7 @@ download and unpack them separately.") ("zlib" ,zlib))) (native-inputs (list pkg-config zip)) - (home-page "http://btanks.sourceforge.net") + (home-page "https://btanks.sourceforge.net") (synopsis "Multiplayer tank battle game") (description "Battle Tanks (also known as \"btanks\") is a funny battle game, where you can choose one of three vehicles and eliminate your enemy @@ -8905,7 +8905,7 @@ fight each other on an arena-like map.") (list hicolor-icon-theme python-wrapper (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) - (home-page "http://www.flarerpg.org/") + (home-page "https://www.flarerpg.org/") (synopsis "Action Roleplaying Engine") (description "Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: single-player 2D @@ -10333,7 +10333,7 @@ and chess engines.") "ChessX is a chess database. With ChessX you can operate on your collection of chess games in many ways: browse, edit, add, organize, analyze, etc. You can also play games on FICS or against an engine.") - (home-page "http://chessx.sourceforge.net/") + (home-page "https://chessx.sourceforge.net/") (license license:gpl2+))) (define-public stockfish @@ -10424,7 +10424,7 @@ ChessX.") (string-append "CFLAGS=" "-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL")))) - (home-page "http://lgames.sourceforge.net/Barrage/") + (home-page "https://lgames.sourceforge.net/Barrage/") (synopsis "Violent point-and-click shooting game with nice effects") (description "Barrage is a rather destructive action game that puts you on a shooting @@ -10797,7 +10797,7 @@ inside the Zenith Colony.") (build-system gnu-build-system) (inputs (list libx11 libxt xorgproto)) - (home-page "http://cgoban1.sourceforge.net/") + (home-page "https://cgoban1.sourceforge.net/") (synopsis "Go client for X11") (description "Provides a large set of Go-related services for X11: @itemize @@ -10857,7 +10857,7 @@ such as GnuGo. `(("sdl" ,(sdl-union (list sdl sdl-mixer))))) (native-inputs (list imagemagick)) - (home-page "http://hcsoftware.sourceforge.net/passage/") + (home-page "https://hcsoftware.sourceforge.net/passage/") (synopsis "Memento mori game") (description "Passage is meant to be a memento mori game. It presents an entire life, diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 044606936b..753ab558ad 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -830,7 +830,7 @@ pyproj, Rtree, and Shapely.") (list python-fiona python-pandas python-pyproj python-shapely)) (native-inputs (list python-pytest)) - (home-page "http://geopandas.org") + (home-page "https://geopandas.org") (synopsis "Geographic pandas extensions") (description "The goal of GeoPandas is to make working with geospatial data in Python easier. It combines the capabilities of @@ -2458,7 +2458,7 @@ visualization.") Information System (GIS) software. It has been designed for an easy and effective implementation of spatial algorithms and it offers a comprehensive, growing set of geoscientific methods.") - (home-page "http://www.saga-gis.org") + (home-page "https://www.saga-gis.org") (license (list license:gpl2+ license:lgpl2.1+)))) (define-public qgis diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6956b989d6..4ae96032cd 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -127,7 +127,7 @@ as ASCII text.") (propagated-inputs ;; Headers from Mesa and GLU are needed. (list glu mesa)) - (home-page "http://freeglut.sourceforge.net/") + (home-page "https://freeglut.sourceforge.net/") (synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)") (description "Freeglut is a completely Free/OpenSourced alternative to @@ -945,7 +945,7 @@ and visualizations.") (list libpng mesa zlib)) (arguments `(#:tests? #f)) ; no tests - (home-page "http://www.geuz.org/gl2ps/") + (home-page "https://www.geuz.org/gl2ps/") (synopsis "OpenGL to PostScript printing library") (description "GL2PS is a C library providing high quality vector output for any OpenGL application. GL2PS uses sorting algorithms diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 851b715283..f329ff1dc4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6416,7 +6416,7 @@ throughout GNOME for API documentation).") #t) (format #t "test suite not run~%")) #t))))) - (home-page "http://www.clutter-project.org") + (home-page "https://www.clutter-project.org") (synopsis "Object oriented GL/GLES Abstraction/Utility Layer") (description "Cogl is a small library for using 3D graphics hardware to draw pretty @@ -6502,7 +6502,7 @@ presentations, kiosk style applications and so on.") (propagated-inputs ;; clutter-gtk.pc refers to all these. (list clutter gtk+)) - (home-page "http://www.clutter-project.org") + (home-page "https://www.clutter-project.org") (synopsis "OpenGL-based interactive canvas library GTK+ widget") (description "Clutter is an OpenGL-based interactive canvas library, designed for @@ -6528,7 +6528,7 @@ presentations, kiosk style applications and so on.") pkg-config gobject-introspection)) (inputs (list clutter gstreamer gst-plugins-base)) - (home-page "http://www.clutter-project.org") + (home-page "https://www.clutter-project.org") (synopsis "Integration library for using GStreamer with Clutter") (description "Clutter-Gst is an integration library for using GStreamer with Clutter. @@ -11155,7 +11155,7 @@ supports both X and Wayland display servers.") (list desktop-file-utils intltool pkg-config)) (inputs (list enchant gtk+ python-wrapper libxml2 gucharmap)) - (home-page "http://bluefish.openoffice.nl") + (home-page "https://bluefish.openoffice.nl") (synopsis "Web development studio") (description "Bluefish is an editor aimed at programmers and web developers, @@ -11779,7 +11779,7 @@ configurable file renaming.") "Workrave is a program that assists in the recovery and prevention of repetitive strain injury (@dfn{RSI}). The program frequently alerts you to take micro-pauses and rest breaks, and restricts you to your daily limit.") - (home-page "http://www.workrave.org") + (home-page "https://www.workrave.org") (license license:gpl3+))) (define-public ghex diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index a6f9b0e2fb..2819993d73 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -248,7 +248,7 @@ graph), and battery status (high - green, low - yellow, or critical - red).") (list libx11 libxext libxpm)) (native-inputs (list pkg-config)) - (home-page "http://www.thregr.org/~wavexx/software/wmnd/") + (home-page "https://www.thregr.org/~wavexx/software/wmnd/") (synopsis "Network interface monitor") (description "WMND is a dockapp for monitoring network interfaces under WindowMaker and @@ -314,7 +314,7 @@ display, and can run a user-specified program on mouse click.") (version "1.2.4") (source (origin (method url-fetch) - (uri (string-append "http://www.improbability.net/" + (uri (string-append "https://www.improbability.net/" name "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -326,7 +326,7 @@ display, and can run a user-specified program on mouse click.") (list gtk+-2 libgtop)) (native-inputs (list pkg-config)) - (home-page "http://www.improbability.net/") + (home-page "https://www.improbability.net/") (synopsis "Display flames to represent resource usage") (description "wmfire is an applet for Window Maker that can monitor the average cpu diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index cb2723afcd..104fe07b58 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -590,7 +590,7 @@ of graphs.") (list pkg-config)) (inputs (list gd)) - (home-page "http://www.mcternan.me.uk/mscgen/") + (home-page "https://www.mcternan.me.uk/mscgen/") (synopsis "Message Sequence Chart Generator") (description "Mscgen is a small program that parses Message Sequence Chart descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 94b93970b1..bcc27cc3bf 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -632,7 +632,7 @@ and export to various formats including the format used by Magicavoxel.") (build-system cmake-build-system) (inputs (list zlib)) - (home-page "http://www.assimp.org/") + (home-page "https://www.assimp.org/") (synopsis "Asset import library") (description "The Open Asset Import Library loads more than 40 3D file formats into @@ -1035,7 +1035,7 @@ other vector formats such as: `(#:configure-flags (list "-DUSE_HDF5=ON"))) (inputs (list hdf5 imath zlib)) - (home-page "http://www.alembic.io/") + (home-page "https://www.alembic.io/") (synopsis "Framework for storing and sharing scene data") (description "Alembic is a computer graphics interchange framework. It distills complex, animated scenes into a set of baked geometric results.") @@ -1584,7 +1584,7 @@ realistic reflections, shading, perspective and other effects.") ;; Headers include OpenEXR and IlmBase headers. (propagated-inputs (list openexr-2)) - (home-page "http://ampasctl.sourceforge.net") + (home-page "https://ampasctl.sourceforge.net") (synopsis "Color Transformation Language") (description "The Color Transformation Language, or CTL, is a small programming @@ -1700,7 +1700,7 @@ and understanding different BRDFs (and other component functions).") (list libx11 freetype sdl)) ;; Antigrain.com was discontinued. - (home-page "http://agg.sourceforge.net/antigrain.com/index.html") + (home-page "https://agg.sourceforge.net/antigrain.com/index.html") (synopsis "High-quality 2D graphics rendering engine for C++") (description "Anti-Grain Geometry is a high quality rendering engine written in C++. @@ -1939,7 +1939,7 @@ and GPU architectures.") OpenGL. CSG is an approach for modeling complex 3D-shapes using simpler ones. For example, two shapes can be combined by uniting them, by intersecting them, or by subtracting one shape from the other.") - (home-page "http://www.opencsg.org/") + (home-page "https://www.opencsg.org/") (license license:gpl2)))) (define-public coin3D diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 1691658576..f1038a83eb 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -313,7 +313,7 @@ Graphviz and LaTeX.") (propagated-inputs ;; The gts.pc file has glib-2.0 as required. (list glib)) - (home-page "http://gts.sourceforge.net/") + (home-page "https://gts.sourceforge.net/") ;; Note: Despite the name, this is not official GNU software. (synopsis "Triangulated Surface Library") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f575194c73..5101976fb9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2461,7 +2461,7 @@ glass artworks done by Venicians glass blowers.") (list gobject-introspection gtk+ pango)) (propagated-inputs (list enchant)) ; gtkspell3-3.0.pc refers to it - (home-page "http://gtkspell.sourceforge.net") + (home-page "https://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description "GtkSpell provides word-processor-style highlighting and replacement of diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 67b47581e5..54aaadadc0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2725,7 +2725,7 @@ See http://minikanren.org/ for more on miniKanren generally.") #:source-directory "src")) (native-inputs (list guile-3.0)) - (home-page "http://synthcode.com/scheme/irregex") + (home-page "https://synthcode.com/scheme/irregex") (synopsis "S-expression based regular expressions") (description "Irregex is an s-expression based alternative to your classic diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 58992c2097..8f9ca50c00 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -157,7 +157,7 @@ installation of Haskell libraries and programs.") (build-system haskell-build-system) (inputs (list ghc-polyparse ghc-old-locale ghc-old-time)) - (home-page "http://projects.haskell.org/cpphs/") + (home-page "https://projects.haskell.org/cpphs/") (synopsis "Liberalised re-implementation of cpp, the C pre-processor") (description "Cpphs is a re-implementation of the C pre-processor that is both more compatible with Haskell, and itself written in Haskell so that it diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index affe6a07b5..e0443c1c29 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -691,7 +691,7 @@ using Template Haskell") ;; We cannot use ghc-call-stack there, because it depends on ;; ghc-nanospec, which depends on ghc-hunit. (list ghc-call-stack-boot)) - (home-page "http://hunit.sourceforge.net/") + (home-page "https://hunit.sourceforge.net/") (synopsis "Unit testing framework for Haskell") (description "HUnit is a unit testing framework for Haskell, inspired by the diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index d2f706f222..a83cffd1ee 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -312,7 +312,7 @@ libraries, such as http-conduit.") ghc-network ghc-network-bsd ghc-utf8-string)) - (home-page "http://hackage.haskell.org/package/http-client-restricted") + (home-page "https://hackage.haskell.org/package/http-client-restricted") (synopsis "Restrict the servers used by http-client") (description "This library makes it possible to restrict the HTTP servers that can be @@ -979,7 +979,7 @@ entity decoding bugfixes applied.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://jaspervdj.be/blaze") + (home-page "https://jaspervdj.be/blaze") (synopsis "Fast HTML combinator library") (description "This library provides HTML combinators for Haskell.") (license license:bsd-3))) @@ -1818,7 +1818,7 @@ requirements of downstream users (e.g. Debian).") ghc-utf8-string ghc-zlib)) (native-inputs (list ghc-hunit)) - (home-page "http://happstack.com") + (home-page "https://happstack.com") (synopsis "Web related tools and services for Haskell") (description "Happstack Server provides an HTTP server and a rich set of functions for @@ -1933,7 +1933,7 @@ declarative and monadic interface.") #:cabal-revision ("1" "1f7q44ar6qfip8fsllg43jyn7r15ifn2r0vz32cbmx0sb0d38dax"))) (home-page - "http://hackage.haskell.org/package/sourcemap") + "https://hackage.haskell.org/package/sourcemap") (synopsis "Implementation of source maps as proposed by Google and Mozilla") (description diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 79b4ae7bed..58a0e18f29 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -485,7 +485,7 @@ style.") (inputs (list ghc-bifunctors ghc-tagged)) (home-page - "http://hackage.haskell.org/package/assoc") + "https://hackage.haskell.org/package/assoc") (synopsis "Swap and assoc: Symmetric and Semigroupy Bifunctors") (description @@ -1446,7 +1446,7 @@ imported with the correct Haskell types.") (list ghc-utf8-string cairo)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) - (home-page "http://projects.haskell.org/gtk2hs/") + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Cairo vector graphics library") (description "Cairo is a library to render high quality vector graphics. There exist @@ -1651,7 +1651,7 @@ provides for better error messages at the expense of some speed.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-vector)) - (home-page "http://hackage.haskell.org/package/cborg") + (home-page "https://hackage.haskell.org/package/cborg") (synopsis "Concise Binary Object Representation") (description "This package (formerly binary-serialise-cbor) provides an @@ -2738,7 +2738,7 @@ function performs the conversion you desire.") (substitute* "Setup.hs" (("defaultMainWithHooks defaultUserHooks") "defaultMain"))))))) - (home-page "http://hackage.haskell.org/package/csv") + (home-page "https://hackage.haskell.org/package/csv") (synopsis "CSV loader and dumper") (description "This library parses and dumps documents that are formatted according to @@ -4789,7 +4789,7 @@ info for more informative bug reports.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://iki.fi/matti.niemenmaa/glob/") + (home-page "https://iki.fi/matti.niemenmaa/glob/") (synopsis "Haskell library matching glob patterns against file paths") (description "This package provides a Haskell library for @dfn{globbing}: matching patterns against file paths.") @@ -4957,7 +4957,7 @@ monoid with invertibility.") (list ghc-random ghc-hashtables)) (native-inputs (list ghc-alex ghc-happy)) - (home-page "http://projects.haskell.org/gtk2hs/") + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") (description "This package provides a set of helper programs necessary to build the @@ -5743,7 +5743,7 @@ using GSL.") (inputs (list ghc-vector ghc-storable-complex ghc-hmatrix gsl)) (native-inputs (list pkg-config)) - (home-page "http://code.haskell.org/hmatrix-gsl-stats") + (home-page "https://code.haskell.org/hmatrix-gsl-stats") (synopsis "GSL Statistics interface for Haskell") (description "This Haskell library provides a purely functional interface for statistics based on hmatrix and GSL.") @@ -6358,7 +6358,7 @@ Haskell.") (build-system haskell-build-system) (native-inputs (list ghc-quickcheck)) - (home-page "http://www.chr-breitkopf.de/comp/IntervalMap") + (home-page "https://www.chr-breitkopf.de/comp/IntervalMap") (synopsis "Containers for intervals, with efficient search") (description "This package provides ordered containers of intervals, with efficient @@ -6802,7 +6802,7 @@ indexed variants.") "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/lens-family-core") + "https://hackage.haskell.org/package/lens-family-core") (synopsis "Haskell 98 Lens Families") (description "This package provides first class functional references. In addition to @@ -7327,7 +7327,7 @@ than its name.") (base32 "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/managed") + (home-page "https://hackage.haskell.org/package/managed") (synopsis "Monad for managed values") (description "In Haskell you very often acquire values using the with... idiom using @@ -8015,7 +8015,7 @@ semi-direct products, \"deletable\" monoids, \"split\" monoids, and "1hnm31pqcffphyc463wf0vbik9fzm5lb2r4wjdc1y4dqzmjdzz37")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/mountpoints") + "https://hackage.haskell.org/package/mountpoints") (synopsis "Haskell library for listing mount points") (description "This library provides Haskell bindings for checking currently mounted filesystems.") @@ -8294,7 +8294,7 @@ IPv4, IPv6 and MAC addresses.") (inputs (list ghc-network ghc-network-bsd)) (home-page - "http://hackage.haskell.org/package/network-multicast") + "https://hackage.haskell.org/package/network-multicast") (synopsis "Simple multicast library for Haskell") (description "This package provides the Network.Multicast Haskell module for @@ -8641,7 +8641,7 @@ DSLs, etc.") "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/optional-args") + "https://hackage.haskell.org/package/optional-args") (synopsis "Optional function arguments") (description "This library provides a type for specifying @code{Optional} function @@ -10509,7 +10509,7 @@ configurations to coexist without resorting to mutable global variables or ghc-time-locale-compat ghc-unordered-containers ghc-utf8-string)) - (home-page "http://regex.uk") + (home-page "https://regex.uk") (synopsis "Toolkit for regex-base") (description "This package provides a regular expression toolkit for @code{regex-base} @@ -12001,7 +12001,7 @@ internal state).") ("1" "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74"))) (home-page - "http://hackage.haskell.org/package/spoon") + "https://hackage.haskell.org/package/spoon") (synopsis "Catch errors thrown from pure computations") (description @@ -13379,7 +13379,7 @@ BitTorrent files.") "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/transformers") + "https://hackage.haskell.org/package/transformers") (synopsis "Concrete functor and monad transformers") (description "Transformers provides functor and monad transformers, inspired by the @@ -13592,7 +13592,7 @@ statically known size.") (native-inputs (list ghc-doctest ghc-fail)) (home-page - "http://hackage.haskell.org/package/turtle") + "https://hackage.haskell.org/package/turtle") (synopsis "Shell programming, Haskell-style") (description "Turtle is a reimplementation of the Unix command line environment in @@ -14023,7 +14023,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/utf8-light") + "https://hackage.haskell.org/package/utf8-light") (synopsis "Lightweight unicode support for Haskell") (description "This package profides a class for encoding and decoding UTF8 strings @@ -14493,7 +14493,7 @@ Haskell value or function.") `(#:cabal-revision ("1" "095qd17zrdhqmcvmslbyzfa5sh9glvvsnsvnlz31gzsmi8nnsgim"))) - (home-page "http://hackage.haskell.org/package/wizards") + (home-page "https://hackage.haskell.org/package/wizards") (synopsis "High level, generic library for interrogative user interfaces") (description "@code{wizards} is a package designed for the quick and painless @@ -15476,7 +15476,7 @@ platform independent way.") (base32 "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g")))) (build-system haskell-build-system) (inputs (list ghc-boot-th)) - (home-page "http://hackage.haskell.org/package/template-haskell") + (home-page "https://hackage.haskell.org/package/template-haskell") (synopsis "Support library for Template Haskell") (description "This package provides modules containing facilities for manipulating @@ -15528,7 +15528,7 @@ information.") (sha256 (base32 "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/ghc-boot-th") + (home-page "https://hackage.haskell.org/package/ghc-boot-th") (synopsis "Shared functionality between GHC and Template Haskell") (description @@ -15558,7 +15558,7 @@ upon by user code.") (arguments `(#:cabal-revision ("5" "1h2d37szfrcwn9rphnijn4q9l947b0wwqjs1aqmm62xkhbad7jf6"))) - (home-page "http://hackage.haskell.org/package/binary-orphans") + (home-page "https://hackage.haskell.org/package/binary-orphans") (synopsis "Compatibility package for binary") (description "This package provides instances defined in later versions of @@ -15919,7 +15919,7 @@ server and to receive the results of these queries.") (arguments `(#:cabal-revision ("2" "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"))) - (home-page "http://hackage.haskell.org/package/postgresql-simple") + (home-page "https://hackage.haskell.org/package/postgresql-simple") (synopsis "Mid-Level PostgreSQL client library") (description "This package provides a mid-Level PostgreSQL client library, forked from diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index 3f3c364272..79c14a2996 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -90,7 +90,7 @@ the file and search through it.") with a special focus on executable binaries. Its goal is to combine the low-level functionality of a debugger with the usability of an @dfn{Integrated Development Environment} (IDE).") - (home-page "http://hte.sourceforge.net/") + (home-page "https://hte.sourceforge.net/") (license license:gpl2))) (define-public bvi @@ -112,5 +112,5 @@ Development Environment} (IDE).") (synopsis "Binary file editor") (description "@command{bvi} is a display-oriented editor for binary files, based on the @command{vi} text editor.") - (home-page "http://bvi.sourceforge.net/") + (home-page "https://bvi.sourceforge.net/") (license license:gpl3+))) diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index c6db9f1495..e49caecc62 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -263,7 +263,7 @@ spell-checking library.") (synopsis "Hunspell dictionary for Hungarian (hu_HU)") (description "This package provides a dictionary for the Hunspell spell-checking library.") - (home-page "http://magyarispell.sourceforge.net/") + (home-page "https://magyarispell.sourceforge.net/") (license (list license:gpl2 license:gpl3))))) (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page license) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..6f51499142 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -242,7 +242,7 @@ licences similar to the Modified BSD licence.")))) (native-inputs (list pkg-config python-wrapper)) - (home-page "http://mia.sourceforge.net") + (home-page "https://mia.sourceforge.net") (synopsis "Toolkit for gray scale medical image analysis") (description "MIA provides a combination of command line tools, plug-ins, and libraries that make it possible run image processing tasks interactively diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 1879b9949c..0758cf5b27 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -276,7 +276,7 @@ actions.") `(,glib "bin") ; glib-gettextize intltool pkg-config)) - (home-page "http://www.geeqie.org/") + (home-page "https://www.geeqie.org/") (synopsis "Lightweight GTK+ based image viewer") (description "Geeqie is a lightweight GTK+ based image viewer for Unix like operating @@ -306,7 +306,7 @@ collection. Geeqie was initially based on GQview.") (synopsis "Simple and fast image viewer for X") (description "gpicview is a lightweight GTK+ 2.x based image viewer. It is the default image viewer on LXDE desktop environment.") - (home-page "http://lxde.sourceforge.net/gpicview/") + (home-page "https://lxde.sourceforge.net/gpicview/") (license license:gpl2+))) (define-public sxiv @@ -592,7 +592,7 @@ and WebP.") (dirname (search-input-file inputs "include/OpenEXR/ImathInt64.h")) ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) - (home-page "http://qtpfsgui.sourceforge.net") + (home-page "https://qtpfsgui.sourceforge.net") (synopsis "High dynamic range (HDR) imaging application") (description "Luminance HDR (formerly QtPFSGui) is a graphical user interface @@ -863,7 +863,7 @@ with tiling window managers. Features include: #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (home-page "http://spiegl.de/qiv/") + (home-page "https://spiegl.de/qiv/") (synopsis "Graphical image viewer for X") (description "Quick Image Viewer is a small and fast GDK/Imlib2 image viewer. diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 42b7ee055e..5071dd588f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -946,7 +946,7 @@ compose, and analyze GIF images.") (format #f "EXECINPUT=~a~%" execinput))) (invoke "sh" "testit.sh")))))))) (native-inputs (list drm-tools)) ;for tests - (home-page "http://libuemf.sourceforge.net/") + (home-page "https://libuemf.sourceforge.net/") (synopsis "Library for working with WFM, EMF and EMF+ images") (description "The libUEMF library is a portable C99 implementation for reading and writing @acronym{WFM, Windows Metafile}, @acronym{EMF, Enhanced @@ -1419,7 +1419,7 @@ and XMP metadata of images in various formats.") (description "Developer's Image Library (DevIL) is a library to develop applications with support for many types of images. DevIL can load, save, convert, manipulate, filter and display a wide variety of image formats.") - (home-page "http://openil.sourceforge.net") + (home-page "https://openil.sourceforge.net") (license license:lgpl2.1+))) (define-public jasper @@ -1531,7 +1531,7 @@ differences in file encoding, image quality, and other small variations.") (list gettext-minimal libtool perl)) (inputs (list libjpeg-turbo libmhash libmcrypt zlib)) - (home-page "http://steghide.sourceforge.net") + (home-page "https://steghide.sourceforge.net") (synopsis "`Hide' (nonconfidential) data in image or audio files") (description "Steghide is a program to `hide' data in various kinds of image and audio @@ -1580,7 +1580,7 @@ specifically at this tool.") files to a smaller size, without losing any information. This program also converts external formats (BMP, GIF, PNM and TIFF) to optimized PNG, and performs PNG integrity checks and corrections.") - (home-page "http://optipng.sourceforge.net/") + (home-page "https://optipng.sourceforge.net/") (license license:zlib))) (define-public imgp @@ -1756,7 +1756,7 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") files in the nifti-1 data format - a binary file format for storing medical image data, e.g. magnetic resonance image (MRI) and functional MRI (fMRI) brain images.") - (home-page "http://niftilib.sourceforge.net") + (home-page "https://niftilib.sourceforge.net") (license license:public-domain))) (define-public gpick @@ -2029,7 +2029,7 @@ to the standard output. It works well together with grim.") "/share/X11/rgb.txt")))) (inputs (list xorg-rgb libpng)) (native-inputs (list pngsuite)) - (home-page "http://sng.sourceforge.net") + (home-page "https://sng.sourceforge.net") (synopsis "Markup language for representing PNG contents") (description "SNG (Scriptable Network Graphics) is a minilanguage designed specifically to represent the entire contents of a PNG (Portable Network @@ -2361,7 +2361,7 @@ Format) file format decoder and encoder.") (list "intl" ; build internationalized version "man") ; build the man page #:tests? #f)) ; no test suite - (home-page "http://mtpaint.sourceforge.net/") + (home-page "https://mtpaint.sourceforge.net/") (synopsis "Create pixel art and manipulate digital images") (description "Mtpaint is a graphic editing program which uses the GTK+ toolkit. diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm index 3a3df2bcb0..481d8cd075 100644 --- a/gnu/packages/java-bootstrap.scm +++ b/gnu/packages/java-bootstrap.scm @@ -86,7 +86,7 @@ (base32 "1qqldrp74pzpy5ly421srqn30qppmm9cvjiqdngk8hf47dv2rc0c")))) (build-system gnu-build-system) - (home-page "http://jikes.sourceforge.net/") + (home-page "https://jikes.sourceforge.net/") (synopsis "Compiler for the Java language") (description "Jikes is a compiler that translates Java source files as defined in The Java Language Specification into the bytecoded instruction set @@ -181,7 +181,7 @@ language.") ("automake" ,automake) ("libtool" ,libtool)) '())) - (home-page "http://jamvm.sourceforge.net/") + (home-page "https://jamvm.sourceforge.net/") (synopsis "Small Java Virtual Machine") (description "JamVM is a Java Virtual Machine conforming to the JVM specification edition 2 (blue book). It is extremely small. However, unlike diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 5b16806e27..3cf9f91803 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -63,7 +63,7 @@ "test/src/org/simpleframework/xml/core/NoAnnotationsRequiredTest.java")))))) (native-inputs (list unzip)) - (home-page "http://simple.sourceforge.net/") + (home-page "https://simple.sourceforge.net/") (synopsis "XML serialization framework for Java") (description "Simple is a high performance XML serialization and configuration framework for Java. Its goal is to provide an XML framework @@ -92,7 +92,7 @@ maintaining each reference encountered.") #:jdk ,icedtea-8 #:source-dir ".." #:tests? #f)); no tests - (home-page "http://xerces.apache.org/xml-commons/") + (home-page "https://xerces.apache.org/xml-commons/") (synopsis "Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)") (description "Jaxp from the Apache XML Commons project is used by the Xerces-J XML parser and Xalan-J XSLT processor and specifies these APIs: @@ -131,7 +131,7 @@ the Xerces-J XML parser and Xalan-J XSLT processor and specifies these APIs: #:tests? #f)); no tests (inputs (list java-junit)) - (home-page "http://xerces.apache.org/xml-commons/") + (home-page "https://xerces.apache.org/xml-commons/") (synopsis "Catalog-based entity and URI resolution") (description "The resolver class implements the full semantics of OASIS Technical Resolution 9401:1997 (Amendment 2 to TR 9401) catalogs and the 06 Aug diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e55684d2a3..388e9d127f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -660,7 +660,7 @@ nss pcsc-lite zlib)) - (home-page "http://icedtea.classpath.org") + (home-page "https://icedtea.classpath.org") (synopsis "Java development kit") (description "This package provides the Java development kit OpenJDK built with the @@ -2401,7 +2401,7 @@ debugging, etc.") (sha256 (base32 "0b6335gkm4x895rac6kfg9d3rpq0sy19ph4zpg2gyw6asfsisjhk")))))) - (home-page "http://svnsis.ethz.ch") + (home-page "https://svnsis.ethz.ch") (synopsis "Utility classes for libraries from ETH Zurich") (description "This library supplies some utility classes needed for libraries from the SIS division at ETH Zurich like jHDF5.") @@ -2511,7 +2511,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.") ;; Delete bundled pre-built jars. (snippet '(begin (delete-file-recursively "lib/") #t)))))) - (home-page "http://svnsis.ethz.ch") + (home-page "https://svnsis.ethz.ch") (synopsis "Command line parser library") (description "This package provides a parser for command line arguments.") (license license:asl2.0)))) @@ -3119,7 +3119,7 @@ private Method[] allMethods = getSortedMethods();"))) ("java-jarjar" ,java-jarjar))) (propagated-inputs (list java-hamcrest-parent-pom)) - (home-page "http://hamcrest.org/") + (home-page "https://hamcrest.org/") (synopsis "Library of matchers for building test expressions") (description "This package provides a library of matcher objects (also known as @@ -5852,7 +5852,7 @@ namespaces.") (generate-pom.xml "pom.xml" "com.google.code.findbugs" "jsr305" ,version)) (replace 'install (install-from-pom "pom.xml"))))) - (home-page "http://findbugs.sourceforge.net/") + (home-page "https://findbugs.sourceforge.net/") (synopsis "Annotations for the static analyzer called findbugs") (description "This package provides annotations for the findbugs package. It provides packages in the @code{javax.annotations} namespace.") @@ -6391,7 +6391,7 @@ the OSGi @code{org.osgi.service.event} module.") #:jar-name "eclipse-equinox-osgi.jar")) (inputs (list java-osgi-annotation)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Eclipse Equinox OSGi framework") (description "This package provides an implementation of the OSGi Core specification.") @@ -6416,7 +6416,7 @@ specification.") #:jar-name "eclipse-equinox-common.jar")) (inputs (list java-eclipse-osgi)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Common Eclipse runtime") (description "This package provides the common Eclipse runtime.") (license license:epl1.0))) @@ -6440,7 +6440,7 @@ specification.") #:jar-name "eclipse-core-jobs.jar")) (inputs (list java-eclipse-equinox-common java-eclipse-osgi)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Eclipse jobs mechanism") (description "This package provides the Eclipse jobs mechanism.") (license license:epl1.0))) @@ -6465,7 +6465,7 @@ specification.") (inputs (list java-eclipse-core-jobs java-eclipse-equinox-common java-eclipse-osgi)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Eclipse extension registry support") (description "This package provides support for the Eclipse extension registry.") @@ -6491,7 +6491,7 @@ registry.") (inputs (list java-eclipse-equinox-common java-eclipse-equinox-registry java-eclipse-osgi java-osgi-service-event)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Equinox application container") (description "This package provides the Equinox application container for Eclipse.") @@ -6517,7 +6517,7 @@ Eclipse.") (inputs (list java-eclipse-equinox-common java-eclipse-equinox-registry java-eclipse-osgi)) - (home-page "http://www.eclipse.org/equinox/") + (home-page "https://www.eclipse.org/equinox/") (synopsis "Eclipse preferences mechanism") (description "This package provides the Eclipse preferences mechanism with the module @code{org.eclipse.equinox.preferences}.") @@ -6543,7 +6543,7 @@ the module @code{org.eclipse.equinox.preferences}.") (inputs (list java-eclipse-equinox-common java-eclipse-equinox-preferences java-eclipse-equinox-registry java-eclipse-osgi)) - (home-page "http://www.eclipse.org/") + (home-page "https://www.eclipse.org/") (synopsis "Eclipse content mechanism") (description "This package provides the Eclipse content mechanism in the @code{org.eclipse.core.contenttype} module.") @@ -6858,7 +6858,7 @@ module @code{org.eclipse.compare.core}.") (inputs (list java-eclipse-equinox-common java-eclipse-core-commands java-icu4j)) - (home-page "http://www.eclipse.org/platform") + (home-page "https://www.eclipse.org/platform") (synopsis "Eclipse text library") (description "Platform Text is part of the Platform UI project and provides the basic building blocks for text and text editors within Eclipse @@ -8022,7 +8022,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (list java-junit)) (native-inputs (list java-hamcrest-core)) - (home-page "http://treelayout.sourceforge.net") + (home-page "https://treelayout.sourceforge.net") (synopsis "Tree Layout Algorithm in Java") (description "TreeLayout creates tree layouts for arbitrary trees. It is not restricted to a specific output or format, but can be used for any kind of @@ -9972,7 +9972,7 @@ this is not a static analysis tool.)") (generate-pom.xml "pom.xml" "aopalliance" "aopalliance" ,version)) (replace 'install (install-from-pom "pom.xml"))))) - (home-page "http://aopalliance.sourceforge.net") + (home-page "https://aopalliance.sourceforge.net") (synopsis "Aspect-Oriented Programming") (description "The AOP Alliance project is a joint project between several software engineering people who are interested in Aspect-Oriented Programming @@ -11114,7 +11114,7 @@ protocol-independent framework to build mail and messaging applications.") (native-inputs `(("java-hamcrest-core" ,java-hamcrest-core) ("junit" ,java-junit))) - (home-page "http://zeromq.org/bindings:java") + (home-page "https://zeromq.org/bindings:java") (synopsis "Java binding for 0MQ") (description "Jeromq provides the java bindings for 0MQ.") (license license:mpl2.0))) @@ -11763,7 +11763,7 @@ specific events.") java-jboss-interceptors-api-spec java-weld-parent-pom)) (native-inputs (list java-testng java-hamcrest-core)) - (home-page "http://cdi-spec.org/") + (home-page "https://cdi-spec.org/") (synopsis "Contexts and Dependency Injection APIs") (description "Java-cdi-api contains the required APIs for Contexts and Dependency Injection (CDI).") @@ -13594,7 +13594,7 @@ can be interpreted by IDEs and static analysis tools to improve code analysis.") (list java-guava java-jboss-javassist java-jsonp-api)) (native-inputs (list javacc)) - (home-page "http://javaparser.org/") + (home-page "https://javaparser.org/") (synopsis "Parser for Java") (description "This project contains a set of libraries implementing a Java 1.0 - Java diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index 2e25780257..1abf8a69a6 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -65,7 +65,7 @@ ;; Install the scripts to a separate output to avoid referencing Perl and ;; Bash in the default output, saving ~75 MiB on the closure. (outputs '("out" "bin")) - (home-page "http://jemalloc.net/") + (home-page "https://jemalloc.net/") (synopsis "General-purpose scalable concurrent malloc implementation") (description "This library providing a malloc(3) implementation that emphasizes diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 82429c957d..f6de56e858 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -4888,7 +4888,7 @@ more complex visualizations.") (list julia-nanmath julia-plotutils julia-recipesbase)) - (home-page "http://juliaplots.org/RecipesPipeline.jl/dev/") + (home-page "https://juliaplots.org/RecipesPipeline.jl/dev/") (synopsis "Utilities for processing recipes") (description "This package was factored out of @code{Plots.jl} to allow any other plotting package to use the recipe pipeline. In short, the extremely diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index cf074452e7..43af023831 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -169,7 +169,7 @@ Other notable features include: (when tests? ;; FIXME: two tests fails. (invoke "ctest" "-E" "(schedulertest|filedeletertest)")) #t))))) - (home-page "http://www.kde.org/") + (home-page "https://www.kde.org/") (synopsis "Versatile and user-friendly download manager") (description "KGet is an advanced download manager with support for Metalink and Bittorrent. Downloads are added to the list, where they can be diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 455798ab8c..498dcbf0ed 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -119,7 +119,7 @@ The main features of Dolphin are: kxmlgui breeze-icons ;; default icon set qtbase-5)) - (home-page "http://www.kde.org/") + (home-page "https://www.kde.org/") (synopsis "VCS-Plugins for Dolphin") (description "This package contains plugins that offer integration in Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") @@ -227,7 +227,7 @@ document meta data file.") qtscript)) (arguments `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus - (home-page "http://www.kde.org/") + (home-page "https://www.kde.org/") (synopsis "Terminal emulator similar for KDE") (description "Konsole is a terminal emulator, similar to xterm, built on the KDE Platform. It can contain multiple terminal sessions inside one window diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index ed80d0662f..739d293a57 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -257,7 +257,7 @@ generator library for C++.") (base32 "0xilghiy3mz78bjmfldi39qyy7jvw5b6wafsx370lw401y2qw0g4")))) (build-system gnu-build-system) - (home-page "http://fstrcmp.sourceforge.net/") + (home-page "https://fstrcmp.sourceforge.net/") (arguments '(#:configure-flags '("SH=sh"))) (native-inputs diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 994bc09e67..f7e3ea6cd6 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -264,7 +264,7 @@ focuses especially on Korean input (Hangul, Hanja, ...).") is lightweight, stable, powerful and supports many commonly used input methods, including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin, Random Cage Fighting Birds, Cool Music etc.") - (home-page "http://hime-ime.github.io/") + (home-page "https://hime-ime.github.io/") (license (list license:gpl2+ license:lgpl2.1+ license:fdl1.2+)))) ; documentation @@ -325,7 +325,7 @@ Random Cage Fighting Birds, Cool Music etc.") (synopsis "Chinese phonetic input method") (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input method, one of the most popular choices for Traditional Chinese users.") - (home-page "http://chewing.im/") + (home-page "https://chewing.im/") (license license:lgpl2.1+))) (define-public liblouis diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 39823dfee8..966716f5ad 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -89,7 +89,7 @@ (assoc-ref inputs patch))) (list "add-usb-tcp-support.patch" "debian-writable-swap-inst-len.patch"))))))) - (home-page "http://bricxcc.sourceforge.net/nqc/") + (home-page "https://bricxcc.sourceforge.net/nqc/") (synopsis "C-like language for Lego's MINDSTORMS") (description "Not Quite C (NQC) is a simple language for programming several Lego diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 5d902ba92f..bcda6b9867 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -49,7 +49,7 @@ (list printproto)) (inputs (list libxext libxt)) - (home-page "http://lesstif.sourceforge.net/") + (home-page "https://lesstif.sourceforge.net/") (synopsis "Clone of the Motif toolkit for the X window system") (description "Clone of the Motif toolkit for the X window system.") (license license:gpl2+))) ; some files are lgpl2.1+ or x11 diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 337aa6840a..86e77b0f22 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -94,7 +94,7 @@ (assoc-ref inputs "sound-theme-freedesktop") "/share"))) #t))))) - (home-page "http://0pointer.de/lennart/projects/libcanberra/") + (home-page "https://0pointer.de/lennart/projects/libcanberra/") (synopsis "Implementation of the XDG Sound Theme and Name Specifications") (description diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 12e4e2dc9c..c42dfb6380 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -80,7 +80,7 @@ (symlink (which "config.sub") "config.sub"))))) '()))) ;; XXX: Stale URL, missing replacement. See . - (home-page "http://0pointer.de/lennart/projects/libdaemon/") + (home-page "https://0pointer.de/lennart/projects/libdaemon/") (synopsis "Lightweight C library that eases the writing of UNIX daemons") (description diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 6d16e6a03b..60e8bb23ea 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -73,7 +73,7 @@ to call code written in another language. The libffi library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. A layer must exist above libffi that handles type conversions for values passed between the two languages.") - (home-page "http://www.sourceware.org/libffi/") + (home-page "https://www.sourceware.org/libffi/") (properties `((release-monitoring-url . ,home-page))) ;; See . diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9706e0ab69..240b4279fa 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -253,7 +253,7 @@ spreadsheets and presentations.") (list librevenge)) ; in Requires field of .pkg (inputs (list zlib)) - (home-page "http://libwpd.sourceforge.net/") + (home-page "https://libwpd.sourceforge.net/") (synopsis "Library for importing WordPerfect documents") (description "Libwpd is a C++ library designed to help process WordPerfect documents. It is most commonly used to import such documents @@ -344,7 +344,7 @@ way--presentation and vector drawing interfaces.") (list libwpd)) ; in Requires field of .pkg (inputs (list perl zlib)) - (home-page "http://libwpg.sourceforge.net/") + (home-page "https://libwpg.sourceforge.net/") (synopsis "Library and tools for the WordPerfect Graphics format") (description "The libwpg project provides a library and tools for working with graphics in the WPG (WordPerfect Graphics) format.") @@ -760,7 +760,7 @@ from the old StarOffice (.sdc, .sdw, ...).") (list librevenge)) (inputs (list boost zlib)) - (home-page "http://libwps.sourceforge.net/") + (home-page "https://libwps.sourceforge.net/") (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 468f7b1753..c009c78e88 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -578,7 +578,7 @@ over USB.") (list #:configure-flags #~(list "--disable-static" (string-append "--with-udev=" #$output "/lib/udev")))) - (home-page "http://libmtp.sourceforge.net/") + (home-page "https://libmtp.sourceforge.net/") (synopsis "Library implementing the Media Transfer Protocol") (description "Libmtp implements an MTP (Media Transfer Protocol) initiator, which means that it initiates MTP sessions with devices. The @@ -615,7 +615,7 @@ proposed for standardization.") (list gtk+ flac libvorbis libid3tag libmtp)) (native-inputs (list pkg-config)) - (home-page "http://gmtp.sourceforge.net/") + (home-page "https://gmtp.sourceforge.net/") (synopsis "Simple graphical MTP client") (description "gMTP is a simple graphical client for the Media Transfer Protocol (MTP), which allows media files to be transferred to and from many portable diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 61eaec2876..691e0d2edc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2437,7 +2437,7 @@ module.") (for-each (lambda (file) (chmod file #o666)) archives)))))))) - (home-page "http://e2fsprogs.sourceforge.net/") + (home-page "https://e2fsprogs.sourceforge.net/") (synopsis "Creating and checking ext2/ext3/ext4 file systems") (description "This package provides tools for manipulating ext2/ext3/ext4 file systems.") @@ -2502,7 +2502,7 @@ from the e2fsprogs package. It is meant to be used in initrds.") (patches (search-patches "extundelete-e2fsprogs-1.44.patch")))) (build-system gnu-build-system) (inputs (list e2fsprogs)) - (home-page "http://extundelete.sourceforge.net/") + (home-page "https://extundelete.sourceforge.net/") (synopsis "Recover deleted files from ext2/3/4 partitions") (description "Extundelete is a set of tools that can recover deleted files from an @@ -2981,7 +2981,7 @@ early boot when entropy may be low, especially in virtualised environments.") "0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4")))) (build-system gnu-build-system) (synopsis "Lists information about SCSI or NVMe devices in Linux") - (home-page "http://sg.danny.cz/scsi/lsscsi.html") + (home-page "https://sg.danny.cz/scsi/lsscsi.html") (description "@command{lsscsi} lists SCSI logical units or SCSI targets. It can also list NVMe namespaces or controllers and show the relationship between a @@ -3100,7 +3100,7 @@ inadequately in modern network environments, and both should be deprecated.") (sha256 (base32 "0hz9fda9d78spp774b6rr5xaxav7cm4h0qcpxf70rvdbrf6qx7vy")))) - (home-page "http://net-tools.sourceforge.net/") + (home-page "https://net-tools.sourceforge.net/") (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3895,7 +3895,7 @@ NUMA performance on your system.") ;; run (for example) ‘loadkeys en-latin9’ instead of having to find ;; and type ‘i386/colemak/en-latin9’ on a mislabelled keyboard. (files (list "share/keymaps/**"))))) - (home-page "http://kbd-project.org/") + (home-page "https://kbd-project.org/") (synopsis "Linux keyboard utilities and keyboard maps") (description "This package contains keytable files and keyboard utilities compatible @@ -5157,7 +5157,7 @@ specified in /etc/acpi/events and execute the rules that match the event.") (sha256 (base32 "12i0ip11xbfcjzxz4r10cvz7mbzgq1hfcdn97w6zz7sm3wndwrg8")))) (build-system gnu-build-system) - (home-page "http://linux-diag.sourceforge.net/Sysfsutils.html") + (home-page "https://linux-diag.sourceforge.net/Sysfsutils.html") (synopsis "System utilities based on Linux sysfs") (description "These are a set of utilities built upon sysfs, a virtual file system in @@ -8210,7 +8210,7 @@ available in the kernel Linux.") (assoc-ref outputs "out")))))))) (inputs (list perl)) (supported-systems '("i686-linux" "x86_64-linux")) - (home-page "http://www.etallen.com/cpuid.html") + (home-page "https://www.etallen.com/cpuid.html") (synopsis "Dump x86 CPUID processor information") (description "cpuid dumps detailed information about the CPU(s) gathered from the CPUID instruction, and also determines the exact model of CPU(s). It @@ -8652,7 +8652,7 @@ the OS-specific data structures needed by the kernel to setup the event. libpfm4 provides support for the @code{perf_events} interface, which was introduced in Linux 2.6.31.") - (home-page "http://perfmon2.sourceforge.net/") + (home-page "https://perfmon2.sourceforge.net/") (license license:expat))) (define-public libnfnetlink diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 038ca1f18b..fb65a27e62 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -815,7 +815,7 @@ advantages of @command{prove} are: (delete-file-recursively "debian") #t)))) (build-system asdf-build-system/sbcl) - (home-page "http://quickdocs.org/ptester/") + (home-page "https://quickdocs.org/ptester/") (synopsis "Portable test harness package") (description "@command{ptester} is a portable testing framework based on Franz's @@ -1098,7 +1098,7 @@ parameterization.") (description "The XLUnit package is a toolkit for building test suites. It is based on the XPTest package by Craig Brozensky and the JUnit package by Kent Beck.") - (home-page "http://quickdocs.org/xlunit/") + (home-page "https://quickdocs.org/xlunit/") (license license:bsd-3)))) (define-public cl-xlunit diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index dbe87bba1b..a874b74a6a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2883,7 +2883,7 @@ satisfying the test.") (synopsis "Common Lisp library for encoding text in various web-savvy encodings") (description "A library for encoding text in various web-savvy encodings.") - (home-page "http://quickdocs.org/html-encode/") + (home-page "https://quickdocs.org/html-encode/") (license license:expat))) (define-public cl-html-encode @@ -3174,7 +3174,7 @@ readtables, which is akin to package namespacing in Common Lisp.") (build-system asdf-build-system/sbcl) (inputs (list sbcl-parse-number)) - (home-page "http://common-lisp.net/project/py-configparser/") + (home-page "https://common-lisp.net/project/py-configparser/") (synopsis "ConfigParser Python module functionality for Common Lisp") (description "The py-configparser package implements the ConfigParser Python module functionality in Common Lisp. In short, it implements reading @@ -5616,7 +5616,7 @@ PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.") (substitute* "rotate-byte.lisp" (("in-package :cl-utilities)" all) "in-package :cl-utilities)\n\n#+sbcl\n(require :sb-rotate-byte)"))))))) - (home-page "http://common-lisp.net/project/cl-utilities") + (home-page "https://common-lisp.net/project/cl-utilities") (synopsis "Collection of semi-standard utilities") (description "On Cliki.net , there @@ -8234,7 +8234,7 @@ situations, operations on series may be composed functionally and yet execute iteratively, without the need to construct intermediate series values explicitly. In this manner, series provide both the clarity of a functional programming style and the efficiency of an iterative programming style.") - (home-page "http://series.sourceforge.net/") + (home-page "https://series.sourceforge.net/") (license license:expat)))) (define-public cl-series @@ -12085,7 +12085,7 @@ interface for MySQL, PostgreSQL and SQLite.") (description "UFFI provides a universal foreign function interface (FFI) for Common Lisp.") - (home-page "http://quickdocs.org/uffi/") + (home-page "https://quickdocs.org/uffi/") (license license:llgpl))) (define-public cl-uffi @@ -12220,7 +12220,7 @@ interface for MySQL, PostgreSQL and SQLite.") "@code{clsql} is a Common Lisp interface to SQL RDBMS based on the Xanalys CommonSQL interface for Lispworks. It provides low-level database interfaces as well as a functional and an object oriented interface.") - (home-page "http://clsql.kpe.io/") + (home-page "https://clsql.kpe.io/") (license license:llgpl))) (define-public cl-clsql @@ -12286,7 +12286,7 @@ If features: @item Purely functional pairing heaps. @item Purely functional amortized queue. @end itemize\n") - (home-page "http://ndantam.github.io/sycamore/") + (home-page "https://ndantam.github.io/sycamore/") (license license:bsd-3)))) (define-public cl-sycamore @@ -12593,7 +12593,7 @@ MOP easier to use.") (package (name "sbcl-osicat") (version (git-version "0.7.0" revision commit)) - (home-page "http://www.common-lisp.net/project/osicat/") + (home-page "https://www.common-lisp.net/project/osicat/") (source (origin (method git-fetch) @@ -14231,7 +14231,7 @@ package that includes a number of renames and shadows.") sbcl-hu.dwim.common-lisp sbcl-iterate sbcl-metabang-bind)) - (home-page "http://dwim.hu/") + (home-page "https://dwim.hu/") (synopsis "Common Lisp library shared by other hu.dwim systems") (description "This package contains a support library for other hu.dwim systems.") @@ -14629,7 +14629,7 @@ can begin writing unit tests as soon as the project is generated.") (package (name "sbcl-caveman") (version (git-version "2.4.0" revision commit)) - (home-page "http://8arrow.org/caveman/") + (home-page "https://8arrow.org/caveman/") (source (origin (method git-fetch) @@ -15731,7 +15731,7 @@ not so easy to copy (ssyntax, argument destructuring, etc.).") (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) - (home-page "http://common-lisp.net/project/trivial-shell/") + (home-page "https://common-lisp.net/project/trivial-shell/") (synopsis "Common Lisp access to the shell") (description "A simple Common-Lisp interface to the underlying operating system. @@ -16006,7 +16006,7 @@ the @command{flamegraph.pl} script, which is available in the Guix package (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria)) - (home-page "http://shinmera.github.io/trivial-benchmark/") + (home-page "https://shinmera.github.io/trivial-benchmark/") (synopsis "Easy to use benchmarking system for Common Lisp") (description "Trivial-Benchmark runs a block of code many times and outputs some @@ -24817,7 +24817,7 @@ operating on them.") (native-inputs (list sbcl-iterate sbcl-hu.dwim.stefil)) - (home-page "http://nikodemus.github.io/screamer/") + (home-page "https://nikodemus.github.io/screamer/") (synopsis "Nondeterministic programming and constraint propagation") (description "Screamer is an extension of Common Lisp that adds support for @@ -26873,7 +26873,7 @@ Closure Templates.") combinators. Using a simple technique from the functional programming camp, @code{cl-smug} makes it simple to create quick extensible recursive descent parsers without funky syntax or impenetrable macrology.") - (home-page "http://smug.drewc.ca/") + (home-page "https://smug.drewc.ca/") (license license:expat)))) (define-public cl-smug diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 777c6edbc5..22284de7a2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -654,7 +654,7 @@ an interpreter, a compiler, a debugger, and much more.") (search-path-specification (variable "XDG_CONFIG_DIRS") (files '("etc"))))) - (home-page "http://www.sbcl.org/") + (home-page "https://www.sbcl.org/") (synopsis "Common Lisp implementation") (description "Steel Bank Common Lisp (SBCL) is a high performance Common Lisp compiler. In addition to the compiler and runtime system for ANSI Common @@ -877,7 +877,7 @@ libraries such as OpenGL, SDL, Video4Linux, and ALSA (video/audio grabbing), and others. Lush is an ideal frontend script language for programming projects written in C or other languages. Lush also has libraries for Machine Learning, Neural Nets and statistical estimation.") - (home-page "http://lush.sourceforge.net/") + (home-page "https://lush.sourceforge.net/") (license license:lgpl2.1+))) (define-public confusion-mdl @@ -971,7 +971,7 @@ enough to play the original mainframe Zork all the way through.") (invoke "./configure" "+lang" "en" "+fhs" (string-append "-prefix=" (assoc-ref outputs "out"))) #t))))) - (home-page "http://www.kylheku.com/cgit/man/") + (home-page "https://www.kylheku.com/cgit/man/") (synopsis "Modifications to the man utilities, specifically man2html") (description "This is a fork of the man utilities intended specifically for building diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 76b8f6a6b7..550caf7be1 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -88,7 +88,7 @@ "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.") - (home-page "http://log4cpp.sourceforge.net/") + (home-page "https://log4cpp.sourceforge.net/") (license license:lgpl2.1+))) (define-public glog diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 5fd1d66927..d50890bf1e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -655,7 +655,7 @@ standard libraries.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) #t))))) - (home-page "http://stevedonovan.github.io/ldoc/") + (home-page "https://stevedonovan.github.io/ldoc/") (synopsis "Lua documentation generator") (description "LDoc is a LuaDoc-compatible documentation generation system for @@ -779,7 +779,7 @@ Notable examples are GTK+, GStreamer and Webkit.") (description "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).") - (home-page "http://www.inf.puc-rio.br/~roberto/lpeg") + (home-page "https://www.inf.puc-rio.br/~roberto/lpeg") (license license:expat))) (define-public lua-lpeg diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 449335174f..8bd1d8b8bb 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -437,7 +437,7 @@ Performance is achieved by using the LLVM JIT compiler.") "CFLAGS=-fcommon"))) (inputs (list perl)) - (home-page "http://micans.org/mcl/") + (home-page "https://micans.org/mcl/") (synopsis "Clustering algorithm for graphs") (description "The MCL algorithm is short for the @dfn{Markov Cluster Algorithm}, a @@ -564,7 +564,7 @@ sample proximities between pairs of cases.") "0hlbdmjjf1jgsvi3d2hwni5lz3l9a5bzj6ijpbawa8a7cbrpp66y")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-ngram-fsts"))) - (home-page "http://www.openfst.org") + (home-page "https://www.openfst.org") (synopsis "Library for weighted finite-state transducers") (description "OpenFst is a library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs).") @@ -905,7 +905,7 @@ with a single function call.") (invoke "ctest")))))) (native-inputs (list catch-framework)) - (home-page "http://reactivex.io/") + (home-page "https://reactivex.io/") (synopsis "Reactive Extensions for C++") (description "The Reactive Extensions for C++ (RxCpp) is a library of algorithms for diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4c36e05fe0..6ef4c6fdab 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1602,7 +1602,7 @@ system, written in the Mercury language.") (list pandoc pkg-config)) (inputs (list openssl notmuch sqlite xapian)) - (home-page "http://www.muchsync.org/") + (home-page "https://www.muchsync.org/") (synopsis "Synchronize notmuch mail across machines") (description "Muchsync brings Notmuch to all of your computers by synchronizing your @@ -2555,7 +2555,7 @@ separation to safely deliver mail in multi-user setups.") ;; are performed before the actual build process. (build-system gnu-build-system) (inputs (list exim)) - (home-page "http://www.procmail.org/") + (home-page "https://www.procmail.org/") (synopsis "Versatile mail delivery agent (MDA)") (description "Procmail is a mail delivery agent (MDA) featuring support for a variety of mailbox formats such as mbox, mh and maildir. Incoming mail @@ -3041,7 +3041,7 @@ define(`confINST_DEP', `') #:tests? #f)) (inputs (list m4 perl)) - (home-page "http://sendmail.org") + (home-page "https://sendmail.org") (synopsis "Highly configurable Mail Transfer Agent (MTA)") (description @@ -3331,7 +3331,7 @@ writing OpenSMTPd filters.") ;; Our OpenSMTPd package uses libressl, but this package currently ;; supports HAVE_ED25519 only with openssl. openssl)) - (home-page "http://imperialat.at/dev/filter-dkimsign/") + (home-page "https://imperialat.at/dev/filter-dkimsign/") (synopsis "OpenSMTPd filter for signing mail with DKIM") (description "The @command{filter-dkimsign} OpenSMTPd filter signs outgoing e-mail @@ -4676,7 +4676,7 @@ ex-like commands on it.") (list tre)) (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "http://crm114.sourceforge.net/") + (home-page "https://crm114.sourceforge.net/") (synopsis "Controllable regex mutilator") (description "CRM114 is a system to examine incoming e-mail, system log streams, data files or other data streams, and to sort, filter, or alter the diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 8565031571..febcb5a4a8 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -117,7 +117,7 @@ textfiles to roff for terminal display, and also to HTML for the web.") (base32 "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx")))) (build-system gnu-build-system) - (home-page "http://libpipeline.nongnu.org/") + (home-page "https://libpipeline.nongnu.org/") (synopsis "C library for manipulating pipelines of subprocesses") (description "libpipeline is a C library for manipulating pipelines of subprocesses in @@ -211,7 +211,7 @@ a flexible and convenient way.") (list (search-path-specification (variable "MANPATH") (files '("share/man"))))) - (home-page "http://man-db.nongnu.org/") + (home-page "https://man-db.nongnu.org/") (synopsis "Standard Unix documentation system") (description "Man-db is an implementation of the standard Unix documentation system diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d32a6354ab..280465e284 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -930,7 +930,7 @@ large scale eigenvalue problems.") (base32 "1155qixp26c12yrxc76z9mlfw2h3xxymxxv5znpgzh5gaykpndgj")))) (build-system cmake-build-system) - (home-page "http://www.netlib.org/lapack/") + (home-page "https://www.netlib.org/lapack/") (inputs `(("fortran" ,gfortran) ("python" ,python-wrapper))) (arguments @@ -1033,7 +1033,7 @@ provide LAPACK for someone who does not have access to a Fortran compiler.") (substitute* "TESTING/CMakeLists.txt" (("^add_test\\(x[sd]hseqr.*" all) (string-append "# " all "\n")))))))) - (home-page "http://www.netlib.org/scalapack/") + (home-page "https://www.netlib.org/scalapack/") (synopsis "Library for scalable numerical linear algebra") (description "ScaLAPACK is a Fortran 90 library of high-performance linear algebra @@ -1655,7 +1655,7 @@ System (Grid, Point and Swath).") "HDF-EOS5 is a software library built on HDF5 to support the construction of data structures used in NASA's Earth Observing System (Grid, Point and Swath).") - (home-page "http://www.hdfeos.org/software/library.php#HDF-EOS5") + (home-page "https://www.hdfeos.org/software/library.php#HDF-EOS5") ;; Source files carry a permissive license header. (license (license:non-copyleft home-page)))) @@ -1840,7 +1840,7 @@ the resulting text.") `(("texlive" ,texlive-tiny) ("ghostscript" ,ghostscript) ("doxygen" ,doxygen))) - (home-page "http://itpp.sourceforge.net") + (home-page "https://itpp.sourceforge.net") (synopsis "C++ library of maths, signal processing and communication classes") (description "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of @@ -3177,7 +3177,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") (substitute* "api/gmsh.py" (("find_library\\(\"gmsh\"\\)") (simple-format #f "\"~a\"" libgmsh))))))))) - (home-page "http://gmsh.info/") + (home-page "https://gmsh.info/") (synopsis "3D finite element grid generator") (description "Gmsh is a 3D finite element grid generator with a built-in CAD engine and post-processor. Its design goal is to provide a fast, light @@ -3701,7 +3701,7 @@ bindings to almost all functions of SLEPc.") (build-system gnu-build-system) (native-inputs (list autoconf automake)) - (home-page "http://us.metamath.org/") + (home-page "https://us.metamath.org/") (synopsis "Proof verifier based on a minimalistic formalism") (description "Metamath is a tiny formal language and that can express theorems in @@ -4380,7 +4380,7 @@ schemes.") #:phases (modify-phases %standard-phases (add-before 'check 'mpi-setup ,%openmpi-setup)))) - (home-page "http://www.p4est.org") + (home-page "https://www.p4est.org") (synopsis "Adaptive mesh refinement on forests of octrees") (description "The p4est software library enables the dynamic management of a @@ -4632,7 +4632,7 @@ full text searching.") `(("openblas" ,openblas) ("lapack" ,lapack) ("arpack" ,arpack-ng))) - (home-page "http://arma.sourceforge.net/") + (home-page "https://arma.sourceforge.net/") (synopsis "C++ linear algebra library") (description "Armadillo is a C++ linear algebra library, aiming towards a good balance @@ -5050,7 +5050,7 @@ Fresnel integrals, and similar related functions as well.") (native-inputs `(("cmake" ,cmake-minimal) ("m4" ,m4))) - (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") + (home-page "https://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") (description "SuiteSparse is a suite of sparse matrix algorithms, including: UMFPACK, @@ -5078,7 +5078,7 @@ packages.") (base32 "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216")))) (build-system gnu-build-system) - (home-page "http://math-atlas.sourceforge.net/") + (home-page "https://math-atlas.sourceforge.net/") (inputs `(("gfortran" ,gfortran) ("lapack-tar" ,(package-source lapack)))) (outputs '("out" "doc")) @@ -5334,7 +5334,7 @@ specifications.") (install-file name include)) (find-files "." "\\.h$"))) #t)))))) - (home-page "http://lpsolve.sourceforge.net/") + (home-page "https://lpsolve.sourceforge.net/") (synopsis "Mixed integer linear programming (MILP) solver") (description "lp_solve is a mixed integer linear programming solver based on the @@ -5681,7 +5681,7 @@ FLANN is written in C++ and contains bindings for C, Octave and Python.") (list mpfr readline)) (native-inputs (list bison flex)) - (home-page "http://w-calc.sourceforge.net/index.php") + (home-page "https://w-calc.sourceforge.net/index.php") (synopsis "Flexible command-line scientific calculator") (description "Wcalc is a very capable calculator. It has standard functions (sin, asin, and sinh for example, in either radians or degrees), many @@ -7890,7 +7890,7 @@ numeric differences and differences in numeric formats.") (invoke "make" "byte") (invoke "make" "install-lib") #t))))) - (home-page "http://why3.lri.fr") + (home-page "https://why3.lri.fr") (synopsis "Deductive program verification") (description "Why3 provides a language for specification and programming, called WhyML, and relies on external theorem provers, both automated and @@ -7943,7 +7943,7 @@ of C, Java, or Ada programs.") (variable "FRAMAC_LIB") (files '("lib/frama-c")) (separator #f)))) - (home-page "http://frama-c.com") + (home-page "https://frama-c.com") (synopsis "C source code analysis platform") (description "Frama-C is an extensible and collaborative platform dedicated to source-code analysis of C software. The Frama-C analyzers assist you in diff --git a/gnu/packages/mcrypt.scm b/gnu/packages/mcrypt.scm index c0b9c815a5..e5e6338475 100644 --- a/gnu/packages/mcrypt.scm +++ b/gnu/packages/mcrypt.scm @@ -45,7 +45,7 @@ (build-system gnu-build-system) (inputs (list zlib libmcrypt libmhash)) - (home-page "http://mcrypt.sourceforge.net/") + (home-page "https://mcrypt.sourceforge.net/") (synopsis "Replacement for the popular Unix crypt command") (description "MCrypt is a replacement for the old crypt() package and crypt(1) @@ -70,7 +70,7 @@ them.") (base32 "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4")))) (build-system gnu-build-system) - (home-page "http://mcrypt.sourceforge.net/") + (home-page "https://mcrypt.sourceforge.net/") (synopsis "Encryption algorithm library") (description "Libmcrypt is a data encryption library. The library is thread safe and @@ -97,7 +97,7 @@ XTEA, 3WAY, TWOFISH, BLOWFISH, ARCFOUR, WAKE and more.") (build-system gnu-build-system) (native-inputs (list perl)) ;for tests - (home-page "http://mhash.sourceforge.net/") + (home-page "https://mhash.sourceforge.net/") (synopsis "Thread-safe hash library") (description "Mhash is a thread-safe hash library, implemented in C, and provides a diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index c5fc18f5d1..4c14d9412c 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -718,7 +718,7 @@ track of important locations.") (base32 "1q2jj8181pjgsakl28xadv0z4sszq1lb5rpgj070wr0px6mp447p")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) - (home-page "http://advtrains.de/") + (home-page "https://advtrains.de/") (synopsis "Adds good-looking, realistic trains with realistic rails") (description "This mod features realistic trains and various equipment for railways, diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 629bb02acc..c0df1e501c 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -413,7 +413,7 @@ HTTP. Features: "1bk29w09zcpsv8hp0g0al7nwrxa07z0ycls3mbh83wfavk83aprl")))) (build-system python-build-system) (native-inputs (list python-six)) - (home-page "http://graphiteapp.org/") + (home-page "https://graphiteapp.org/") (synopsis "Fixed size round-robin style database for Graphite") (description "Whisper is one of three components within the Graphite project. Whisper is a fixed-size database, similar in design and purpose to @@ -443,7 +443,7 @@ historical data.") (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t))))) (propagated-inputs (list python-cachetools python-txamqp python-urllib3 python-whisper)) - (home-page "http://graphiteapp.org/") + (home-page "https://graphiteapp.org/") (synopsis "Backend data caching and persistence daemon for Graphite") (description "Carbon is a backend data caching and persistence daemon for Graphite. Carbon is responsible for receiving metrics over the network, @@ -665,7 +665,7 @@ future system load (i.e., capacity planning).") (build-system gnu-build-system) (inputs (list ncurses)) (arguments '(#:tests? #f)) ;; No included tests. - (home-page "http://www.maier-komor.de/hostscope.html") + (home-page "https://www.maier-komor.de/hostscope.html") (properties `((release-monitoring-url . ,home-page))) (synopsis "System monitoring tool for multiple hosts") diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 03e4485618..3aa24c75ab 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -212,7 +212,7 @@ whose primary goals are full compliance with the ID3v2 standard, portability across several platforms, and providing a powerful and feature-rich API with a highly stable and efficient implementation.") (license license:lgpl2.0+) - (home-page "http://id3lib.sourceforge.net/"))) + (home-page "https://id3lib.sourceforge.net/"))) (define-public taglib (package @@ -377,7 +377,7 @@ automatic silence split, that can be used also to adjust cddb/cue splitpoints. This package contains the library.") (license license:gpl2+) - (home-page "http://mp3splt.sourceforge.net/mp3splt_page/home.php"))) + (home-page "https://mp3splt.sourceforge.net/mp3splt_page/home.php"))) (define-public mp3splt (package @@ -404,7 +404,7 @@ automatic silence split, that can be used also to adjust cddb/cue splitpoints. This package contains the binary.") (license license:gpl2+) - (home-page "http://mp3splt.sourceforge.net/mp3splt_page/home.php"))) + (home-page "https://mp3splt.sourceforge.net/mp3splt_page/home.php"))) (define-public mpg123 (package @@ -456,7 +456,7 @@ command-line tool as well as a C library, libmpg123.") ("libmad" ,libmad) ("libid3tag" ,libid3tag) ("libao" ,ao))) - (home-page "http://mpg321.sourceforge.net/") + (home-page "https://mpg321.sourceforge.net/") (synopsis "Command-line MP3 player") (description "Mpg321 is a command-line mp3 player. mpg321 is used for frontends, as an mp3 player and as an mp3 to wave file decoder (primarily for @@ -497,7 +497,7 @@ use with CD-recording software).") Libs: -L${libdir} -lmp3lame~@ Cflags: -I${includedir}~%" out ,version))))))))) - (home-page "http://lame.sourceforge.net/") + (home-page "https://lame.sourceforge.net/") (synopsis "MPEG Audio Layer III (MP3) encoder") (description "LAME is a high quality MPEG Audio Layer III (MP3) encoder.") (license license:lgpl2.0))) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index b96efed843..080a8100df 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -158,7 +158,7 @@ correct rounding.") for performing arithmetic on complex numbers. It supports arbitrarily high precision and correctly rounds the results.") (license lgpl3+) - (home-page "http://www.multiprecision.org/mpc/"))) + (home-page "https://www.multiprecision.org/mpc/"))) (define-public mpfi ;; The last release, 1.5.4, lacks source files such as div_ext.c and others diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 42171ce127..f4a570189b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -364,7 +364,7 @@ more.") (list wxwidgets glib alsa-lib)) (native-inputs (list pkg-config)) - (home-page "http://ariamaestosa.sourceforge.net/") + (home-page "https://ariamaestosa.sourceforge.net/") (synopsis "MIDI sequencer and editor") (description "Aria Maestosa is a MIDI sequencer and editor. It lets you compose, edit @@ -1308,7 +1308,7 @@ biographies, reviews and more.") jack-2 json-c pulseaudio)) - (home-page "http://lingot.nongnu.org/") + (home-page "https://lingot.nongnu.org/") (synopsis "Accurate & configurable musical instrument tuner") (description "LINGOT is a musical instrument tuner. It's accurate, easy to use, and @@ -2582,7 +2582,7 @@ Paul), and specifically the PaulXStretch version from Xenakios.") font-bitstream-vera)) (native-inputs (list help2man pkg-config)) - (home-page "http://setbfree.org") + (home-page "https://setbfree.org") (synopsis "Tonewheel organ") (description "setBfree is a MIDI-controlled, software synthesizer designed to imitate @@ -2633,7 +2633,7 @@ Laurens Hammond and Don Leslie.") (list alsa-lib jack-2 liblo libx11)) (native-inputs (list pkg-config)) - (home-page "http://bristol.sourceforge.net/") + (home-page "https://bristol.sourceforge.net/") (synopsis "Synthesizer emulator") (description "Bristol is an emulation package for a number of different @code{classic} @@ -2906,7 +2906,7 @@ main purpose is to liberate raw audio rendering from audio and MIDI drivers.") (list alsa-lib)) (native-inputs (list unzip)) - (home-page "http://portmedia.sourceforge.net/portmidi/") + (home-page "https://portmedia.sourceforge.net/portmidi/") (synopsis "Library for MIDI I/O") (description "PortMidi is a library supporting real-time input and output of MIDI data @@ -2939,7 +2939,7 @@ using a system-independent interface.") (list portmidi alsa-lib)) (native-inputs (list python-cython unzip)) - (home-page "http://portmedia.sourceforge.net/portmidi/") + (home-page "https://portmedia.sourceforge.net/portmidi/") (synopsis "Python bindings to PortMidi") (description "This package provides Python bindings to the PortMidi library.") @@ -3103,7 +3103,7 @@ instrument or MIDI file player.") (native-inputs (list pkg-config ruby)) - (home-page "http://zynaddsubfx.sf.net/") + (home-page "https://zynaddsubfx.sf.net/") (synopsis "Software synthesizer") (description "ZynAddSubFX is a feature heavy realtime software synthesizer. It offers @@ -3165,7 +3165,7 @@ capabilities, custom envelopes, effects, etc.") zlib)) (native-inputs (list pkg-config)) - (home-page "http://yoshimi.sourceforge.net/") + (home-page "https://yoshimi.sourceforge.net/") (synopsis "Multi-paradigm software synthesizer") (description "Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software @@ -3366,7 +3366,7 @@ computer's keyboard.") (list minixml jack-1 alsa-lib)) (native-inputs (list pkg-config)) - (home-page "http://aj-snapshot.sourceforge.net/") + (home-page "https://aj-snapshot.sourceforge.net/") (synopsis "Snapshot connections between ALSA and JACK clients") (description "Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. Because @@ -4070,7 +4070,7 @@ modes available for improved Amiga ProTracker 2/3 compatibility.") (inputs (list alsa-lib ; for asound dependency libx11 libxext sdl)) - (home-page "http://schismtracker.org") + (home-page "https://schismtracker.org") (synopsis "Oldschool sample-based music composition tool") (description "Schism Tracker is a reimplementation of Impulse Tracker, a program used to @@ -4200,7 +4200,7 @@ formats, including most audio formats recognized by FFMpeg.") (version "1.1") (source (origin (method url-fetch) - (uri (string-append "http://www.fourmilab.ch/webtools/midicsv/" + (uri (string-append "https://www.fourmilab.ch/webtools/midicsv/" name "-" version ".tar.gz")) (sha256 (base32 @@ -4218,7 +4218,7 @@ processed by a program to transform the MIDI data (for example, to key transpose a composition or extract a track from a multi-track sequence). A CSV file in the format created by midicsv may be converted back into a standard MIDI file with the csvmidi program.") - (home-page "http://www.fourmilab.ch/webtools/midicsv/") + (home-page "https://www.fourmilab.ch/webtools/midicsv/") (license license:public-domain))) (define-public gx-guvnor-lv2 @@ -4583,7 +4583,7 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") (list qtbase-5 alsa-lib jack-1 liblo lv2)) (native-inputs (list pkg-config qttools-5)) - (home-page "http://qmidiarp.sourceforge.net/") + (home-page "https://qmidiarp.sourceforge.net/") (synopsis "MIDI arpeggiator") (description "QMidiArp is an advanced MIDI arpeggiator, programmable step sequencer and LFO. It can hold any number of arpeggiator, sequencer, or LFO @@ -4609,7 +4609,7 @@ modules running in parallel.") (list qtbase-5 alsa-lib)) (native-inputs (list pkg-config qttools-5)) - (home-page "http://alsamodular.sourceforge.net/") + (home-page "https://alsamodular.sourceforge.net/") (synopsis "MIDI event router and filter") (description "QMidiRoute is a MIDI event router and filter. MIDI note, control change, program change and pitch bend events are logged, and can be @@ -5105,7 +5105,7 @@ It is intended to be simple, GUI-toolkit-agnostic, and slightly biased towards familiarity with MIDI. The DSSI distribution package contains a JACK/ALSA-sequencer reference host and some plugins as well as the specification and header.") - (home-page "http://dssi.sourceforge.net/") + (home-page "https://dssi.sourceforge.net/") ;; The DSSI interface is LGPL2.1+, some tests and examples are GPL2+. ;; The vast majority of examples are in the public domain. (license (list license:lgpl2.1+ license:gpl2+)))) @@ -6655,7 +6655,7 @@ plugin and a standalone JACK application.") (description "TAP (Tom's Audio Processing) plugins is a collection of audio effect plugins originally released as LADSPA plugins. This package offers an LV2 version ported by moddevices.") - (home-page "http://tap-plugins.sourceforge.net/") + (home-page "https://tap-plugins.sourceforge.net/") (license license:gpl2)))) (define-public wolf-shaper @@ -6796,7 +6796,7 @@ It is provided as an LV2 plugin and as a standalone Jack application.") (description "Shiru plugins is a collection of audio plugins created by Shiru, ported to LV2 by the Linux MAO project using the DISTRHO plugin framework.") - (home-page "http://shiru.untergrund.net/software.shtml") + (home-page "https://shiru.untergrund.net/software.shtml") (license license:wtfpl2)))) (define-public a2jmidid diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 5b00da25bb..c33b0a2511 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -354,7 +354,7 @@ of your system.") (symlink "libstfl.so" (string-append lib "/libstfl.so.0")))))))) (inputs (list ncurses)) (native-inputs (list swig)) - (home-page "http://www.clifford.at/stfl/") + (home-page "https://www.clifford.at/stfl/") (synopsis "Structured terminal forms library") (description "Stfl is a library which implements a curses-based widget set for text terminals.") diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 5f3dcdb8ea..489a3c7a43 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -191,4 +191,4 @@ the conversion of images between a variety of different formats. There are over 300 separate tools in the package including converters for about 100 graphics formats.") (license gpl2) - (home-page "http://netpbm.sourceforge.net/"))) + (home-page "https://netpbm.sourceforge.net/"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b5c0758dd5..b5e8afc728 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -675,7 +675,7 @@ the Stream Control Transmission Protocol} (@file{libsctp}) and C language header files (@file{netinet/sctp.h}) for accessing SCTP-specific @acronym{APIs, application programming interfaces} not provided by the standard sockets. It also includes some SCTP-related helper utilities.") - (home-page "http://lksctp.sourceforge.net/") + (home-page "https://lksctp.sourceforge.net/") (license (list ;; Library. @@ -1239,7 +1239,7 @@ or server shell scripts with network connections.") (native-inputs (list which)) (inputs (list openssl)) - (home-page "http://www.maier-komor.de/mbuffer.html") + (home-page "https://www.maier-komor.de/mbuffer.html") (synopsis "Swiss army knife for data stream buffering (network aware)") (description @@ -1564,7 +1564,7 @@ Ethernet devices.") (string-append bin "/ifstatus"))) #t))))) (inputs (list ncurses)) - (home-page "http://ifstatus.sourceforge.net/graphic/index.html") + (home-page "https://ifstatus.sourceforge.net/graphic/index.html") (synopsis "Text based network interface status monitor") (description "IFStatus is a simple, easy-to-use program for displaying commonly @@ -3899,7 +3899,7 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.") (substitute* "Makefile.in" ((" \\$\\(DESTDIR)/\\$\\(runstatedir)") ""))))))) (build-system gnu-build-system) - (home-page "http://bird.network.cz") + (home-page "https://bird.network.cz") (synopsis "Internet Routing Daemon") (description "BIRD is an Internet routing daemon with full support for all the major routing protocols. It allows redistribution between protocols with a @@ -4136,7 +4136,7 @@ easy-to-understand binary values.") (bin (string-append out "/bin"))) (install-file "tunctl" bin)) #t))))) - (home-page "http://tunctl.sourceforge.net") + (home-page "https://tunctl.sourceforge.net") (synopsis "Utility to set up and maintain TUN/TAP network interfaces") (description "Tunctl is used to set up and maintain persistent TUN/TAP network interfaces, enabling user applications to simulate network traffic. @@ -4193,7 +4193,7 @@ network. This must be enabled on the target host, usually in the BIOS.") ((" \\$\\(LIBDEPS\\)") "$(filter-out -l%,$(LIBDEPS))")))) (delete 'bootstrap) ;no configure.ac file (delete 'configure)))) ;no configure script - (home-page "http://traceroute.sourceforge.net/") + (home-page "https://traceroute.sourceforge.net/") (synopsis "Tracks the route taken by packets over an IP network") (description "This package provides a modern, but Linux-specific implementation of the @command{traceroute} command that can be used to follow diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index a1e89f1759..991113c05b 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -236,7 +236,7 @@ user-land JavaScript.") "034iaiq2pdqn342p2404cpz364g282d2hkp9375hysnh9i968wbb")))) (build-system node-build-system) (arguments '(#:tests? #f)) ; No tests. - (home-page "http://www.enchantedage.com/node-mersenne") + (home-page "https://www.enchantedage.com/node-mersenne") (synopsis "Node.js module for generating Mersenne Twister random numbers") (description "This package provides a node.js port of the Mersenne Twister random number generator.") diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index a27c1c6a12..607799f348 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -216,7 +216,7 @@ computers over a network.") #t))))) (inputs (list libressl)) ; enable TLS time constraints. See ntpd.conf(5). - (home-page "http://www.openntpd.org/") + (home-page "https://www.openntpd.org/") (synopsis "NTP client and server by the OpenBSD Project") (description "OpenNTPD is the OpenBSD Project's implementation of a client and server for the Network Time Protocol. Its design goals include being diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dae050af50..55f189efcd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -966,7 +966,7 @@ name = Guix Builder") ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 ;; compiled opam until opam is compatible with OCaml 5.0. `((ocaml5.0-variant . ,(delay opam)))) - (home-page "http://opam.ocamlpro.com/") + (home-page "https://opam.ocamlpro.com/") (synopsis "Package manager for OCaml") (description "OPAM is a tool to manage OCaml packages. It supports multiple @@ -1134,7 +1134,7 @@ concrete syntax of the language (Quotations, Syntax Extensions).") (substitute* "_tags" (("/bin/sh") (which "sh"))) #t))))) - (home-page "http://hevea.inria.fr/") + (home-page "https://hevea.inria.fr/") (synopsis "LaTeX to HTML translator") (description "HeVeA is a LaTeX to HTML translator that generates modern HTML 5. It is @@ -1242,7 +1242,7 @@ Emacs.") (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/") + (home-page "https://gallium.inria.fr/~fpottier/menhir/") (synopsis "Parser generator") (description "Menhir is a parser generator. It turns high-level grammar specifications, decorated with semantic actions expressed in the OCaml @@ -5019,7 +5019,7 @@ Format module of the OCaml standard library.") ("ocaml-sedlex" ,ocaml-sedlex) ("ocaml-easy-format" ,ocaml-easy-format) ("ocaml-base64" ,ocaml-base64))) - (home-page "http://piqi.org") + (home-page "https://piqi.org") (synopsis "Data serialization and conversion library") (description "Piqilib is the common library used by the piqi command-line tool and piqi-ocaml.") @@ -5093,7 +5093,7 @@ and 4 (random based) according to RFC 4122.") (search-input-file inputs "/bin/sh"))))))) (inputs (list lablgtk)) (properties `((upstream-name . "ocamlgraph"))) - (home-page "http://ocamlgraph.lri.fr/") + (home-page "https://ocamlgraph.lri.fr/") (synopsis "Graph library for OCaml") (description "OCamlgraph is a generic graph library for OCaml.") (license license:lgpl2.1))) @@ -6226,7 +6226,7 @@ the OCaml language.") "/lib/ocaml/site-lib/num" " $(FUNCTORYLIB)"))) #t))))) - (home-page "http://cubicle.lri.fr/") + (home-page "https://cubicle.lri.fr/") (synopsis "Model checker for array-based systems") (description "Cubicle is a model checker for verifying safety properties of array-based systems. This is a syntactically restricted class of diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index fdfb7d0a27..8cf90698ea 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -381,7 +381,7 @@ A lexer, @code{pytools.lex}. (list opencl-headers pybind11 opencl-icd-loader)) ;libOpenCL (propagated-inputs (list python-appdirs python-numpy python-pytools python-mako)) - (home-page "http://mathema.tician.de/software/pyopencl") + (home-page "https://mathema.tician.de/software/pyopencl") (synopsis "Python wrapper for OpenCL") (description "PyOpenCL lets you access parallel computing devices such as GPUs from diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 618bb70564..3efcadb50d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -824,7 +824,7 @@ symlinks to the files in a common directory such as /usr/local.") (description "XStow is a replacement of GNU Stow written in C++. It supports all features of Stow with some extensions.") - (home-page "http://xstow.sourceforge.net/") + (home-page "https://xstow.sourceforge.net/") (license license:gpl2))) (define-public rpm @@ -2143,7 +2143,7 @@ from R7RS, which allows most R7RS code to run on R6RS implementations.") (list dejagnu autoconf which)) (inputs (list tcl less procps coreutils python-3)) - (home-page "http://modules.sourceforge.net/") + (home-page "https://modules.sourceforge.net/") (synopsis "Shell environment variables and aliases management") (description "Modules simplify shell initialization and let users modify their environment during the session with modulefiles. Modules are diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index e2a6cfb668..2c81f4d50a 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -172,7 +172,7 @@ execution is also possible.") (arguments `(#:tests? #f)) ;; No tests (native-inputs (list flex which)) - (home-page "http://www.maier-komor.de/xjobs.html") + (home-page "https://www.maier-komor.de/xjobs.html") (properties `((release-monitoring-url . ,home-page))) (synopsis "Parallel execution of jobs with several useful options") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f0aefb39e8..c040afcae7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -719,7 +719,7 @@ interaction.") ;; Look for freetype include files in the correct place. (substitute* "cmake/modules/FindFREETYPE.cmake" (("/usr/local") freetype)))))))) - (home-page "http://podofo.sourceforge.net") + (home-page "https://podofo.sourceforge.net") (synopsis "Tools to work with the PDF file format") (description "PoDoFo is a C++ library and set of command-line tools to work with the @@ -883,7 +883,7 @@ program capable of converting PDF into other formats.") ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0. ;; Users can still choose to use the old license at their option. (license (list license:asl2.0 license:clarified-artistic)) - (home-page "http://qpdf.sourceforge.net/"))) + (home-page "https://qpdf.sourceforge.net/"))) (define-public qpdfview (package @@ -942,7 +942,7 @@ SyncTeX support, and rudimentary support for annotations and forms.") (list gtk+-2 pango poppler glib libgnomecanvas)) (native-inputs (list pkg-config)) - (home-page "http://xournal.sourceforge.net/") + (home-page "https://xournal.sourceforge.net/") (synopsis "Notetaking using a stylus") (description "Xournal is an application for notetaking, sketching, keeping a journal @@ -1121,7 +1121,7 @@ vector formats.") (install-file "impressive.1" man1))))))) ;; TODO: Add dependency on pdftk. (inputs (list python-pygame python-pillow sdl xpdf)) - (home-page "http://impressive.sourceforge.net") + (home-page "https://impressive.sourceforge.net") (synopsis "PDF presentation tool with visual effects") (description "Impressive is a tool to display PDF files that provides visual effects diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 295f8dd141..7b97e7adfa 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6564,7 +6564,7 @@ both positive and negative, in various ways.") (base32 "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0")))) (build-system perl-build-system) - (home-page "http://search.cpan.org/dist/Math-VecStat") + (home-page "https://search.cpan.org/dist/Math-VecStat") (synopsis "Basic numeric stats on vectors") (description "This package provides some basic statistics on numerical vectors. All the subroutines can take a reference to the vector to be @@ -10918,7 +10918,7 @@ as exceptions to standard program flow.") (base32 "0w1k5ffcrpx0fm9jgprrwy0290k6cmy7dyk83s61063migi3r5z9")))) (build-system perl-build-system) - (home-page "http://perltidy.sourceforge.net/") + (home-page "https://perltidy.sourceforge.net/") (synopsis "Perl script tidier") (description "This package contains a Perl script which indents and reformats Perl scripts to make them easier to read. The formatting can be diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index d658b3d3e7..358247f32e 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -351,7 +351,7 @@ and a wide variety of other metadata.") (list perl)) ; for pod2man (inputs (list libjpeg-turbo libpng libtiff zlib)) - (home-page "http://panotools.sourceforge.net/") + (home-page "https://panotools.sourceforge.net/") (synopsis "Library for panoramic images") (description "The libpano13 package contains the backend library written by the @@ -406,7 +406,7 @@ overlapping images, as well as some command line tools.") ;; Fix error: ‘numeric_limits’ is not a member of ‘std’. (("#include " line) (string-append line "\n#include ")))))))) - (home-page "http://enblend.sourceforge.net/") + (home-page "https://enblend.sourceforge.net/") (synopsis "Tools for combining and blending images") (description "Enblend blends away the seams in a panoramic image mosaic using a @@ -746,7 +746,7 @@ off' shooting directly from the controlling computer.") (string-append "wxT(\"" (which "enblend") "\")")) (("wxT\\(\"enfuse\"\\)") (string-append "wxT(\"" (which "enfuse") "\")")))))))) - (home-page "http://hugin.sourceforge.net/") + (home-page "https://hugin.sourceforge.net/") (synopsis "Panorama photo stitcher") (description "Hugin is an easy to use panoramic imaging toolchain with a graphical diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 73694c4ed3..318344f2ec 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -57,7 +57,7 @@ (inputs (list libx11 libxt)) (synopsis "Connect to Plan 9 systems") - (home-page "http://drawterm.9front.org") + (home-page "https://drawterm.9front.org") (description "@command{drawterm} is a client for connecting venerable systems to Plan 9 systems. It behaves like a Plan 9 kernel and will attempt to diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index fd40f79c73..963587ca2e 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -194,7 +194,7 @@ went to university in the 1990s, this is the library for you.") (list autoconf automake texinfo pkg-config)) (inputs (list guile-3.0)) (propagated-inputs (list guile-cairo)) - (home-page "http://wingolog.org/projects/guile-charting/") + (home-page "https://wingolog.org/projects/guile-charting/") (synopsis "Create charts and graphs in Guile") (description "Guile-Charting is a Guile Scheme library to create bar charts and graphs @@ -259,7 +259,7 @@ using the Cairo drawing library.") `("PLOTICUS_PREFABS" ":" = (,dir))))))))) (inputs (list libpng libx11 zlib)) - (home-page "http://ploticus.sourceforge.net/") + (home-page "https://ploticus.sourceforge.net/") (synopsis "Command-line tool for producing plots and charts") (description "Ploticus is a non-interactive software package for producing plots, diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 16ff2c3448..4e3baee408 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -42,7 +42,7 @@ (base32 "1gyxf4bh9jp5gb3l6g5qy90zzcf3vcpk0irgwbv1lc6mrskyhxwg")))) (build-system gnu-build-system) - (home-page "http://argtable.sourceforge.net/") + (home-page "https://argtable.sourceforge.net/") (synopsis "Command line option parsing library") (description "Argtable is an ANSI C library for parsing GNU style command line @@ -78,7 +78,7 @@ line syntax.") (substitute* "tests/testit.sh" ;don't expect old libtool names (("lt-test1") "test1")) #t))))) - (home-page "http://rpm5.org/files/popt/") + (home-page "https://rpm5.org/files/popt/") (synopsis "Command line option parsing library") (description "This is the popt(3) command line option parsing library. While it is diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index d4993060b2..8a1c609669 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -167,7 +167,7 @@ performance measurement opportunites across the hardware and software stack.") (install-file "COPYING" doc))) '("lib" "doc")) #t))))) - (home-page "http://www.vi-hps.org/projects/score-p/") + (home-page "https://www.vi-hps.org/projects/score-p/") (synopsis "Open Trace Format 2 library") (description "The Open Trace Format 2 (@dfn{OTF2}) is a scalable, memory-efficient event trace data format plus support library.") @@ -379,7 +379,7 @@ different kinds of performance behavior.") "/share/doc/scorep"))) (install-file "COPYING" doc) #t)))))) - (home-page "http://www.vi-hps.org/projects/score-p/") + (home-page "https://www.vi-hps.org/projects/score-p/") (synopsis "Performance measurement infrastructure for parallel code") (description "The Score-P (Scalable Performance Measurement Infrastructure for diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 96ba13d484..75aca3d700 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -254,7 +254,7 @@ rates.") (propagated-inputs ;; 'libpulse*.la' contain `-ltdb' and `-lcap', so propagate them. (list libcap tdb)) - (home-page "http://www.pulseaudio.org/") + (home-page "https://www.pulseaudio.org/") (synopsis "Sound server") (description "PulseAudio is a sound server. It is basically a proxy for your sound diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 04c369b482..41a6997190 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1864,7 +1864,7 @@ supported by the MyPy typechecker.") python-virtualenv)) (propagated-inputs (list python-mypy-extensions python-tomli python-typing-extensions)) - (home-page "http://www.mypy-lang.org/") + (home-page "https://www.mypy-lang.org/") (synopsis "Static type checker for Python") (description "Mypy is an optional static type checker for Python that aims to combine the benefits of dynamic typing and static typing. Mypy combines diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 758cd9124c..8c5b185e3f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1855,7 +1855,7 @@ for clients and servers.") (list unzip)) ; for unpacking the source (arguments `(#:tests? #f)) ; tests require python-pbr < 1.7.0 - (home-page "http://cthedot.de/cssutils/") + (home-page "https://cthedot.de/cssutils/") (synopsis "CSS Cascading Style Sheets library for Python") (description @@ -6107,7 +6107,7 @@ displaying warnings when usaged in application code.") (base32 "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f")))) (build-system python-build-system) - (home-page "http://docs.pylonsproject.org/projects/translationstring") + (home-page "https://docs.pylonsproject.org/projects/translationstring") (synopsis "Internationalization tooling for the Pylons project") (description "This package provides a library used by various Pylons project packages for internationalization (i18n) duties related to diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55f8fd3166..f1b137f867 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2525,7 +2525,7 @@ a library.") (build-system python-build-system) (arguments `(#:tests? #f)) ;test suite not included in the release - (home-page "http://www.grantjenks.com/docs/diskcache/") + (home-page "https://www.grantjenks.com/docs/diskcache/") (synopsis "Disk and file backed cache library") (description "DiskCache is a disk and file backed persistent cache.") (license license:asl2.0))) @@ -3180,7 +3180,7 @@ other Python program.") (base32 "1f0jjqvamly4hn7f1palvq27z6yr694rfzyxrb6g0ysbbawxkvq9")))) (build-system python-build-system) - (home-page "http://agateau.com/projects/doxyqml") + (home-page "https://agateau.com/projects/doxyqml") (synopsis "Doxygen input filter for QML files") (description "This package provides a Doxygen input filter for QML files.") @@ -4862,7 +4862,7 @@ leaf preserving the overall structure.") (invoke "python" "test/alltests.py") (format #t "test suite not run~%")) #t))))) - (home-page "http://docutils.sourceforge.net/") + (home-page "https://docutils.sourceforge.net/") (synopsis "Python Documentation Utilities") (description "Docutils is a modular system for processing documentation into useful @@ -8611,7 +8611,7 @@ wraps Python's standard library threading and multiprocessing objects.") ("bash-full" ,bash))) ;full Bash for 'test_replwrap.py' (propagated-inputs (list python-ptyprocess)) - (home-page "http://pexpect.readthedocs.org/") + (home-page "https://pexpect.readthedocs.org/") (synopsis "Controlling interactive console applications") (description "Pexpect is a pure Python module for spawning child applications; @@ -8673,7 +8673,7 @@ older Python versions.") "1hq626mx5jl9zfl0wdrjkxsnh8qd98fqv322n68b9251xjk4bxqr")))) (build-system python-build-system) (native-inputs (list python-setuptools-scm python-toml)) - (home-page "http://importlib-resources.readthedocs.io/") + (home-page "https://importlib-resources.readthedocs.io/") (synopsis "Read resources from Python packages") (description "@code{importlib_resources} is a backport of Python 3's standard library @@ -8962,7 +8962,7 @@ releases.") (build-system python-build-system) (native-inputs (list unzip)) - (home-page "http://cheeseshop.python.org/pypi/simplegeneric") + (home-page "https://cheeseshop.python.org/pypi/simplegeneric") (synopsis "Python module for simple generic functions") (description "The simplegeneric module lets you define simple single-dispatch generic @@ -9695,7 +9695,7 @@ computing.") ;; https://salsa.debian.org/python-team/packages/urwid/-/blob/debian/2.1.2-2/debian/changelog#L141 (lambda _ (delete-file "urwid/tests/test_vterm.py")))))) - (home-page "http://urwid.org") + (home-page "https://urwid.org") (synopsis "Console user interface library for Python") (description "Urwid is a curses-based UI/widget library for Python. It includes many @@ -12395,7 +12395,7 @@ native modules.") (build-system python-build-system) (native-inputs (list python-pytest)) - (home-page "http://www.python-excel.org/") + (home-page "https://www.python-excel.org/") (synopsis "Library for extracting data from Excel files") (description "This package provides a library to extract data from spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and @@ -12427,7 +12427,7 @@ Unicode-aware. It is not intended as an end-user tool.") (invoke "nosetests" "-v"))))))) (native-inputs `(("nose" ,python-nose))) - (home-page "http://www.python-excel.org/") + (home-page "https://www.python-excel.org/") (synopsis "Library for creating spreadsheet Excel files") (description "@code{xlwt} is a library for writing data and formatting information to older Excel files (i.e. .xls). The package itself is pure @@ -12892,7 +12892,7 @@ primary use case is APIs defined before keyword-only parameters existed.") (base32 "1fnhbi3rmk47l9851gbik0flfr64vs5j0hbqx24cafjap6gprxxf")))) (build-system python-build-system) - (home-page "http://pyasn1.sourceforge.net/") + (home-page "https://pyasn1.sourceforge.net/") (synopsis "ASN.1 types and codecs") (description "This is an implementation of ASN.1 types and codecs in Python. It is @@ -14490,7 +14490,7 @@ tasks. It includes single-command deployment for the Django Girls tutorial.") #t)))) #:tests? #f)) (propagated-inputs (list dialog)) - (home-page "http://pythondialog.sourceforge.net/") + (home-page "https://pythondialog.sourceforge.net/") (synopsis "Python interface to the UNIX dialog utility") (description "A Python wrapper for the dialog utility. Its purpose is to @@ -16980,7 +16980,7 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (("logging\\.DEBUG") "logging.INFO")) (invoke "python" "-m" "unittest" "t/test.py"))))))) - (home-page "http://tftpy.sourceforge.net/") + (home-page "https://tftpy.sourceforge.net/") (synopsis "Python trivial file transfer protocol (TFTP) library") (description "TFTPy is a trivial file transfer protocol (TFTP) Python library. It can be used to act both as a TFTP client or TFTP server.") @@ -19082,7 +19082,7 @@ numbers, real numbers, mixed types and more, and comes with a shell command (search-patches "python-random2-getrandbits-test.patch")))) (build-system python-build-system) (native-inputs (list unzip)) - (home-page "http://pypi.python.org/pypi/random2") + (home-page "https://pypi.python.org/pypi/random2") (synopsis "Python 3 version of the Python 2 @code{random} module") (description "This package provides a Python 3 ported version of Python 2.7’s @@ -20862,7 +20862,7 @@ while only declaring the test-specific fields.") (build-system python-build-system) (native-inputs (list python-pytest)) - (home-page "http://arcp.readthedocs.io/") + (home-page "https://arcp.readthedocs.io/") (synopsis "Archive and Package URI parser and generator") (description @@ -21303,7 +21303,7 @@ functionality like full case-folding for case-insensitive matches in Unicode.") (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'"))) ;; Not providing libgle. It seems to be very old. #t))))) - (home-page "http://pyopengl.sourceforge.net") + (home-page "https://pyopengl.sourceforge.net") (synopsis "Standard OpenGL bindings for Python") (description "PyOpenGL is the most common cross platform Python binding to OpenGL and @@ -23914,7 +23914,7 @@ that is accessible to other projects developed in Cython.") (propagated-inputs (list python-sortedcontainers)) (arguments '(#:tests? #f)) ; Tests not included in release tarball. - (home-page "http://www.grantjenks.com/docs/sortedcollections/") + (home-page "https://www.grantjenks.com/docs/sortedcollections/") (synopsis "Python Sorted Collections") (description "Sorted Collections is a Python sorted collections library.") (license license:asl2.0))) @@ -23940,7 +23940,7 @@ that is accessible to other projects developed in Cython.") ("python-distlib" ,python-distlib) ("python-filelock" ,python-filelock) ("python-six" ,python-six-bootstrap))) - (home-page "http://www.grantjenks.com/docs/sortedcontainers/") + (home-page "https://www.grantjenks.com/docs/sortedcontainers/") (synopsis "Sorted List, Sorted Dict, Sorted Set") (description "This package provides a sorted collections library, written in @@ -30094,7 +30094,7 @@ PyRSS2Gen builds the feed up by using a XML generator.") (sha256 (base32 "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq")))) (build-system python-build-system) - (home-page "http://yapsy.sourceforge.net") + (home-page "https://yapsy.sourceforge.net") (synopsis "Simple plugin system for Python applications") (description "Yapsy, or Yet Another Plugin SYstem, is a small library implementing the core mechanisms needed to build a plugin system into a wider @@ -30747,7 +30747,7 @@ running and analyzing benchmarks. It features a simple API that can: (when tests? (invoke "pytest"))))))) (native-inputs (list python-pytest)) - (home-page "http://pydispatcher.sourceforge.net") + (home-page "https://pydispatcher.sourceforge.net") (synopsis "Multi-producer-multi-consumer signal dispatching mechanism") (description "PyDispatcher is an enhanced version of Patrick K. O’Brien’s original @code{dispatcher.py} module. It provides the Python programmer with @@ -30805,7 +30805,7 @@ fashion.") (substitute* "prober.py" (("cmd = .cc") (string-append "cmd = \"" #$(cc-for-target))))))))) - (home-page "http://semanchuk.com/philip/posix_ipc/") + (home-page "https://semanchuk.com/philip/posix_ipc/") (synopsis "POSIX IPC primitives for Python") (description "This package provides POSIX IPC primitives - semaphores, shared memory and diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 01327f6ccf..a3807b8c23 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3829,7 +3829,7 @@ that can be only started once per user. (for-each delete-file (find-files "doc/man/man3" "^_tmp.*")) (mkdir-p man) (copy-recursively "doc/man" man))))))) - (home-page "http://qwt.sourceforge.net") + (home-page "https://qwt.sourceforge.net") (synopsis "Qt widgets for plots, scales, dials and other technical software GUI components") (description @@ -4284,7 +4284,7 @@ generate Python bindings for your C or C++ code."))) (list qtbase-5 qttools-5)) (inputs (list glu)) - (home-page "http://libqglviewer.com") + (home-page "https://libqglviewer.com") (synopsis "Qt-based C++ library for the creation of OpenGL 3D viewers") (description "@code{libQGLViewer} is a C++ library based on Qt that eases the creation @@ -4585,7 +4585,7 @@ a secure way.") (invoke "qmake" (string-append "PREFIX=" #$output) (string-append "LIBDIR=" #$output "/lib"))))))) - (home-page "http://accounts-sso.gitlab.io/signond/index.html") + (home-page "https://accounts-sso.gitlab.io/signond/index.html") (synopsis "Perform user authentication over D-Bus") (description "This package provides a D-Bus service which performs user authentication on behalf of its clients.") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b9612ffd56..59baf72cab 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1902,7 +1902,7 @@ methods: (substitute* "src/libcw/libcw_pa.c" (("libpulse-simple.so" all) (search-input-file inputs "/lib/libpulse-simple.so")))))))) - (home-page "http://unixcw.sourceforge.net/") + (home-page "https://unixcw.sourceforge.net/") (synopsis "Morse code library and programs") (description "@code{unixcw} is a project providing the libcw library and a set of @@ -1971,7 +1971,7 @@ intended for people who want to learn receiving and sending morse code.") (substitute* "src/cfgfile.c" (("/usr/share/") (string-append (assoc-ref outputs "out") "/share/")))))))) - (home-page "http://gnuais.sourceforge.net/") + (home-page "https://gnuais.sourceforge.net/") (synopsis "AIS message demodulator and decoder") (description "This program contains algorithms to demodulate and decode AIS (Automatic diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index 4c7da7376b..210b1a6e64 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -81,7 +81,7 @@ (synopsis "C library for Broadcom BCM 2835 as used in Raspberry Pi") (description "This package provides a C library for Broadcom BCM 2835 as used in the Raspberry Pi") - (home-page "http://www.airspayce.com/mikem/bcm2835/") + (home-page "https://www.airspayce.com/mikem/bcm2835/") (supported-systems '("armhf-linux" "aarch64-linux")) (license license:gpl3))) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 03aecd1ee5..13e62baa84 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -117,7 +117,7 @@ HTML and JSON.") ; SimpleTest fails. ; Notice that the library appears to be unmaintained ; with no reaction to bug reports. - (home-page "http://clucene.sourceforge.net/") + (home-page "https://clucene.sourceforge.net/") (synopsis "C text indexing and searching library") (description "CLucene is a high-performance, scalable, cross platform, full-featured indexing and searching API. It is a port of the very popular @@ -238,7 +238,7 @@ taxonomic inference capability.") ; test failure reported upstream, see ; http://bugs.librdf.org/mantis/view.php?id=571 #:tests? #f)) - (home-page "http://librdf.org/rasqal/") + (home-page "https://librdf.org/rasqal/") (synopsis "RDF query library") (description "Rasqal is a C library that handles Resource Description Framework (RDF) query language syntaxes, query construction and execution @@ -269,7 +269,7 @@ Turtle/N3 and read them in SPARQL XML, RDF/XML and Turtle/N3.") (list rasqal)) ; in Requires.private field of .pc (inputs (list bdb)) - (home-page "http://librdf.org/") + (home-page "https://librdf.org/") (synopsis "RDF library") (description "The Redland RDF Library (librdf) provides the RDF API and triple stores.") diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 7cdee5afd4..639244f37d 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -87,5 +87,5 @@ Python. It is a C++ library.") (description "Superset of the POSIX regex API, enabling approximate matching. Also ships a version of the agrep utility which behaves similar to grep but features inexact matching.") - (home-page "http://laurikari.net/tre") + (home-page "https://laurikari.net/tre") (license license:bsd-2))) diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index ea645c6564..48f6139f1f 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -92,7 +92,7 @@ files in the destination.") (list popt)) (native-inputs (list which perl)) - (home-page "http://librsync.sourceforge.net/") + (home-page "https://librsync.sourceforge.net/") (synopsis "Implementation of the rsync remote-delta algorithm") (description "Librsync is a free software library that implements the rsync diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4750049227..2e8d4038de 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3669,7 +3669,7 @@ use GNU gettext tools for maintenance.") (synopsis "Utility library to package internationalized libraries") (description "Packnga is a library to translate to many languages using YARD.") - (home-page "http://ranguba.org/packnga/") + (home-page "https://ranguba.org/packnga/") (license license:lgpl2.0+))) (define-public ruby-test-construct @@ -5081,7 +5081,7 @@ to reproduce user environments.") (synopsis "HTML, XML, SAX, and Reader parser for Ruby") (description "Nokogiri (鋸) parses and searches XML/HTML, and features both CSS3 selector and XPath 1.0 support.") - (home-page "http://www.nokogiri.org/") + (home-page "https://www.nokogiri.org/") (license license:expat))) (define-public ruby-method-source @@ -6438,7 +6438,7 @@ lock with a counter.") (description "Oj is a JSON parser and generator for Ruby, where the encoding and decoding of JSON is implemented as a C extension to Ruby.") - (home-page "http://www.ohler.com/oj/") + (home-page "https://www.ohler.com/oj/") (license (list license:expat ; Ruby code license:bsd-3)))) ; extension code @@ -6462,7 +6462,7 @@ decoding of JSON is implemented as a C extension to Ruby.") written as a native C extension. It was designed to be an alternative to Nokogiri and other Ruby XML parsers for generic XML parsing and as an alternative to Marshal for Object serialization.") - (home-page "http://www.ohler.com/ox") + (home-page "https://www.ohler.com/ox") (license license:expat))) (define-public ruby-redcloth @@ -11669,7 +11669,7 @@ entities.") (description "Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.") - (home-page "http://sinatrarb.com/") + (home-page "https://sinatrarb.com/") (license license:expat))) (define-public ruby-thin @@ -12525,7 +12525,7 @@ reference object. This object is not created until the first method dispatch.") (sha256 (base32 "197wrgqrddgm1xs3yvjvd8vkvil4h4mdrcp16jmd4b57rxrrr769")))) (build-system ruby-build-system) - (home-page "http://mjackson.github.io/citrus/") + (home-page "https://mjackson.github.io/citrus/") (synopsis "Parsing Expressions for Ruby") (description "Citrus is a parsing library for Ruby that combines the expressiveness of the language with the parsing expressions.") @@ -12549,7 +12549,7 @@ expressiveness of the language with the parsing expressions.") ruby-rspec ruby-rake-compiler ruby-yard)) - (home-page "http://cbor.io/") + (home-page "https://cbor.io/") (synopsis "Concise Binary Object Representation") (description "CBOR is a library for the @acronym{CBOR, Concise Binary Object Representation} format, based on @@ -12739,7 +12739,7 @@ using published rates from open-exchange-rates. Compatible with the money gem." ;; No rakefile `(#:tests? #f)) (propagated-inputs (list ruby-rack)) - (home-page "http://roda.jeremyevans.net") + (home-page "https://roda.jeremyevans.net") (synopsis "Routing Tree Web Toolkit") (description "Roda is a routing tree web toolkit, designed for building fast and maintainable web applications in ruby.") diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index c13de9d65b..d2f369282a 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -392,14 +392,14 @@ mashups, office (web agendas, mail clients, ...), etc.") (version "1.9.2") (source (origin (method url-fetch) - (uri (string-append "http://s48.org/" version + (uri (string-append "https://s48.org/" version "/scheme48-" version ".tgz")) (sha256 (base32 "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw")) (patches (search-patches "scheme48-tests.patch")))) (build-system gnu-build-system) - (home-page "http://s48.org/") + (home-page "https://s48.org/") (synopsis "Scheme implementation using a bytecode interpreter") (description "Scheme 48 is an implementation of Scheme based on a byte-code @@ -701,7 +701,7 @@ linked with a SCM executable.") (install-file "init.scm" scm) #t)))) #:tests? #f)) ; no tests - (home-page "http://tinyscheme.sourceforge.net/") + (home-page "https://tinyscheme.sourceforge.net/") (synopsis "Light-weight interpreter for the Scheme programming language") (description "TinyScheme is a light-weight Scheme interpreter that implements as large a diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 5e7708be6e..21150394db 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -93,7 +93,7 @@ view to show two terminals at once.") #t)))) ;; No check target. #:tests? #f)) - (home-page "http://dtach.sourceforge.net/") + (home-page "https://dtach.sourceforge.net/") (synopsis "Emulates the detach feature of screen") (description "dtach is a tiny program that emulates the detach feature of screen, diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 8334f543b1..f63b391dc1 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -42,7 +42,7 @@ (arguments `(#:configure-flags (list "--disable-static"))) - (home-page "http://sg.danny.cz/sg/sg3_utils.html") + (home-page "https://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") (description "sg3-utils is a collection of utilities for devices that use the Small diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 0c419dfaca..b37ab08642 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -197,7 +197,7 @@ joystick, and graphics hardware.") digital sound files. It can take advantage of particular features of your system, such as sound redirection over the network.") (license license:lgpl2.1) - (home-page "http://mikmod.sourceforge.net/"))) + (home-page "https://mikmod.sourceforge.net/"))) (define-public sdl-gfx (package @@ -377,7 +377,7 @@ SDL.") ("harfbuzz" ,harfbuzz) ("pango" ,pango) ("sdl" ,sdl))) - (home-page "http://sdlpango.sourceforge.net") + (home-page "https://sdlpango.sourceforge.net") (synopsis "Pango SDL binding") (description "This library is a wrapper around the Pango library. It allows you to use TrueType fonts to render internationalized and diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index a192bd16f7..64cc818d65 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -553,7 +553,7 @@ easily view, navigate, and search your command history with suggestion boxes. HSTR can also manage your command history (for instance you can remove commands that are obsolete or contain a piece of sensitive information) or bookmark your favourite commands.") - (home-page "http://me.mindforger.com/projects/hh.html") + (home-page "https://me.mindforger.com/projects/hh.html") (license license:asl2.0))) (define-public shell-functools @@ -617,7 +617,7 @@ install -m 644 rig.6 $(DESTDIR)$(MANDIR)/man6/rig.6") (("install -g 0 -m 644 -o 0 data/\\*.idx \\$\\(DATADIR\\)") "install -m 644 data/*.idx $(DESTDIR)$(DATADIR)"))))) #:tests? #f)) - (home-page "http://rig.sourceforge.net") + (home-page "https://rig.sourceforge.net") (synopsis "Random identity generator") (description "RIG (Random Identity Generator) generates random, yet real-looking, diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 1ade349306..059be5a2be 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -1031,7 +1031,7 @@ command-line utility for mesh optimisation.") (invoke "py.test" "-v" "tests/migration") (invoke "py.test" "-v" "tests/pyadjoint"))) #t))))) - (home-page "http://www.dolfin-adjoint.org") + (home-page "https://www.dolfin-adjoint.org") (synopsis "Automatic differentiation library") (description "@code{python-dolfin-adjoint} is a solver of differential equations associated with a governing system and a diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index c89e95316a..64146813d1 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -109,7 +109,7 @@ (("@LIBC_SO_NAME@") "libc.so") (("@LIBC_SO_DIR@") (string-append libc "/lib")))) #t))))) - (home-page "http://smalltalk.gnu.org/") + (home-page "https://smalltalk.gnu.org/") (synopsis "Smalltalk environment") (description "GNU Smalltalk is a free implementation of the Smalltalk language. It diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index d217d7ba01..79d8dd5a5a 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -169,7 +169,7 @@ building tools.") (inputs (list portaudio pulseaudio)) (native-inputs (list unzip)) - (home-page "http://espeak.sourceforge.net/") + (home-page "https://espeak.sourceforge.net/") (synopsis "Software speech synthesizer") (description "eSpeak is a software speech synthesizer for English and other languages. eSpeak uses a \"formant synthesis\" method. This allows many diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm index 57cdc5e2d8..65732313fe 100644 --- a/gnu/packages/stalonetray.scm +++ b/gnu/packages/stalonetray.scm @@ -39,7 +39,7 @@ "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n")))) (inputs (list libx11)) (build-system gnu-build-system) - (home-page "http://stalonetray.sourceforge.net") + (home-page "https://stalonetray.sourceforge.net") (synopsis "Standalone freedesktop.org and KDE systray implementation") (description "Stalonetray is a stand-alone freedesktop.org and KDE system diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index aec646e92c..4037eec768 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -164,7 +164,7 @@ be output in text, PostScript, PDF or HTML.") (base32 "0aa2w4g5057vn1qjp954s2kwxfmy1h7p5yn56fyi7sz9nmaq69gr")))) (build-system gnu-build-system) - (home-page "http://mcmc-jags.sourceforge.net/") + (home-page "https://mcmc-jags.sourceforge.net/") (native-inputs (list gfortran lapack)) (synopsis "Gibbs sampler") @@ -518,7 +518,7 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") "0jvqvlmb1fjqhcnix1blj7hjiyxy7m1rfjdv3sr2nhyad19rvh5m")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) - (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") + (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Support functions and datasets for Venables and Ripley's MASS") (description "This package provides functions and datasets for the book \"Modern @@ -540,7 +540,7 @@ Applied Statistics with S\" (4th edition, 2002) by Venables and Ripley.") (build-system r-build-system) (propagated-inputs (list r-mass)) - (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") + (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "R functions for classification") (description "This package provides various functions for classification, including @@ -644,7 +644,7 @@ estimation) corresponding to the book: Wand, M.P. and Jones, M.C. (1995) (base32 "1b87fmyjzbg854vpi03my1p25n3d0bchhwsdm2frblxppn98sf12")))) (build-system r-build-system) - (home-page "http://lattice.r-forge.r-project.org/") + (home-page "https://lattice.r-forge.r-project.org/") (synopsis "High-level data visualization system") (description "The lattice package provides a powerful and elegant high-level data @@ -668,7 +668,7 @@ also flexible enough to handle most nonstandard requirements.") (build-system r-build-system) (propagated-inputs (list r-lattice)) - (home-page "http://Matrix.R-forge.R-project.org/") + (home-page "https://Matrix.R-forge.R-project.org/") (synopsis "Sparse and dense matrix classes and methods") (description "This package provides classes and methods for dense and sparse matrices @@ -731,7 +731,7 @@ distributions beyond the exponential family.") (base32 "1l73v6l9ma0vsg4za3c6i3d6yjj7bpdmakbmrzp7205hbkxyp6nj")))) (build-system r-build-system) - (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") + (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Feed-forward neural networks and multinomial log-linear models") (description "This package provides functions for feed-forward neural networks with a @@ -769,7 +769,7 @@ classification, regression and survival trees.") (base32 "01p42q72mb8b4fdm75723nj64r3l0d8px1l9fyklihay9jk6arg4")))) (build-system r-build-system) - (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") + (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") (synopsis "Functions for kriging and point pattern analysis") (description "This package provides functions for kriging and point pattern @@ -837,7 +837,7 @@ curves, Cox models, and parametric accelerated failure time models.") (build-system r-build-system) (native-inputs (list r-knitr)) - (home-page "http://ff.r-forge.r-project.org") + (home-page "https://ff.r-forge.r-project.org") (synopsis "Class for vectors of 1-bit booleans") (description "This package provides bitmapped vectors of booleans (no @code{NA}s), @@ -860,7 +860,7 @@ binary booleans, @code{TRUE} and @code{FALSE} can be stored with 1 bit only.") (build-system r-build-system) (propagated-inputs (list r-bit)) - (home-page "http://ff.r-forge.r-project.org/") + (home-page "https://ff.r-forge.r-project.org/") (synopsis "S3 class for vectors of 64 bit integers") (description "The bit64 package provides serializable S3 atomic 64 bit (signed) @@ -958,7 +958,7 @@ effects of different types of color-blindness.") (arguments `(#:tests? #f #:configure-flags (list "--no-build-vignettes"))) - (home-page "http://dirk.eddelbuettel.com/code/digest.html") + (home-page "https://dirk.eddelbuettel.com/code/digest.html") (synopsis "Create cryptographic hash digests of R objects") (description "This package contains an implementation of a function @code{digest()} for @@ -2006,7 +2006,7 @@ and fast file reading.") (build-system r-build-system) (native-inputs (list r-knitr)) ; for vignettes - (home-page "http://xtable.r-forge.r-project.org/") + (home-page "https://xtable.r-forge.r-project.org/") (synopsis "Export R tables to LaTeX or HTML") (description "This package provides tools to export R data as LaTeX and HTML tables.") @@ -2111,7 +2111,7 @@ building design matrices.") python-matplotlib)) (native-inputs (list python-cython python-nose python-sphinx)) - (home-page "http://statsmodels.sourceforge.net/") + (home-page "https://statsmodels.sourceforge.net/") (synopsis "Statistical modeling and econometrics in Python") (description "Statsmodels is a Python package that provides a complement to scipy for @@ -2154,7 +2154,7 @@ chain.") (build-system r-build-system) (propagated-inputs (list r-mass r-pixmap r-rcpp r-rcpparmadillo r-sp)) - (home-page "http://pbil.univ-lyon1.fr/ADE-4") + (home-page "https://pbil.univ-lyon1.fr/ADE-4") (synopsis "Multivariate data analysis and graphical display") (description "The ade4 package contains data analysis functions to analyze ecological @@ -2749,7 +2749,7 @@ scaling functions for R.") r-mass r-png r-rcolorbrewer)) - (home-page "http://latticeextra.r-forge.r-project.org/") + (home-page "https://latticeextra.r-forge.r-project.org/") (synopsis "Extra graphical utilities based on lattice") (description "Building on the infrastructure provided by the lattice package, this @@ -3025,7 +3025,7 @@ if (certs != \"\") { .opts = merge.list(.opts, list(cainfo=certs)) } (list curl zlib)) (propagated-inputs (list r-bitops)) - (home-page "http://www.omegahat.net/RCurl") + (home-page "https://www.omegahat.net/RCurl") (synopsis "General network client interface for R") (description "The package allows one to compose general HTTP requests and provides @@ -3055,7 +3055,7 @@ ldap, and also supports cookies, redirects, authentication, etc.") (list libxml2 zlib)) (native-inputs (list pkg-config)) - (home-page "http://www.omegahat.net/RSXML") + (home-page "https://www.omegahat.net/RSXML") (synopsis "Tools for parsing and generating XML within R") (description "Many approaches for both reading and creating XML (and HTML) @@ -4143,7 +4143,7 @@ vignettes.") (build-system r-build-system) (native-inputs (list gfortran)) - (home-page "http://mvtnorm.R-forge.R-project.org") + (home-page "https://mvtnorm.R-forge.R-project.org") (synopsis "Package for multivariate normal and t-distributions") (description "This package can compute multivariate normal and t-probabilities, quantiles, random deviates and densities.") @@ -5395,7 +5395,7 @@ can be efficiently implemented directly in the R language.") (list gfortran)) (propagated-inputs (list r-deoptimr)) - (home-page "http://robustbase.r-forge.r-project.org/") + (home-page "https://robustbase.r-forge.r-project.org/") (synopsis "Basic robust statistics") (description "This package analyzes data with robust methods such as @@ -5612,7 +5612,7 @@ showing the progress is useful e.g. bootstrap.") (list r-rcpp)) (inputs (list gfortran)) - (home-page "http://optimizer.r-forge.r-project.org") + (home-page "https://optimizer.r-forge.r-project.org") (synopsis "Derivative-free optimization algorithms by quadratic approximation") (description "This package provides a derivative-free optimization by quadratic approximation @@ -6112,7 +6112,7 @@ easy and fun.") (base32 "1pf554vb902vavgqc4c0kgghywbgcvr3lkkr414bxngavcd60lil")))) (build-system r-build-system) - (home-page "http://strimmerlab.org/software/fdrtool/") + (home-page "https://strimmerlab.org/software/fdrtool/") (synopsis "Estimation of false discovery rates and higher criticism") (description "This package provides tools to estimate tail area-based false discovery @@ -6480,7 +6480,7 @@ functions.") (list java-jtransforms)) (native-inputs (list java-junit)) - (home-page "http://jdistlib.sourceforge.net/") + (home-page "https://jdistlib.sourceforge.net/") (synopsis "Java library of statistical distributions") (description "JDistlib is the Java Statistical Distribution Library, a Java package that provides routines for various statistical distributions.") @@ -7182,7 +7182,7 @@ 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/") + (home-page "https://homepage.divms.uiowa.edu/~luke/xls/xlsinfo/") (license license:expat)))) (define-public r-rlrsim diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 1f4bd0922a..b5195e2cc5 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -52,7 +52,7 @@ perl)) ;;("python" ,python-wrapper) (inputs (list pcre)) - (home-page "http://swig.org/") + (home-page "https://swig.org/") (synopsis "Interface compiler that connects C/C++ code to higher-level languages") (description diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 29515c6eb9..e4dd488cb6 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -422,7 +422,7 @@ export, password protection and auto-saving.") (substitute* "Makefile" (("/man1") "/share/man/man1"))))) #:tests? #f)) ; No "check" target. - (home-page "http://wtime.sourceforge.net") + (home-page "https://wtime.sourceforge.net") (synopsis "Command-line utility for tracking time spent on arbitrary tasks") (description diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index ab86ddee2f..f071b13146 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -134,7 +134,7 @@ (list tcl)) (inputs (list tcllib)) - (home-page "http://incrtcl.sourceforge.net/") + (home-page "https://incrtcl.sourceforge.net/") (synopsis "Object Oriented programming (OOP) extension for Tcl") (description "[incr Tcl] is a widely used object-oriented system for Tcl. The name is @@ -392,7 +392,7 @@ modules for Tk, all written in high-level Tcl. Examples of provided widgets: (assoc-ref %build-inputs "libxslt") "/bin/xslt-config")) #:test-target "test")) - (home-page "http://tclxml.sourceforge.net/") + (home-page "https://tclxml.sourceforge.net/") (synopsis "Tcl library for XML parsing") (description "TclXML provides event-based parsing of XML documents. The application may register callback scripts for certain document features, and @@ -424,7 +424,7 @@ callback is evaluated.") "/lib")))) (inputs (list tcl tk)) - (home-page "http://tclx.sourceforge.net/") + (home-page "https://tclx.sourceforge.net/") (synopsis "System programming extensions for Tcl") (description "Extended Tcl is oriented towards system programming tasks and large diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3877fbc4c8..51b135c99d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -425,7 +425,7 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (description "Libtermkey handles all the necessary logic to recognise special keys, UTF-8 combining, and so on, with a simple interface.") - (home-page "http://www.leonerd.org.uk/code/libtermkey") + (home-page "https://www.leonerd.org.uk/code/libtermkey") (license license:expat))) (define-public mlterm @@ -457,7 +457,7 @@ combining, and so on, with a simple interface.") libx11 libxext libxft)) - (home-page "http://mlterm.sourceforge.net/") + (home-page "https://mlterm.sourceforge.net/") (synopsis "Multi-Lingual TERMinal emulator") (description "mlterm is a multi-lingual terminal emulator. It supports various complex @@ -650,7 +650,7 @@ should be thread-safe.") (source (origin (method url-fetch) - (uri (string-append "http://www.leonerd.org.uk/code/libvterm/" + (uri (string-append "https://www.leonerd.org.uk/code/libvterm/" "libvterm-" version ".tar.gz")) (sha256 (base32 "15y3y23kfpcda7n79ym3gp1abzn8mshxrad8s3gnhls82nfava15")))) @@ -665,7 +665,7 @@ should be thread-safe.") (delete 'configure)))) (native-inputs (list libtool perl)) - (home-page "http://www.leonerd.org.uk/code/libvterm/") + (home-page "https://www.leonerd.org.uk/code/libvterm/") (synopsis "VT220/xterm/ECMA-48 terminal emulator library") (description "Libvterm is an abstract C99 library which implements a VT220 or xterm-like terminal emulator. It doesn't use any particular graphics diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 08573a3aeb..d0ee03c16f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1215,7 +1215,7 @@ support (for use with a variety of encodings) is provided.") (base32 "0yyk0dr4yms82mwy4dc03zf5igyhgcb65icdah042rk23rlpxygv") #:trivial? #t)) - (home-page "http://www.gust.org.pl/projects/e-foundry/latin-modern/") + (home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern/") (synopsis "Latin Modern family of fonts") (description "The Latin Modern fonts are derived from the famous Computer Modern fonts designed by Donald E. Knuth and described in Volume E of his @@ -1236,7 +1236,7 @@ Computers & Typesetting series.") (base32 "0gqdk8x3r1iz4n8j6r3pcqbwalxvkihayvmjfq4iv6hwb0pvys8z") #:trivial? #t)) - (home-page "http://www.gust.org.pl/projects/e-foundry/latin-modern") + (home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern") (synopsis "OpenType maths fonts for Latin Modern") (description "Latin Modern Math is a maths companion for the Latin Modern family of fonts, in OpenType format. For use with LuaLaTeX or XeLaTeX, @@ -4151,7 +4151,7 @@ polyglossia package rather than Babel.") "fonts/vf/cs/cs-a35/") (base32 "1ww5lrqja051fh0ygmfdyy5a6bhwq9k5zv857vwiqf5syvw5djps") #:trivial? #t)) - (home-page "http://petr.olsak.net/cstex/") + (home-page "https://petr.olsak.net/cstex/") (synopsis "Czech/Slovak-tuned Computer Modern fonts") (description "This package provides Czech/Slovak-tuned Computer Modern fonts in the Metafont format; Type 1 format versions (csfonts-t1) are also @@ -4167,7 +4167,7 @@ available.") (list "tex/csplain/base/") (base32 "0cgrwc8lgf2x2hq6bb4kqxw597card985zdd9ipn7k98mmwrxhz3") #:trivial? #t)) - (home-page "http://petr.olsak.net/csplain-e.html") + (home-page "https://petr.olsak.net/csplain-e.html") (synopsis "Plain TeX multilanguage support") (description "CSplain is a small extension of basic Plain TeX macros from which the formats @code{csplain} and @code{pdfcsplain} can be generated. It @@ -8194,7 +8194,7 @@ values (strings, macros, or numbers) pasted together.") ("perl-file-which" ,perl-file-which) ("perl-test-more" ,perl-test-most) ; FIXME: "more" would be sufficient ("perl-test-differences" ,perl-test-differences))) - (home-page "http://biblatex-biber.sourceforge.net/") + (home-page "https://biblatex-biber.sourceforge.net/") (synopsis "Backend for the BibLaTeX citation management tool") (description "Biber is a BibTeX replacement for users of biblatex. Among other things it comes with full Unicode support.") @@ -8267,7 +8267,7 @@ PDF documents.") (list poppler-qt5 qtbase-5 qtscript zlib)) (native-inputs (list pkg-config)) - (home-page "http://www.xm1math.net/texmaker/") + (home-page "https://www.xm1math.net/texmaker/") (synopsis "LaTeX editor") (description "Texmaker is a program that integrates many tools needed to develop documents with LaTeX, in a single application.") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 16400481b0..e05a58c447 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -301,7 +301,7 @@ can load dynamic libraries.") "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9")))) (build-system gnu-build-system) (inputs (list ncurses)) - (home-page "http://joe-editor.sourceforge.net/") + (home-page "https://joe-editor.sourceforge.net/") (synopsis "Console screen editor") (description "JOE is a powerful console screen editor with a \"mode-less\" user diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 151add964e..aeff4593a8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -852,7 +852,7 @@ categories.") (invoke "sh" "test_all.sh"))))))))) (native-inputs (list which)) ;for tests (inputs (list pcre)) - (home-page "http://drmtools.sourceforge.net/") + (home-page "https://drmtools.sourceforge.net/") (synopsis "Utilities to manipulate text and binary files") (description "The drm_tools package contains the following commands: @table @command @@ -1082,7 +1082,7 @@ names like Euro. @item Handling (bullet, decimal, letter, roman) lists along with (attempt at) indentation. @end itemize\n") - (home-page "http://docx2txt.sourceforge.net") + (home-page "https://docx2txt.sourceforge.net") (license license:gpl3+))) (define-public html2text diff --git a/gnu/packages/tv.scm b/gnu/packages/tv.scm index 3927aca776..f8b7c4c696 100644 --- a/gnu/packages/tv.scm +++ b/gnu/packages/tv.scm @@ -68,7 +68,7 @@ zlib)) (native-inputs (list pkg-config)) - (home-page "http://tvtime.sourceforge.net") + (home-page "https://tvtime.sourceforge.net") (synopsis "Television viewer") (description "Tvtime processes the input from your video capture card and diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 857af13d71..afb9546966 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -65,7 +65,7 @@ '("LineBreakTest.txt" "WordBreakTest.txt" "GraphemeBreakTest.txt"))))))) - (home-page "http://vimgadgets.sourceforge.net/libunibreak/") + (home-page "https://vimgadgets.sourceforge.net/libunibreak/") (synopsis "Unicode line breaking and word breaking algorithms") (description "Libunibreak is an implementation of the line breaking and word diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index ff78829e4e..df94dc8f8b 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -113,7 +113,7 @@ over IRC, instant messaging, network games, and most server software.") ;; https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00312.html. `(#:tests? #f #:configure-flags '("--disable-static"))) - (home-page "http://pupnp.sourceforge.net") + (home-page "https://pupnp.sourceforge.net") (synopsis "Portable SDK for UPnP Devices") (description "The portable SDK for UPnP Devices (libupnp) provides developers with an diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 49dc96d454..9f1c5d3f33 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2165,7 +2165,7 @@ patch associated with a particular revision of an RCS file.") '(#:tests? #f #:configure-flags (list "--with-external-zlib"))) (inputs (list zlib nano)) ; the default editor - (home-page "http://cvs.nongnu.org") + (home-page "https://cvs.nongnu.org") (synopsis "Historical centralized version control system") (description "CVS is a version control system, an important component of Source diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fcbafdb846..f63d5494de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -307,7 +307,7 @@ audio/video everything to everything converter primarily focused on producing AVI video files with MP3 audio, but also including a program to read all the video and audio streams from a DVD.") (home-page - "http://linuxfromscratch.org/blfs/view/svn/multimedia/transcode.html") + "https://linuxfromscratch.org/blfs/view/svn/multimedia/transcode.html") (license license:gpl2+))) (define-public svt-hevc @@ -469,7 +469,7 @@ as a joint effort between the BBC and Fluendo.") (synopsis "Quick Time Library") (description "The goal of this project is to enhance the quicktime4linux library.") - (home-page "http://libquicktime.sourceforge.net/") + (home-page "https://libquicktime.sourceforge.net/") (license license:lgpl2.1+))) (define-public mjpg-streamer @@ -538,7 +538,7 @@ receiving MJPG streams.") (description "Mjpeg tools is a suite of programs which support video capture, editing, playback, and compression to MPEG of MJPEG video. Edit, play and compression software is hardware independent.") - (home-page "http://mjpeg.sourceforge.net/") + (home-page "https://mjpeg.sourceforge.net/") (license license:gpl2+))) (define-public libmms @@ -766,7 +766,7 @@ stream decoding") (string-append "--build=" build) (string-append "--with-ncurses=" ncurses)))))))) - (home-page "http://aa-project.sourceforge.net/aalib/") + (home-page "https://aa-project.sourceforge.net/aalib/") (synopsis "ASCII-art library") (description "AA-lib is a low level gfx library which does not require graphics device. @@ -839,7 +839,7 @@ mpv's powerful playback capabilities.") ;; system fixes above. (replace 'bootstrap (lambda _ (invoke "sh" "bootstrap")))))) - (home-page "http://liba52.sourceforge.net/") + (home-page "https://liba52.sourceforge.net/") (synopsis "ATSC A/52 audio stream decoder") (description "liba52 is a library for decoding ATSC A/52 audio streams. The A/52 standard is used in a variety of applications, including digital @@ -907,7 +907,7 @@ shared library and encoder and decoder command-line executables.") libice sdl)) (build-system gnu-build-system) - (home-page "http://libmpeg2.sourceforge.net/") + (home-page "https://libmpeg2.sourceforge.net/") (synopsis "MPEG1 and MPEG2 video decoder library") (description "libmpeg2 is a library which can decode MPEG1 and MPEG2 video streams.") @@ -1342,7 +1342,7 @@ on the Invidious instances only as a fallback method.") (rename-file file (string-append static "/lib/" file))) (find-files "." "\\.a$"))))))))) - (home-page "http://x265.org/") + (home-page "https://x265.org/") (synopsis "Library for encoding h.265/HEVC video streams") (description "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.") @@ -1445,7 +1445,7 @@ streams.") (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list libxv)) - (home-page "http://libdv.sourceforge.net/") + (home-page "https://libdv.sourceforge.net/") (synopsis "DV video (IEC 61834 and SMPTE 314M) codec") (description "The Quasar DV codec (libdv) is a software codec for DV video, the encoding format used by most digital camcorders, typically those @@ -2856,7 +2856,7 @@ installed).") (synopsis "Generates a DVD-Video movie from a MPEG-2 stream") (description "@command{dvdauthor} will generate a DVD-Video movie from a MPEG-2 stream containing VOB packets.") - (home-page "http://dvdauthor.sourceforge.net") + (home-page "https://dvdauthor.sourceforge.net") (license license:gpl3+))) (define-public libdvdnav @@ -4452,7 +4452,7 @@ programmers to access a standard API to open and decompress media files.") wxwidgets-gtk2)) (native-inputs (list intltool desktop-file-utils pkg-config)) - (home-page "http://www.aegisub.org/") + (home-page "https://www.aegisub.org/") (synopsis "Subtitle engine") (description "Aegisub is a tool for creating and modifying subtitles. Aegisub makes @@ -4527,7 +4527,7 @@ tools for styling them, including a built-in real-time video preview.") ;; precedence in case they have e.g. the full gst-plugins-bad. `("GST_PLUGIN_SYSTEM_PATH" suffix (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))) - (home-page "http://www.pitivi.org") + (home-page "https://www.pitivi.org") (synopsis "Video editor based on GStreamer Editing Services") (description "Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application that can appeal @@ -4553,7 +4553,7 @@ to newbies and professionals alike.") '(#:configure-flags '("LIBS=-lm"))) (native-inputs (list pkg-config doxygen)) - (home-page "http://gmerlin.sourceforge.net") + (home-page "https://gmerlin.sourceforge.net") (synopsis "Low level library for multimedia API building") (description "Gavl is short for Gmerlin Audio Video Library. It is a low level @@ -5173,7 +5173,7 @@ Theora videos. Theorafile was written to be used for FNA's VideoPlayer.") (build-system gnu-build-system) (inputs (list libdvdcss libdvdread)) - (home-page "http://dvdbackup.sourceforge.net") + (home-page "https://dvdbackup.sourceforge.net") (synopsis "DVD video ripper") (description "A simple command line tool to backup video from a DVD. Decrypts the @@ -5507,7 +5507,7 @@ wlroots-based compositors. More specifically, those that support gsl portaudio alsa-lib)) - (home-page "http://guvcview.sourceforge.net/") + (home-page "https://guvcview.sourceforge.net/") (synopsis "Control your webcam and capture videos and images") (description "GTK+ UVC Viewer (guvcview) is a graphical application to control a @@ -5667,7 +5667,7 @@ create video contact sheets (previews) of videos. Any video supported by MPlayer and FFmpeg can be used. A note of warning: Unlike most similar tools VCS, by default, makes screenshots the same size as the video, see the manual for details on how to change this.") - (home-page "http://p.outlyer.net/vcs/") + (home-page "https://p.outlyer.net/vcs/") (license license:lgpl2.1+))) (define-public svtplay-dl diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 927be39676..7aaa816308 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2200,7 +2200,7 @@ by default and can be made read-only.") `(#:tests? #f)) ; no tests exist (inputs (list libxrandr)) - (home-page "http://bochs.sourceforge.net/") + (home-page "https://bochs.sourceforge.net/") (synopsis "Emulator for x86 PC") (description "Bochs is an emulator which can emulate Intel x86 CPU, common I/O diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 3efacf7346..39d5e3c37f 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -77,7 +77,7 @@ `(("gettext" ,gettext-minimal) ("perl" ,perl) ("pkg-config" ,pkg-config))) - (home-page "http://w3m.sourceforge.net/") + (home-page "https://w3m.sourceforge.net/") (synopsis "Text-mode web browser") (description "w3m is a text-based web browser as well as a pager like @code{more} or diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e5fb7abfc1..fd0e68c591 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -681,7 +681,7 @@ supported at your website.") (source (origin (method hg-fetch) (uri (hg-reference - (url "http://hg.nginx.org/xslscript") + (url "https://hg.nginx.org/xslscript") (changeset changeset))) (file-name (string-append name "-" version)) (sha256 @@ -705,7 +705,7 @@ supported at your website.") out-bin "/xslscript.pl")) #t)))))) - (home-page "http://hg.nginx.org/xslscript") + (home-page "https://hg.nginx.org/xslscript") (synopsis "XSLScript with NGinx specific modifications") (description "XSLScript is a terse notation for writing complex XSLT stylesheets. @@ -1244,7 +1244,7 @@ project) (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (inputs (list qtbase-5)) - (home-page "http://qjson.sourceforge.net") + (home-page "https://qjson.sourceforge.net") (synopsis "Library that maps JSON data to QVariant objects") (description "QJson is a Qt-based library that maps JSON data to @code{QVariant} objects. JSON arrays will be mapped to @code{QVariantList} @@ -1749,7 +1749,7 @@ UTS#46.") (synopsis "HTML validator and tidier") (description "HTML Tidy is a command-line tool and C library that can be used to validate and fix HTML data.") - (home-page "http://tidy.sourceforge.net/") + (home-page "https://tidy.sourceforge.net/") (license (license:x11-style "file:///include/tidy.h")))) (define-public esbuild @@ -1967,7 +1967,7 @@ hash/signatures.") (sha256 (base32 "0d0giry6bb57pnidymvdl7i5x9bq3ljk3g4bs294hcr5mj3cq0kw")))) (build-system gnu-build-system) - (home-page "http://quvi.sourceforge.net/") + (home-page "https://quvi.sourceforge.net/") (synopsis "Media stream URL parser") (description "This package contains support scripts called by libquvi to parse media stream properties.") @@ -2001,7 +2001,7 @@ parse media stream properties.") (list (string-append "liblua_CFLAGS=-I" lua "/include") (string-append "liblua_LIBS=-L" lua "/libs -llua"))))) - (home-page "http://quvi.sourceforge.net/") + (home-page "https://quvi.sourceforge.net/") (synopsis "Media stream URL parser") (description "libquvi is a library with a C API for parsing media stream URLs and extracting their actual media files.") @@ -2023,7 +2023,7 @@ URLs and extracting their actual media files.") (native-inputs (list pkg-config)) (inputs (list curl libquvi)) - (home-page "http://quvi.sourceforge.net/") + (home-page "https://quvi.sourceforge.net/") (synopsis "Media stream URL parser") (description "quvi is a command-line-tool suite to extract media files from streaming URLs. It is a command-line wrapper for the libquvi library.") @@ -6192,7 +6192,7 @@ used to start services with both privileged and non-privileged port numbers.") #t)))))) (native-inputs (list libxslt)) - (home-page "http://www.html-tidy.org/") + (home-page "https://www.html-tidy.org/") (synopsis "HTML Tidy with HTML5 support") (description "Tidy is a console application which corrects and cleans up @@ -8094,7 +8094,7 @@ returned.") (sha256 (base32 "1j3mzjlczjrk4ahc43s6kzpvzypzjmqz4sillnca5yadrwwgjf2x")))) (build-system gnu-build-system) - (home-page "http://htmlcxx.sourceforge.net/") + (home-page "https://htmlcxx.sourceforge.net/") (synopsis "Simple non-validating CSS1 and HTML parser for C++") (description "htmlcxx is a simple non-validating CSS1 and HTML parser for C++. Although there are several other HTML parsers available, htmlcxx has some diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0d3e27e7cc..e8bf3f6ac9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1026,7 +1026,7 @@ tiling window manager for X.") #:tests? #f ;no tests #:phases (modify-phases %standard-phases (delete 'configure)))) ;no configure script - (home-page "http://www.6809.org.uk/evilwm/") + (home-page "https://www.6809.org.uk/evilwm/") (synopsis "Minimalist window manager for the X Window System") (description "evilwm is a minimalist window manager based on aewm, extended to feature @@ -1295,7 +1295,7 @@ all of them. Currently supported window managers include: @item WindowMaker @item XFCE @end enumerate\n") - (home-page "http://menumaker.sourceforge.net/") + (home-page "https://menumaker.sourceforge.net/") (license license:bsd-2))) (define-public keybinder diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index 1fdcf0ac2b..bb773f2ed1 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -55,5 +55,5 @@ to plain text but will lack formatting. Other programs can use wv as a library to convert Word documents to other formats. AbiWord uses it as its Word importer, and KWord uses concepts and code from wv in theirs.") - (home-page "http://wvware.sourceforge.net/") + (home-page "https://wvware.sourceforge.net/") (license license:gpl2+))) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index c62fc20fec..5440a2725b 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -338,7 +338,7 @@ provide a 100% native look and feel for the application.") (synopsis "C++ library to create, manipulate and render SVG files") (description "wxSVG is a C++ library to create, manipulate and render @dfn{Scalable Vector Graphics} (SVG) files with the wxWidgets toolkit.") - (home-page "http://wxsvg.sourceforge.net") + (home-page "https://wxsvg.sourceforge.net") ;; wxSVG is licenced under the "wxWindows library licence", which is ;; the LGPL2.0+, with a few extra permissions. diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ddb70bd817..b4f0235d3b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -768,7 +768,7 @@ and Matrox.") "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) - (home-page "http://bitmath.org/code/mtdev/") + (home-page "https://bitmath.org/code/mtdev/") (synopsis "Multitouch protocol translation library") (description "Mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events @@ -1782,7 +1782,7 @@ Saver extension) library.") (native-inputs (list autoconf automake libtool)) (inputs (list libxt)) - (home-page "http://www.vergenet.net/~conrad/software/xsel/") + (home-page "https://www.vergenet.net/~conrad/software/xsel/") (synopsis "Manipulate X selection") (description "XSel is a command-line program for getting and setting the contents of diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 1d4d17527c..8efe561433 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -64,7 +64,7 @@ ;; The patch-dot-desktop-files phase requires a relative name. (("Exec=/usr/bin/xfig") "Exec=xfig")) #t))))) - (home-page "http://mcj.sourceforge.net/") + (home-page "https://mcj.sourceforge.net/") (synopsis "Interactive drawing tool") (description "Xfig is an interactive drawing tool which runs under X Window System. @@ -146,7 +146,7 @@ selected in various ways. For text, 35 fonts are available.") (add-after 'install 'install/doc (lambda _ (invoke "make" "install.man")))))) - (home-page "http://mcj.sourceforge.net/") + (home-page "https://mcj.sourceforge.net/") (synopsis "Create portable LaTeX figures") (description "Transfig creates a makefile to translate figures described in Fig code diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2565b13632..0b26a63e85 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -449,7 +449,7 @@ based on libxml for XML parsing, tree manipulation and XPath support.") (list opensp)) (native-inputs (list perl)) - (home-page "http://openjade.sourceforge.net/") + (home-page "https://openjade.sourceforge.net/") (synopsis "ISO/IEC 10179:1996 standard DSSSL language implementation") (description "OpenJade is an implementation of Document Style Semantics and Specification Language (DSSSL), a style language to format SGML or XML @@ -1102,7 +1102,7 @@ parsing/saving.") (base32 "1d17pyixbfvjyi2lb0cfp0ch8wwdf44mmg3r5pwqhyyqs66z601a")))) (build-system python-build-system) - (home-page "http://pyxb.sourceforge.net/") + (home-page "https://pyxb.sourceforge.net/") (synopsis "Python XML Schema Bindings") (description "PyXB (\"pixbee\") is a pure Python package that generates Python source @@ -1348,7 +1348,7 @@ C++ programming language.") #t)))))) (inputs (list libxslt libxml2)) - (home-page "http://xmlstar.sourceforge.net/") + (home-page "https://xmlstar.sourceforge.net/") (synopsis "Command line XML toolkit") (description "XMLStarlet is a set of command line utilities which can be used to transform, query, validate, and edit XML documents. XPath is used to @@ -1724,7 +1724,7 @@ support.") (substitute* "GNUmakefile" (("#! /bin/sh") (which "sh"))) #t))))) - (home-page "http://xmlrpc-c.sourceforge.net/") + (home-page "https://xmlrpc-c.sourceforge.net/") (synopsis "Lightweight RPC library based on XML and HTTP") (description "XML-RPC is a quick-and-easy way to make procedure calls over the Internet. @@ -1809,7 +1809,7 @@ modular implementation of XML-RPC for C and C++.") (files '("sgml")) (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") (file-type 'regular)))) - (home-page "http://openjade.sourceforge.net/") + (home-page "https://openjade.sourceforge.net/") (synopsis "Suite of SGML/XML processing tools") (description "OpenSP is an object-oriented toolkit for SGML parsing and entity management. It is a fork of James Clark's SP suite. The tools it diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a43809e3cb..0d3c8362bc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3128,7 +3128,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.") (synopsis "Qxl video driver for X server") (description "xf86-video-qxl is a video driver for the Xorg X server. This driver is intended for the spice qxl virtio device.") - (home-page "http://www.spice-space.org") + (home-page "https://www.spice-space.org") (license license:x11))) (define-public xf86-video-r128 -- cgit 1.4.1 From 00d855ae3aa8a5023e1181e94c9dadde1d4da6c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:01 +0100 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.24. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.24. --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 08677d612a..ba500d433e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -895,7 +895,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.22") + (version "1.7.24") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -903,11 +903,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/96/" - "55/c6fced63098ae1ba104f11f572794fd558ffca29/" - "epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/14/31/" + "90/d2f5b28fcfaa0a1d1753eac5703aa5d88004ce06/" + "epson-inkjet-printer-escpr-1.7.24-1lsb3.2.tar.gz")) (sha256 - (base32 "0b359krhhjjw5hc4b0gqdqwrm6dzc263mdccfzgnyyq7znkyybqb")))) + (base32 "0bwff3p6d0xgghf3bicylbxkv9vxz3gjjbr0iafyxz23kalzz9qj")))) (build-system gnu-build-system) (arguments (list #:modules -- cgit 1.4.1 From e701f67246680c81dd111cf7136b936bf7d8718b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Feb 2023 01:00:00 +0100 Subject: gnu: linux-libre: Consistently provide the drop_monitor module. This is needed by, e.g., . Build it as a module everywhere for consistency. * gnu/packages/aux-files/linux-libre/4.14-i686.conf: Set CONFIG_NET_DROP_MONITOR=m. * gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/4.19-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/4.19-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.10-arm.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.10-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.10-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.10-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-arm.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.15-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.4-arm.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.4-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.4-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-arm.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-arm64.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-i686.conf: Likewise. * gnu/packages/aux-files/linux-libre/6.1-x86_64.conf: Likewise. Reported by mirai in #guix. --- gnu/packages/aux-files/linux-libre/4.14-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.10-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.10-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.15-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-arm.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-arm64.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/6.1-x86_64.conf | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/linux-libre/4.14-i686.conf b/gnu/packages/aux-files/linux-libre/4.14-i686.conf index 16a7817115..6ac3782c02 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-i686.conf @@ -1645,7 +1645,7 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index 3953ee9104..8171e5ec5e 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -1639,7 +1639,7 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 0e6637325d..2ab9d081d3 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -1747,7 +1747,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index 24148dcf6f..81bdb00117 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -1753,7 +1753,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # diff --git a/gnu/packages/aux-files/linux-libre/5.10-arm.conf b/gnu/packages/aux-files/linux-libre/5.10-arm.conf index c4f714f5e1..f544be58f7 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-arm.conf @@ -1745,7 +1745,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.10-arm64.conf b/gnu/packages/aux-files/linux-libre/5.10-arm64.conf index 046c310d85..fc8a892872 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-arm64.conf @@ -1758,7 +1758,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.10-i686.conf b/gnu/packages/aux-files/linux-libre/5.10-i686.conf index 23b159057d..be02316b2c 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-i686.conf @@ -1756,7 +1756,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index 2760c71f62..b801d13e83 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -1784,7 +1784,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.15-arm.conf b/gnu/packages/aux-files/linux-libre/5.15-arm.conf index 2d5b20f1de..3915ac6d53 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-arm.conf @@ -1736,7 +1736,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.15-arm64.conf b/gnu/packages/aux-files/linux-libre/5.15-arm64.conf index 5ed52b3c76..60069fe4c9 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-arm64.conf @@ -1756,7 +1756,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.15-i686.conf b/gnu/packages/aux-files/linux-libre/5.15-i686.conf index d2bf661acf..5808a9977d 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-i686.conf @@ -1765,7 +1765,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf index 973fd2e47c..22f905a642 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf @@ -1802,7 +1802,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm.conf b/gnu/packages/aux-files/linux-libre/5.4-arm.conf index e985f1ded8..d51ff92fc0 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm.conf @@ -1713,7 +1713,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf index 3b05083301..28cc5127a0 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-arm64.conf @@ -1690,7 +1690,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 83019bc0c7..302df38cfc 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -1723,7 +1723,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index 7325ac21fc..dde91cd01c 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -1736,7 +1736,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/6.1-arm.conf b/gnu/packages/aux-files/linux-libre/6.1-arm.conf index 59dd0ad9f7..46eb0c07e1 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-arm.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-arm.conf @@ -1757,7 +1757,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/6.1-arm64.conf b/gnu/packages/aux-files/linux-libre/6.1-arm64.conf index 6d25a1c2b5..507e38c9ad 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-arm64.conf @@ -1772,7 +1772,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/6.1-i686.conf b/gnu/packages/aux-files/linux-libre/6.1-i686.conf index f06280b0ff..58f84b901a 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-i686.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-i686.conf @@ -1810,7 +1810,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options diff --git a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf index 7224770c4a..31e5744ff3 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf @@ -1871,7 +1871,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options -- cgit 1.4.1 From c32f9912e6858d9a74dcc665fe0288c2a0cd53db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Feb 2023 01:00:02 +0100 Subject: gnu: xvfb-run: Update to 21.1.7-1. * gnu/packages/xorg.scm (xvfb-run): Update to 21.1.7-1. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0d3c8362bc..3093070c91 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6698,14 +6698,14 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (define-public xvfb-run (package (name "xvfb-run") - (version "1.20.11-1") + (version "21.1.7-1") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/x/xorg-server/" "xorg-server_" version ".diff.gz")) (sha256 - (base32 "0hq8a2rw2ginxsifrpj3rsf2shxl69ylkc1650ij5vwjhxdr82hh")))) + (base32 "1073m4gzn8yv9kn70fbyq8a2xckgz0wljjr2w7i2bsrg767h29gd")))) (build-system gnu-build-system) (arguments (list @@ -6771,7 +6771,7 @@ an existing user-specified one, writes a cookie to it, and then starts the @command{Xvfb} X server as a background process. It also takes care of killing the server and cleaning up before returning the exit status of the command.") (license (list license:x11 ; the script - license:gpl2+)))) ; the man page + license:gpl2+)))) ; the man page (define-public setroot (package -- cgit 1.4.1 From 1eea158ee5c897e34e098df3c108bf3a233c57d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Feb 2023 01:00:00 +0100 Subject: gnu: homebank: Update to 5.6.2. * gnu/packages/finance.scm (homebank): Update to 5.6.2. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a0c9a2a72a..5b534f9429 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -281,14 +281,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.6.1") + (version "5.6.2") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/sources/" "homebank-" version ".tar.gz")) (sha256 (base32 - "03wgyc777bzys32iv32yf7aj3z4hx87dskq1maw9l9jkqlqrqj1s")))) + "1w8nafqr54i3gksd2s0n246ip178qikn0jcmdx4ihg2dw1cdxsqj")))) (build-system glib-or-gtk-build-system) (native-inputs (list pkg-config intltool)) -- cgit 1.4.1 From 4f08551a83f3a9f5e22c70e51e488f38171e6937 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 12 Feb 2023 13:12:56 -0500 Subject: gnu: bees: Update to 0.9.2. * gnu/packages/file-systems.scm (bees): Update to 0.9.2. [license]: Add two individual licences. * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Tobias Geerinckx-Rice --- gnu/local.mk | 1 - gnu/packages/file-systems.scm | 16 ++++----- .../bees-beesd-honor-destdir-on-installation.patch | 40 ---------------------- 3 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bbde10e756..0838f66618 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -941,7 +941,6 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ - %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 5ed6d964af..9ac36e9a27 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1809,7 +1809,7 @@ in FUSE for rootless containers.") (define-public bees (package (name "bees") - (version "0.8") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -1826,14 +1826,9 @@ in FUSE for rootless containers.") (("city.o.*") "")) (substitute* "src/bees-hash.cc" (("#include .crucible/city.h.") "#include ")))) - (patches - (search-patches - ;; XXX: Cherry-picked from upstream, remove the patch when - ;; bumping version. - "bees-beesd-honor-destdir-on-installation.patch")) (sha256 (base32 - "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + "0xik1xg6ma5yglhvs60ny27242iapqwzikmqbgij1avjffs6776a")))) (build-system gnu-build-system) (arguments (list #:test-target "test" @@ -1867,7 +1862,8 @@ in FUSE for rootless containers.") (search-input-file inputs (string-append "/bin/" command))) (("btrfs sub") - (string-append (search-input-file inputs "/bin/btrfs") " sub")))))))) + (string-append (search-input-file inputs "/bin/btrfs") + " sub")))))))) (inputs (list btrfs-progs cityhash util-linux)) (home-page "https://github.com/Zygo/bees") (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") @@ -1876,7 +1872,9 @@ in FUSE for rootless containers.") for large btrfs filesystems. It is an offline dedupe combined with an incremental data scan capability to minimize time data spends on disk from write to dedupe.") - (license license:gpl3+))) + (license (list license:gpl3+ ; the combined work + license:zlib ; lib/crc64.cc + license:gpl2)))) ; include/crucible/btrfs.h (define-public dwarfs (package diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch deleted file mode 100644 index 93817f42cf..0000000000 --- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001 -From: Hilton Chain -Date: Fri, 23 Dec 2022 11:04:46 +0800 -Subject: [PATCH] beesd: Honor DESTDIR on installation. - -Co-authored-by: Adam Faiz -Signed-off-by: Hilton Chain ---- - Defines.mk | 1 + - scripts/beesd.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Defines.mk b/Defines.mk -index 9e8df40..e5394ba 100644 ---- a/Defines.mk -+++ b/Defines.mk -@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI - - define TEMPLATE_COMPILER = - sed $< >$@ \ -+ -e's#@DESTDIR@#$(DESTDIR)#' \ - -e's#@PREFIX@#$(PREFIX)#' \ - -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \ - -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -diff --git a/scripts/beesd.in b/scripts/beesd.in -index 174bb6c..35d04aa 100755 ---- a/scripts/beesd.in -+++ b/scripts/beesd.in -@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))" - readonly AL16M="$((16*1024*1024))" - readonly CONFIG_DIR=@ETC_PREFIX@/bees/ - --readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees) -+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees) - - command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent" - --- -2.38.1 - -- cgit 1.4.1 From af8090634555d79b9cee4f5a44df41396f0658b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Feb 2023 01:00:00 +0100 Subject: gnu: bees: Drop ‘dedupe’ slang. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/file-systems.scm (bees)[synopsis, description]: Write out ‘deduplication’ in full. Expand @acronym in description rather than synopsis. Drop filler words. --- gnu/packages/file-systems.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 9ac36e9a27..bc5bb41fb3 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1866,12 +1866,12 @@ in FUSE for rootless containers.") " sub")))))))) (inputs (list btrfs-progs cityhash util-linux)) (home-page "https://github.com/Zygo/bees") - (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") + (synopsis "Deduplication agent for btrfs file systems") (description - "@code{bees} is a block-oriented userspace deduplication agent designed -for large btrfs filesystems. It is an offline dedupe combined with an -incremental data scan capability to minimize time data spends on disk from -write to dedupe.") + "@acronym{BEES, Best-Effort Extent-Same} is a block-oriented, user-space +deduplication agent designed for large btrfs file systems. It combines off-line +data deduplication with incremental scanning to minimize the time your data +spend on disk between being written and being deduplicated.") (license (list license:gpl3+ ; the combined work license:zlib ; lib/crc64.cc license:gpl2)))) ; include/crucible/btrfs.h -- cgit 1.4.1 From dd2c4cafdf57ac603413ace8099bf497f6be19cf Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:48 +0100 Subject: gnu: r-cytolib: Update to 2.10.1. * gnu/packages/bioconductor.scm (r-cytolib): Update to 2.10.1. [propagated-inputs]: Remove r-rcpp, r-rcpparmadillo and r-rcppparallel. --- gnu/packages/bioconductor.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bc3bd8c930..bd5fca42c8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13952,23 +13952,20 @@ of the analyses while minimizing technical noise.") (define-public r-cytolib (package (name "r-cytolib") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "cytolib" version)) (sha256 (base32 - "1y06x7z3p938kfvjx6zqab9hh1xzlrlhdxczyprx7lsd34ylz46n")))) + "0rgqlqasil75b03c8c4nyg71ybysrsbqb0bwk6hbnaw8rljxdmi5")))) (properties `((upstream-name . "cytolib"))) (build-system r-build-system) (native-inputs (list r-knitr)) (propagated-inputs (list r-bh - r-rcpp - r-rcpparmadillo - r-rcppparallel r-rhdf5lib r-rprotobuflib)) (home-page "https://bioconductor.org/packages/cytolib/") -- cgit 1.4.1 From 3f2a917993dd33d06b635683771de431b3672187 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:49 +0100 Subject: gnu: r-annotationforge: Update to 1.40.1. * gnu/packages/bioconductor.scm (r-annotationforge): Update to 1.40.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bd5fca42c8..0d763656df 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5054,14 +5054,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "15shh8rmcx69g3zd256720vh0c3qbly5zrvwm463dws41cjla48x")))) + "16wdcl56d5i8wrmin610kzs9ldy7h9w5fbnysjb1crkcgbikq1yy")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) -- cgit 1.4.1 From d2598f57fb89682693ad5b67b336d0d6fea78d70 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:50 +0100 Subject: gnu: r-bsgenome: Update to 1.66.3. * gnu/packages/bioconductor.scm (r-bsgenome): Update to 1.66.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0d763656df..2e6d30a676 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5409,13 +5409,13 @@ effort and encourages consistency.") (define-public r-bsgenome (package (name "r-bsgenome") - (version "1.66.2") + (version "1.66.3") (source (origin (method url-fetch) (uri (bioconductor-uri "BSgenome" version)) (sha256 (base32 - "0p75c52sw464bdqz7dyda9h8k2wsxdpdxxhya5awh977xaly90pf")))) + "1ps7s6i9mv8ys8k2xw8fdkh2rl2n3kcf2q4zsz6kcz5qpav95ys6")))) (properties `((upstream-name . "BSgenome"))) (build-system r-build-system) -- cgit 1.4.1 From 3ffaed50441d4fef96456b72e3a9c25ddcb02c6a Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:51 +0100 Subject: gnu: r-deseq2: Update to 1.38.3. * gnu/packages/bioconductor.scm (r-deseq2): Update to 1.38.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2e6d30a676..3a017416da 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5655,14 +5655,14 @@ distribution.") (define-public r-deseq2 (package (name "r-deseq2") - (version "1.38.2") + (version "1.38.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq2" version)) (sha256 (base32 - "1m81yvcl63h5m7kbbxpjk7hzygxmn4l9mlgqrdmnnls56183h3b4")))) + "0kryg9jb6zl4zj1wx09rmljqlhr5vdbcmdnri4q91jpggsaj9nxm")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b38475bef4cce5acd4ed1cd91f54f51f2e5804c3 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:52 +0100 Subject: gnu: r-edger: Update to 3.40.2. * gnu/packages/bioconductor.scm (r-edger): Update to 3.40.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3a017416da..383292f8c5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5887,13 +5887,13 @@ global-scaling and full-quantile normalization.") (define-public r-edger (package (name "r-edger") - (version "3.40.1") + (version "3.40.2") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "1a0rmczlqmqmip2ix28m4iwcpfj04p6nrcl562bjgaifvgyjqhzg")))) + "0ds34b135qd63dh3cxkp8b28270m50bn1njwr49b8svgcgzz9x09")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 4fd6ea684a634961a0ae4e13d228a0a15a4fbf44 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:53 +0100 Subject: gnu: r-genefilter: Update to 1.80.3. * gnu/packages/bioconductor.scm (r-genefilter): Update to 1.80.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 383292f8c5..de259010c5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6012,14 +6012,14 @@ analysis using other methods.") (define-public r-genefilter (package (name "r-genefilter") - (version "1.80.2") + (version "1.80.3") (source (origin (method url-fetch) (uri (bioconductor-uri "genefilter" version)) (sha256 (base32 - "0f25z0hqmrkimv14j03pgjsxpq5rz9ymk151rlg4j4vpc06n73cq")))) + "047p84qxfqqm0d0ik7fxcs37fmg0yazsn9rz7h4g24cksb45p689")))) (build-system r-build-system) (native-inputs (list gfortran r-knitr)) -- cgit 1.4.1 From 5b0984393c414769b596583905fd6604c68e29f1 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:54 +0100 Subject: gnu: r-genomeinfodb: Update to 1.34.9. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.34.9. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index de259010c5..f45c5e9bd7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6102,13 +6102,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.34.6") + (version "1.34.9") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "123kp69fmy5pbqh0j6qxdkvkm4g9pdwzms01i8qnix3m1b9j597w")))) + "0mn9ddm2xwc2b7zg0n9a056jcr61jv6v8jacxm3q8qmz6r30kfrb")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit 1.4.1 From 705d024b140c2dd81efc4c2d3014fbb2d53eae4f Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:55 +0100 Subject: gnu: r-genomicfeatures: Update to 1.50.4. * gnu/packages/bioconductor.scm (r-genomicfeatures): Update to 1.50.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f45c5e9bd7..1e257a3f9c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6162,13 +6162,13 @@ alignments.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.50.3") + (version "1.50.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "14pn7lngayascj5k84g2g748assbivpiakss247cdj9ngzx5sfwz")))) + "1qsr433nh225pk5ngsrjrf2rfv7ynq4c8qsjfjr7khy2z9czlg6n")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit 1.4.1 From 8fb4758b12e4151d88d660c75681edecf1803640 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:56 +0100 Subject: gnu: r-impute: Update to 1.72.3. * gnu/packages/bioconductor.scm (r-impute): Update to 1.72.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1e257a3f9c..8eb252b512 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6427,13 +6427,13 @@ of other R packages who wish to make use of HTSlib.") (define-public r-impute (package (name "r-impute") - (version "1.72.2") + (version "1.72.3") (source (origin (method url-fetch) (uri (bioconductor-uri "impute" version)) (sha256 (base32 - "1k697pqlkrwmfszipl9irbzmwhk1vz97j3rh0k5nj2mrj3dr71mv")))) + "1qq80za9bkg0wqnlckvahnjz08xacwvpnflwnrmwr2xg0ifkis38")))) (native-inputs (list gfortran)) (build-system r-build-system) -- cgit 1.4.1 From 9682fd19bfe4e421da1aa4ca43eecae1bbe54e81 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:57 +0100 Subject: gnu: r-limma: Update to 3.54.1. * gnu/packages/bioconductor.scm (r-limma): Update to 3.54.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8eb252b512..86c118ca18 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6517,13 +6517,13 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.54.0") + (version "3.54.1") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1jy75nbkhl0kgv4gw88acx58r9f1kywrd36405x6g05xy05bprma")))) + "0x6wkbw8v0hq9dfr433165jmii05rswjsm97dpxvyvxvya3sxqa1")))) (build-system r-build-system) (home-page "https://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit 1.4.1 From 962278a621009ba001a0ef8ae2873b2dfdc012ab Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:58 +0100 Subject: gnu: r-stringdb: Update to 2.10.1. * gnu/packages/bioconductor.scm (r-stringdb): Update to 2.10.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 86c118ca18..07869833d9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8192,13 +8192,13 @@ Biology at (define-public r-stringdb (package (name "r-stringdb") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "STRINGdb" version)) (sha256 - (base32 "1md79vx4270wgh07g3m1mypdki1b9d4a558zxplcalwppqh0dsmp")))) + (base32 "0qpss8fcf8ll47jv45ypsqd9jf7ajdiya7w4mw1wysk76spcwllm")))) (properties `((upstream-name . "STRINGdb"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 144c07fd4ac717a2053c8c489fda9ceb490e1583 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:53:59 +0100 Subject: gnu: r-variantannotation: Update to 1.44.1. * gnu/packages/bioconductor.scm (r-variantannotation): Update to 1.44.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 07869833d9..1b4544b1e7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8461,13 +8461,13 @@ R, enabling interactive analysis and visualization of genome-scale data.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.44.0") + (version "1.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "08rm27jcx6amawqdh59291r0qzkr5cdhbhm0xbjbd5mvdpp1icl8")))) + "13zim7dglsd5w39v22d2qa3d1h5dx33c1r4fz3vzri64kac0lhzx")))) (properties `((upstream-name . "VariantAnnotation"))) (propagated-inputs -- cgit 1.4.1 From 9202c56e84962bdcf4f13e6fe6c945e568f943b1 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:00 +0100 Subject: gnu: r-oligo: Update to 1.62.2. * gnu/packages/bioconductor.scm (r-oligo): Update to 1.62.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1b4544b1e7..2a362b5b9d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8776,14 +8776,14 @@ packages.") (define-public r-oligo (package (name "r-oligo") - (version "1.62.1") + (version "1.62.2") (source (origin (method url-fetch) (uri (bioconductor-uri "oligo" version)) (sha256 (base32 - "1rhzav57d092ip9qjsmskj3l8h4xyq8cpa2a2jl8g32fwh0dyvsz")))) + "19n0nvgyv2hzzcla93w2bzxvfdqg6walh0s1yykwl5b7ni4cazg9")))) (properties `((upstream-name . "oligo"))) (build-system r-build-system) (inputs (list zlib)) -- cgit 1.4.1 From 2b6c03a34e875fc06d37bd724811db0bba7cd040 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:01 +0100 Subject: gnu: r-interactionset: Update to 1.26.1. * gnu/packages/bioconductor.scm (r-interactionset): Update to 1.26.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2a362b5b9d..a287182f3b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9512,14 +9512,14 @@ parsing of genetic sequencing data from ribosome profiling experiments.") (define-public r-interactionset (package (name "r-interactionset") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "InteractionSet" version)) (sha256 (base32 - "14fb780f2g24ay28dy9xkmfziavbkj75v4vc2cmqbxfdsfp4yn0w")))) + "1nk8jhabbrirpyjd1wdy2fjk8y2qi1bsjmgqzh0qi1c83n0ccz5d")))) (properties `((upstream-name . "InteractionSet"))) (build-system r-build-system) -- cgit 1.4.1 From 14038b4df0110ac58fe9e140d2f145ec2953dc6e Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:02 +0100 Subject: gnu: r-dnacopy: Update to 1.72.3. * gnu/packages/bioconductor.scm (r-dnacopy): Update to 1.72.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a287182f3b..eebf85b940 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10193,14 +10193,14 @@ penalized least squares regression method.") (define-public r-dnacopy (package (name "r-dnacopy") - (version "1.72.2") + (version "1.72.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DNAcopy" version)) (sha256 (base32 - "1f6ilfwhli7bdnr48y2ijdydvw7kjbyz701kgbsw3w7inr6x6ayr")))) + "1kxzrny19dqd9pqj27vzr15i071sl8ivznpfd6zlqhcymlcsq7nw")))) (properties `((upstream-name . "DNAcopy"))) (build-system r-build-system) (native-inputs (list gfortran)) -- cgit 1.4.1 From d635da51ce3757c9eedc47b8c37775d0f5631642 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:03 +0100 Subject: gnu: r-lpsymphony: Update to 1.26.3. * gnu/packages/bioconductor.scm (r-lpsymphony): Update to 1.26.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index eebf85b940..91287660cc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10351,14 +10351,14 @@ coordinates.") (define-public r-lpsymphony (package (name "r-lpsymphony") - (version "1.26.2") + (version "1.26.3") (source (origin (method url-fetch) (uri (bioconductor-uri "lpsymphony" version)) (sha256 (base32 - "167zpf7k7gn7gw2cxkqx89y322qinyzjr1naracp5axj4q2qagm3")))) + "0iqc6km4pw50li2q35km8jpa0p3i6a6way910wcz56yd2jjbjyz5")))) (build-system r-build-system) (arguments (list -- cgit 1.4.1 From 070274e3144e5e359c5515a05760e4f11d503889 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:04 +0100 Subject: gnu: r-massspecwavelet: Update to 1.64.1. * gnu/packages/bioconductor.scm (r-massspecwavelet): Update to 1.64.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 91287660cc..c0b93b9f75 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13004,14 +13004,14 @@ genes.") (define-public r-massspecwavelet (package (name "r-massspecwavelet") - (version "1.64.0") + (version "1.64.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MassSpecWavelet" version)) (sha256 (base32 - "0l86gwq073nbx973v99b0lr9cz0pb72c4asmgj5w16jykicrnxn9")))) + "0p8cd4r3c8va5gybs1vlm3kn7jcg1xg529hvvg27fybb3g91nvqg")))) (properties `((upstream-name . "MassSpecWavelet"))) (build-system r-build-system) -- cgit 1.4.1 From c8f618c8085df24bc3b7e06f483e5676fb37ab53 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:05 +0100 Subject: gnu: r-biocfilecache: Update to 2.6.1. * gnu/packages/bioconductor.scm (r-biocfilecache): Update to 2.6.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c0b93b9f75..54643090bb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13361,14 +13361,14 @@ Infinium HumanMethylation 450k assay.") (define-public r-biocfilecache (package (name "r-biocfilecache") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocFileCache" version)) (sha256 (base32 - "0skrvmkm6ch8gbpdi4wr59zk5vxzxs7cyqvz3jhki9d8w492wylg")))) + "16316a5pgyl5rppyviibf6z3k3m7xmvqyylf1kxdpg0avs6dk8w7")))) (properties `((upstream-name . "BiocFileCache"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 7d4a159c789dde4a86e1168587ad07fcc4a28405 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:06 +0100 Subject: gnu: r-variancepartition: Update to 1.28.4. * gnu/packages/bioconductor.scm (r-variancepartition): Update to 1.28.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 54643090bb..bdb3bb98f9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -15246,14 +15246,14 @@ arrays based on fast wavelet-based functional models.") (define-public r-variancepartition (package (name "r-variancepartition") - (version "1.28.1") + (version "1.28.4") (source (origin (method url-fetch) (uri (bioconductor-uri "variancePartition" version)) (sha256 (base32 - "0ypw3ckaf4qll83rl2bjzfc7g2m4v0n2mq645ppyfga8wv8kwssy")))) + "1ii4r0c76b7rnisy4qba2cp5686j73s6b3s6pj66w91wq65dykpd")))) (properties `((upstream-name . "variancePartition"))) (build-system r-build-system) -- cgit 1.4.1 From b36f98b19f5de8acb43d0d73024d24918e08aa6d Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:07 +0100 Subject: gnu: r-preprocesscore: Update to 1.60.2. * gnu/packages/bioconductor.scm (r-preprocesscore): Update to 1.60.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bdb3bb98f9..da070909e3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16802,14 +16802,14 @@ generated.") (define-public r-preprocesscore (package (name "r-preprocesscore") - (version "1.60.1") + (version "1.60.2") (source (origin (method url-fetch) (uri (bioconductor-uri "preprocessCore" version)) (sha256 (base32 - "1rwr31jp4dh3xcfx1kx8rz5xvyx1mrwy85hqrjrfr4m6h0qv28k1")))) + "0ikxikmz9dy09g726q1wygymm6z2imlgfiizkgh1cl4s0m35fbbd")))) (properties `((upstream-name . "preprocessCore"))) (build-system r-build-system) -- cgit 1.4.1 From a95f6f793192b0913d1a61bf66811a0adec0b5cc Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:08 +0100 Subject: gnu: r-scuttle: Update to 1.8.4. * gnu/packages/bioconductor.scm (r-scuttle): Update to 1.8.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index da070909e3..26b5c0af15 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -17440,14 +17440,14 @@ cell types to infer the cell of origin of each single cell independently.") (define-public r-scuttle (package (name "r-scuttle") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "scuttle" version)) (sha256 (base32 - "1wgh28rj8m5dz89s9y4rzfy68d8ign6pcnnwj9g7h4sc3jfsg56i")))) + "04257gl995r575md1n3h2gy502yi6c8x3352l96mib7rdv4yg53f")))) (properties `((upstream-name . "scuttle"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 63760dab9c8b105a531d9b3629125d1ad60dae88 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:09 +0100 Subject: gnu: r-scran: Update to 1.26.2. * gnu/packages/bioconductor.scm (r-scran): Update to 1.26.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 26b5c0af15..482312b384 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -17520,14 +17520,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.26.1") + (version "1.26.2") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "1sqc8pf1qzm24kf1l45da12wbzv0nxsy6l3v9fc8srmnvk37p04p")))) + "0r80k4dsk609l9ha1jl64yhpwnf0x37i28k9largqsffsl6hw0fy")))) (build-system r-build-system) (propagated-inputs (list r-beachmat -- cgit 1.4.1 From 8fcae955dbd1e89ddd26977a5e31dec9c2b7a654 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:10 +0100 Subject: gnu: r-gviz: Update to 1.42.1. * gnu/packages/bioconductor.scm (r-gviz): Update to 1.42.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 482312b384..cc7bbb9eac 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -18039,14 +18039,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.42.0") + (version "1.42.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "09j94kk3dd3bbfw6a2l14i7vd4rh11g9lxhw4zsm15vg71cm1lv9")))) + "01qs60sdh7c8cxkv3qbfcfwpjhab88j872va50fi95xsqnmj5isa")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 8eaef6abaa2b5a13065ceb5a973e724752e19e55 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 20 Feb 2023 19:54:11 +0100 Subject: gnu: r-tximeta: Update to 1.16.1. * gnu/packages/bioconductor.scm (r-tximeta): Update to 1.16.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cc7bbb9eac..fa4b8ef89b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -19542,14 +19542,14 @@ embeddings and functions to build new reference.") (define-public r-tximeta (package (name "r-tximeta") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "0v1s5ssinyrizpg2i88dn2ckzs4i16hjfg2pzxhal3ypsiw24qna")))) + "15qf8s9akl5qp5wklph5i61d96d9ifr5ijl796v1vafwrj4f3wpa")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From cb8b7589562d4314133e86954e7d411366a600ca Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Thu, 23 Feb 2023 22:49:33 +0200 Subject: gnu: freeciv: Update to 3.0.6. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a3d093fa5e..a5783c1d1b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6019,7 +6019,7 @@ for Un*x systems with X11.") (define-public freeciv (package (name "freeciv") - (version "3.0.0") + (version "3.0.6") (source (origin (method url-fetch) @@ -6031,7 +6031,7 @@ for Un*x systems with X11.") (version-major+minor version) "/" version "/freeciv-" version ".tar.xz"))) (sha256 - (base32 "1cm0530xmbqdhqkr89xb845cd756nillbdq53r3z5zpxsj18fapa")))) + (base32 "0hp4mkbcf5sipqkfjynls4m1qlh6kn0mp3jlqjrjwylmgcah3rs0")))) (build-system gnu-build-system) (inputs (list curl cyrus-sasl gtk+ sdl-mixer zlib)) -- cgit 1.4.1 From 4d5ac8dad0b64c650caa07b585a6bc9903dcb28f Mon Sep 17 00:00:00 2001 From: conses Date: Thu, 23 Feb 2023 13:31:23 +0100 Subject: gnu: Add emacs-display-wttr. * gnu/packages/emacs-xyz.scm (emacs-display-wttr): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ad5dc35d4..31d011738d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18293,6 +18293,32 @@ available key bindings that follow C-x (or as many as space allows given your settings).") (license license:gpl3+))) +(define-public emacs-display-wttr + (package + (name "emacs-display-wttr") + (version "2.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~josegpt/display-wttr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hmawlnd2l89p48pviwn4khvjs0iry8x67cyqw70r10dd0ybn851")))) + (build-system emacs-build-system) + (arguments + (list #:tests? #t + #:test-command #~(list "emacs" "--batch" + "-l" "display-wttr-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://git.sr.ht/~josegpt/display-wttr") + (synopsis "Display wttr (weather) in the mode line") + (description "This package contains a minor mode that can be toggled. It +fetches weather information based on your location or on a given location from +@uref{https://wttr.in} and then displays it on the mode line.") + (license license:gpl3+))) + (define-public emacs-free-keys (package (name "emacs-free-keys") -- cgit 1.4.1 From 5957ac3bb360bc8a99af5ca0a12210df5225a38d Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Mon, 20 Feb 2023 23:35:18 +0200 Subject: gnu: Add tofi. * gnu/packages/xdisorg.scm (tofi): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/xdisorg.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b4f0235d3b..ec5cdbdc28 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1980,6 +1980,36 @@ border, and background. It also supports multihead setups, customized mouse actions, a built-in clock, a battery monitor and a system tray.") (license license:gpl2))) +(define-public tofi + (package + (name "tofi") + (version "0.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/philj56/tofi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11bfi9his0cc5mzikamr5icv5mh2fyj9jy5l3sbbayj6jk51f68y")))) + (build-system meson-build-system) + (arguments + (list #:meson meson-0.63)) ;requires meson 0.61 or later + (native-inputs (list pkg-config)) + (inputs (list cairo + harfbuzz + libxkbcommon + pango + wayland + wayland-protocols)) + (home-page "https://github.com/philj56/tofi") + (synopsis "Application launcher for Wayland") + (description + "Tofi is a Dmenu and Rofi replacement for wlroots-based Wayland +compositors such as Sway.") + (license license:expat))) + (define-public dzen (let ((commit "488ab66019f475e35e067646621827c18a879ba1") (revision "1")) -- cgit 1.4.1 From 699c63094683998a424c41b12638fcf6b5a11e0f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Feb 2023 11:48:40 +0100 Subject: gnu: emacs-taxy-magit-section: Update to 0.12.2. * gnu/packages/emacs-xyz.scm (emacs-taxy-magit-section): Update to 0.12.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31d011738d..5037848567 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19048,7 +19048,7 @@ groups.") (define-public emacs-taxy-magit-section (package (name "emacs-taxy-magit-section") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (string-append @@ -19056,7 +19056,7 @@ groups.") ".tar")) (sha256 (base32 - "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg")))) + "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1")))) (build-system emacs-build-system) (propagated-inputs (list emacs-magit emacs-taxy)) (home-page "https://github.com/alphapapa/taxy.el") -- cgit 1.4.1 From 1f221c9fc5e270e06611fb62af5efe5cee3afdc3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Feb 2023 11:50:10 +0100 Subject: gnu: emacs-suneater-theme: Update to 2.2.1. * gnu/packages/emacs-xyz.scm (emacs-suneater-theme): Update to 2.2.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5037848567..bfbf5b1abd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1596,7 +1596,7 @@ Apprentice and Sourcerer.") (define-public emacs-suneater-theme (package (name "emacs-suneater-theme") - (version "2.2.0") + (version "2.2.1") (source (origin (method git-fetch) @@ -1605,7 +1605,7 @@ Apprentice and Sourcerer.") (commit version))) (sha256 (base32 - "1g0mf3m1ja70zdhyw1li4m765wvsb0b6hqd1ma42cn5mccz8yxh3")) + "1pnfiwnh2hr2hp4rxivx61j3hrmvwingjpfslnn535a3z9md0c4f")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~plattfot/suneater-theme") -- cgit 1.4.1 From e36ac715518387686bd8165e1724ce54984ee0ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Feb 2023 12:09:54 +0100 Subject: gnu: Fix texlive-minted build. * gnu/packages/tex.scm (texlive-fancyvrb): New variable. (texlive-minted): Fix hash. --- gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d0ee03c16f..bea4b4b307 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3165,6 +3165,30 @@ users, via its Plain TeX version.)") (define-deprecated-package texlive-generic-epsf texlive-epsf) +(define-public texlive-fancyvrb + (package + (inherit (simple-texlive-package + "texlive-fancyvrb" + (list "/doc/latex/fancyvrb" + "/tex/latex/fancyvrb/") + (base32 + "1qlrmc70ck2v3wqh8gjd5jl0f6011zzcsg9a93qf1z9b9virvjy2") + #:trivial? #t)) + (propagated-inputs (list texlive-latex-upquote)) + (home-page "https://ctan.org/macros/latex/contrib/fancyvrb") + (synopsis "Sophisticated verbatim text") + (description + "This package provides tools for the flexible handling of verbatim text +including: verbatim commands in footnotes; a variety of verbatim environments +with many parameters; ability to define new customized verbatim environments; +save and restore verbatim text and environments; write and read files in +verbatim mode; build @code{example} environments (showing both result and +verbatim source).") + (license license:lppl1.3+))) + +;; FIXME: This package needs to be deprecated in favour of `texlive-fancyvrb', +;; but this triggers 17k rebuilds. So leave it there and wait for +;; core-updates or a topic branch to catch-up. (define-public texlive-latex-fancyvrb (package (inherit (simple-texlive-package @@ -10041,7 +10065,7 @@ the bundle.") "/source/latex/minted/" "/tex/latex/minted/") (base32 - "08pbhp4a9k8v49kji26206zzabp0nn0fz403l4w7gxajw9rj8icr")))) + "13cjsjb3b04n9arwp46ayk8fcicylxq5g1864cpxl1lxjxh1yi0l")))) (package (inherit template) (arguments @@ -10050,9 +10074,9 @@ the bundle.") "latex/minted"))) (propagated-inputs (list python-pygments texlive-etoolbox + texlive-fancyvrb texlive-fvextra texlive-generic-xstring - texlive-latex-fancyvrb texlive-latex-float texlive-latex-framed texlive-latex-ifplatform -- cgit 1.4.1 From fb6e7e4c051df68d5ea207142e290562c24b4647 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 09:59:03 +0100 Subject: gnu: cl-babel: Update to 0.5.0-3.627d6a6. * gnu/packages/lisp-xyz.scm (sbcl-babel): Update to 0.5.0-3.627d6a6. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a874b74a6a..4582d56c5d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2438,8 +2438,8 @@ and running graph algorithms.") (define-public sbcl-babel ;; No release since 2014. - (let ((commit "f892d0587c7f3a1e6c0899425921b48008c29ee3") - (revision "2")) + (let ((commit "627d6a60d0ffc82a3687b39ba8a99128031504d9") + (revision "3")) (package (name "sbcl-babel") (version (git-version "0.5.0" revision commit)) @@ -2451,7 +2451,7 @@ and running graph algorithms.") (commit commit))) (file-name (git-file-name "cl-babel" version)) (sha256 - (base32 "04frn19mngvsh8bh7fb1rfjm8mqk8bgzx5c43dg7z02nfsxkqqak")))) + (base32 "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-hu.dwim.stefil)) -- cgit 1.4.1 From 70a81fa6f052757c2d7ef8f0beb7ab3b2e579999 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:05:10 +0100 Subject: gnu: cl-closer-mop: Update to 1.0.0-3.7b86f2a. * gnu/packages/lisp-xyz.scm (sbcl-closer-mop): Update to 1.0.0-3.7b86f2a. --- gnu/packages/lisp-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4582d56c5d..8bf35787f8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4425,10 +4425,11 @@ avoid consing) is too computationally expensive.") (sbcl-package->ecl-package sbcl-ucons)) (define-public sbcl-closer-mop - (let ((commit "19c9d33f576e10715fd79cc1d4f688dab0f241d6")) + (let ((commit "7b86f2add029208ebc74ec6a41c2ccfd3c382dbc") + (revision "3")) (package (name "sbcl-closer-mop") - (version (git-version "1.0.0" "2" commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -4436,8 +4437,8 @@ avoid consing) is too computationally expensive.") (url "https://github.com/pcostanza/closer-mop") (commit commit))) (sha256 - (base32 "1w3x087wvlwkd6swfdgbvjfs6kazf0la8ax4pjfzikwjch4snn2c")) - (file-name (git-file-name "closer-mop" version )))) + (base32 "1fzxdpq873rpagmj3h9bgv7n95h4p03pnxrklbxp06sxb26xyi16")) + (file-name (git-file-name "cl-closer-mop" version )))) (build-system asdf-build-system/sbcl) (home-page "https://github.com/pcostanza/closer-mop") (synopsis "Rectifies absent or incorrect CLOS MOP features") -- cgit 1.4.1 From 8facb5720566befab8062aba334e64c6071653a5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:12:09 +0100 Subject: gnu: cl-usocket: Update to 0.8.5. * gnu/packages/lisp-xyz.scm (sbcl-usocket): Update to 0.8.5. --- gnu/packages/lisp-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8bf35787f8..8d6900b469 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4847,7 +4847,7 @@ Lisp (from GBBopen project).") (define-public sbcl-usocket (package (name "sbcl-usocket") - (version "0.8.4") + (version "0.8.5") (source (origin (method git-fetch) @@ -4856,8 +4856,7 @@ Lisp (from GBBopen project).") (commit (string-append "v" version)))) (file-name (git-file-name "cl-usocket" version)) (sha256 - (base32 - "0l5alk6nph6kxgd84pxq8d56pz3ywnpp0kpnlg4cadaics3hycg7")))) + (base32 "1pn5mf4d9g3b7h0vfx0mh7rlrydfbk8q35pg4ip6prf4zyg70wba")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-rt)) -- cgit 1.4.1 From 4f35f85623e3a147a3b03038ba65888a9f4a6b99 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:17:55 +0100 Subject: gnu: cl-cffi: Remove input labels. * gnu/packages/lisp-xyz.scm (sbcl-cffi)[source]: Fix file name. [inputs, native-inputs]: Remove labels. --- gnu/packages/lisp-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8d6900b469..43dee89845 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4018,19 +4018,19 @@ is statically typed so there are differences.") (uri (git-reference (url "https://github.com/cffi/cffi") (commit (string-append "v" version)))) - (file-name (git-file-name "cffi-bootstrap" version)) + (file-name (git-file-name "cl-cffi" version)) (sha256 (base32 "17ryim4xilb1rzxydfr7595dnhqkk02lmrbkqrkvi9091shi4cj3")))) (build-system asdf-build-system/sbcl) (inputs - `(("alexandria" ,sbcl-alexandria) - ("babel" ,sbcl-babel) - ("libffi" ,libffi) - ("trivial-features" ,sbcl-trivial-features))) + (list libffi + sbcl-alexandria + sbcl-babel + sbcl-trivial-features)) (native-inputs - `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("pkg-config" ,pkg-config) - ("rt" ,sbcl-rt))) + (list pkg-config + sbcl-bordeaux-threads + sbcl-rt)) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 8397e6e0a98dd8ac7ba3b3341ba84ebc8093df30 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:37:40 +0100 Subject: gnu: cl-named-readtables: Update to 0.9-4.d5ff162. * gnu/packages/lisp-xyz.scm (sbcl-named-readtables): Update to 0.9-4.d5ff162. [arguments]: Disable tests. --- gnu/packages/lisp-xyz.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 43dee89845..98b6ea7ce0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3128,8 +3128,8 @@ streams, support is included for convenient stream wrappers.") (sbcl-package->ecl-package sbcl-ironclad)) (define-public sbcl-named-readtables - (let ((commit "585a28eee8b1b1999279b48cb7e9731187e14b66") - (revision "3")) + (let ((commit "d5ff162ce02035ec7de1acc9721385f325e928c0") + (revision "4")) (package (name "sbcl-named-readtables") (version (git-version "0.9" revision commit)) @@ -3140,9 +3140,14 @@ streams, support is included for convenient stream wrappers.") (url "https://github.com/melisgl/named-readtables") (commit commit))) (sha256 - (base32 "072p5djqq9pliw9r20rmpz5r5q5yn6rhbp98vkkp7gfcnp5ppj51")) - (file-name (git-file-name "named-readtables" version)))) + (base32 "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv")) + (file-name (git-file-name "cl-named-readtables" version)))) (build-system asdf-build-system/sbcl) + ;; (native-inputs (list sbcl-try)) + ;; Tests disabled because of a circular dependency issue: + ;; try -> named-readtables -> mgl-pax -> try + (arguments + (list #:tests? #f)) (home-page "https://github.com/melisgl/named-readtables/") (synopsis "Library that creates a namespace for named readtables") (description -- cgit 1.4.1 From 133fda953aba0b8fee12be14cee854a5afdc74ea Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:45:37 +0100 Subject: gnu: cl-cl+ssl: Update to 0.0.0-5.1e2ffc9. * gnu/packages/lisp-xyz.scm (sbcl-cl+ssl): Update to 0.0.0-5.1e2ffc9. --- gnu/packages/lisp-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 98b6ea7ce0..7d4459fe8e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5164,8 +5164,8 @@ RFC 1321 by R. Rivest, published April 1992.") (list ecl-flexi-streams)))) (define-public sbcl-cl+ssl - (let ((commit "8c13317509136e6722a25be51b74b813bbb32f9e") - (revision "4")) + (let ((commit "1e2ffc9511df4b1c25c23e0313a642a610dae352") + (revision "5")) (package (name "sbcl-cl+ssl") (version (git-version "0.0.0" revision commit)) @@ -5177,7 +5177,7 @@ RFC 1321 by R. Rivest, published April 1992.") (commit commit))) (file-name (git-file-name "cl+ssl" version)) (sha256 - (base32 "1cdq9dzk804y8bm874q8755yk4iz2z735ksm8waxl52kpfw8ai99")))) + (base32 "0iwdh416ggzs2ig6i0ivrwfy21w7m39w464pc7j3p9pvq09837fy")))) (build-system asdf-build-system/sbcl) (arguments '(#:phases @@ -5205,13 +5205,13 @@ RFC 1321 by R. Rivest, published April 1992.") sbcl-trivial-sockets)) (inputs (list openssl + sbcl-alexandria + sbcl-bordeaux-threads sbcl-cffi - sbcl-trivial-gray-streams sbcl-flexi-streams - sbcl-bordeaux-threads - sbcl-trivial-garbage - sbcl-alexandria sbcl-trivial-features + sbcl-trivial-garbage + sbcl-trivial-gray-streams sbcl-usocket)) (home-page "https://common-lisp.net/project/cl-plus-ssl/") (synopsis "Common Lisp bindings to OpenSSL") -- cgit 1.4.1 From 156e56df68c783e3fccee348e9b5ee2417ecc2b4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:53:39 +0100 Subject: gnu: cl-local-time: Update to 1.0.6-3.40169fe. * gnu/packages/lisp-xyz.scm (sbcl-local-time): Update to 1.0.6-3.40169fe. --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7d4459fe8e..794b8e707b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6141,8 +6141,8 @@ performance and simplicity in mind.") (sbcl-package->ecl-package sbcl-lack)) (define-public sbcl-local-time - (let ((commit "a177eb911c0e8116e2bfceb79049265a884b701b") - (revision "2")) + (let ((commit "40169fe26d9639f3d9560ec0255789bf00b30036") + (revision "3")) (package (name "sbcl-local-time") (version (git-version "1.0.6" revision commit)) @@ -6152,9 +6152,9 @@ performance and simplicity in mind.") (uri (git-reference (url "https://github.com/dlowe-net/local-time") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-local-time" version)) (sha256 - (base32 "0wld28xx20k0ysgg6akic5lg4vkjd0iyhv86m388xfrv8xh87wii")))) + (base32 "1dbp33zmkqzzshmf5k76pxqgli285wvy0p0dhcz816fdikpwn2jg")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-hu.dwim.stefil)) -- cgit 1.4.1 From f3a2e1dee8a0a7a5e6ef5a1659a8b7fdf027f9fd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 10:57:01 +0100 Subject: gnu: cl-anaphora: Update to 0.9.8. * gnu/packages/lisp-xyz.scm (sbcl-anaphora): Update to 0.9.8. --- gnu/packages/lisp-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 794b8e707b..ee12c65df4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3491,7 +3491,7 @@ project.") (define-public sbcl-anaphora (package (name "sbcl-anaphora") - (version "0.9.6") + (version "0.9.8") (source (origin (method git-fetch) @@ -3499,9 +3499,8 @@ project.") (url "https://github.com/tokenrove/anaphora") (commit version))) (sha256 - (base32 - "19wfrk3asimznkli0x2rfy637hwpdgqyvwj3vhq9x7vjvyf5vv6x")) - (file-name (git-file-name "anaphora" version)))) + (base32 "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b")) + (file-name (git-file-name "cl-anaphora" version)))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-rt)) -- cgit 1.4.1 From 27ac29ff23a3175d718a9ba4b8e8bb1009d16f10 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 11:02:22 +0100 Subject: gnu: cl-trivial-indent: Update to 1.0.0-1.f252750. * gnu/packages/lisp-xyz.scm (sbcl-trivial-indent): Update to 1.0.0-1.f252750. --- gnu/packages/lisp-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ee12c65df4..cebb572778 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9246,8 +9246,8 @@ path, maximum flow, minimum spanning tree, etc.).") (sbcl-package->ecl-package sbcl-graph)) (define-public sbcl-trivial-indent - (let ((commit "2d016941751647c6cc5bd471751c2cf68861c94a") - (revision "0")) + (let ((commit "f25275094b80df8aa158af46db980bbc3ce2f88b") + (revision "1")) (package (name "sbcl-trivial-indent") (version (git-version "1.0.0" revision commit)) @@ -9258,12 +9258,12 @@ path, maximum flow, minimum spanning tree, etc.).") (git-reference (url "https://github.com/Shinmera/trivial-indent") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-trivial-indent" version)) (sha256 - (base32 - "1sj90nqz17w4jq0ixz00gb9g5g6d2s7l8r17zdby27gxxh51w266")))) + (base32 "1zg8cyy1xqpcjrxxqz5zb5xixhwcszkv4p2vq305lb2rka6f3dyx")))) (build-system asdf-build-system/sbcl) - (synopsis "Simple Common Lisp library to allow indentation hints for SWANK") + (synopsis + "Simple Common Lisp library to allow indentation hints for SWANK") (description "This library allows you to define custom indentation hints for your macros if the one recognised by SLIME automatically produces unwanted -- cgit 1.4.1 From 90c24caa42b01845c8e028ae9714d73d73a3522c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 11:19:35 +0100 Subject: gnu: cl-let-plus: Update to 0.0.0-2.455e657. * gnu/packages/lisp-xyz.scm (sbcl-let-plus): Update to 0.0.0-2.455e657. --- gnu/packages/lisp-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cebb572778..5b5f75947b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3519,10 +3519,11 @@ new fiends in addition to old friends like @command{aif} and (sbcl-package->ecl-package sbcl-anaphora)) (define-public sbcl-let-plus - (let ((commit "5f14af61d501ecead02ec6b5a5c810efc0c9fdbb")) + (let ((commit "455e657e077235829b197f7ccafd596fcda69e30") + (revision "2")) (package (name "sbcl-let-plus") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3530,9 +3531,8 @@ new fiends in addition to old friends like @command{aif} and (url "https://github.com/sharplispers/let-plus") (commit commit))) (sha256 - (base32 - "0i050ca2iys9f5mb7dgqgqdxfnc3b0rnjdwv95sqd490vkiwrsaj")) - (file-name (git-file-name "let-plus" version)))) + (base32 "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb")) + (file-name (git-file-name "cl-let-plus" version)))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria sbcl-anaphora)) -- cgit 1.4.1 From 5eea067bd2eeb7ee887aa7ba026bfa233bc26057 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 11:32:24 +0100 Subject: gnu: cl-lisp-namespace: Update to 0.1-2.699fccb. * gnu/packages/lisp-xyz.scm (sbcl-lisp-namespace): Update to 0.1-2.699fccb. --- gnu/packages/lisp-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5b5f75947b..476c29180e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7441,8 +7441,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") (sbcl-package->ecl-package sbcl-dexador)) (define-public sbcl-lisp-namespace - (let ((commit "28107cafe34e4c1c67490fde60c7f92dc610b2e0") - (revision "1")) + (let ((commit "699fccb6727027343bb5fca69162a3113996edfc") + (revision "2")) (package (name "sbcl-lisp-namespace") (build-system asdf-build-system/sbcl) @@ -7454,12 +7454,11 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") (uri (git-reference (url home-page) (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-lisp-namespace" version)) (sha256 - (base32 - "1jw2wykp06z2afb9nm1lgfzll5cjlj36pnknjx614057zkkxq4iy")))) + (base32 "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p")))) (inputs - `(("alexandria" ,sbcl-alexandria))) + (list sbcl-alexandria)) (native-inputs (list sbcl-fiveam)) (synopsis "LISP-N, or extensible namespaces in Common Lisp") -- cgit 1.4.1 From 3639a25f191c261a0b2a53b85de8f14ad2cff6f9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 11:39:57 +0100 Subject: gnu: cl-fast-io: Update to 1.0.0-3.a4c5ad6. * gnu/packages/lisp-xyz.scm (sbcl-fast-io): Update to 1.0.0-3.a4c5ad6. [arguments]: Enable tests. --- gnu/packages/lisp-xyz.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 476c29180e..2bf605ba8d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5899,8 +5899,8 @@ Only minimal changes required to make your CLOS objects serializable.") (sbcl-package->ecl-package sbcl-marshal)) (define-public sbcl-fast-io - (let ((commit "603f4903dd74fb221859da7058ae6ca3853fe64b") - (revision "2")) + (let ((commit "a4c5ad600425842e8b6233b1fa22610ffcd874c3") + (revision "3")) (package (name "sbcl-fast-io") (version (git-version "1.0.0" revision commit)) @@ -5910,15 +5910,10 @@ Only minimal changes required to make your CLOS objects serializable.") (uri (git-reference (url "https://github.com/rpav/fast-io") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-fast-io" version)) (sha256 - (base32 "00agvc0xx4w715i6ach05p995zpcpghn04xc06zyci06q677vw3n")))) + (base32 "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530")))) (build-system asdf-build-system/sbcl) - (arguments - ;; Error while trying to load definition for system fast-io-test from - ;; pathname [...]/fast-io-test.asd: The function CHECKL:DEFINE-TEST-OP - ;; is undefined. - '(#:tests? #f)) (native-inputs (list sbcl-fiveam sbcl-checkl)) (inputs -- cgit 1.4.1 From 37764f213b0983276ea70e87864040118593232c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 11:46:12 +0100 Subject: gnu: cl-trivial-utf-8: Update to 0.0.0-2.6ca9943. * gnu/packages/lisp-xyz.scm (sbcl-trivial-utf-8): Update to 0.0.0-2.6ca9943. --- gnu/packages/lisp-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2bf605ba8d..b723bbab6e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7007,8 +7007,8 @@ common of which is probably Active Directory.") (sbcl-package->cl-source-package sbcl-cl-gss)) (define-public sbcl-trivial-utf-8 - (let ((commit "4d427cfbb1c452436a0efb71c3205c9da67f718f") - (revision "1")) + (let ((commit "6ca9943588cbc61ad22a3c1ff81beb371e122394") + (revision "2")) (package (name "sbcl-trivial-utf-8") (version (git-version "0.0.0" revision commit)) @@ -7020,10 +7020,9 @@ common of which is probably Active Directory.") (url (string-append "https://gitlab.common-lisp.net/" "trivial-utf-8/trivial-utf-8.git")) (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-trivial-utf-8" version)) (sha256 - (base32 - "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1")))) + (base32 "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss")))) (arguments ;; Guix incorrectly assumes the "8" is part of the version ;; number and lobs it off. -- cgit 1.4.1 From f59aa0916cba9cac7abe7cc939be5cc1f728583d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:16:30 +0100 Subject: gnu: cl-introspect-environment: Update to 0.1-2.8fb20a1. * gnu/packages/lisp-xyz.scm (sbcl-introspect-environment): Update to 0.1-2.8fb20a1. --- gnu/packages/lisp-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b723bbab6e..48035e1b2f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7500,8 +7500,8 @@ and it exports symbols from implementation-specific packages.") (sbcl-package->ecl-package sbcl-trivial-cltl2)) (define-public sbcl-introspect-environment - (let ((commit "fff42f8f8fd0d99db5ad6c5812e53de7d660020b") - (revision "1")) + (let ((commit "8fb20a1a33d29637a22943243d1482a20c32d6ae") + (revision "2")) (package (name "sbcl-introspect-environment") (build-system asdf-build-system/sbcl) @@ -7513,10 +7513,9 @@ and it exports symbols from implementation-specific packages.") (uri (git-reference (url home-page) (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-introspect-environment" version)) (sha256 - (base32 - "1i305n0wfmpac63ni4i3vixnnkl8daw5ncxy0k3dv92krgx6qzhp")))) + (base32 "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s")))) (native-inputs (list sbcl-fiveam)) (synopsis "Common Lisp environment introspection portability layer") -- cgit 1.4.1 From 540eca0cf214882b6bb9caf2baf67f148e955cff Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:23:33 +0100 Subject: gnu: cl-collectors: Update to 1.0-1.748f0a1. * gnu/packages/lisp-xyz.scm (sbcl-collectors): Update to 1.0-1.748f0a1. --- gnu/packages/lisp-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 48035e1b2f..025f555cda 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14948,19 +14948,20 @@ table.") (sbcl-package->ecl-package sbcl-concurrent-hash-tables)) (define-public sbcl-collectors - (let ((commit "13acef25d8422d1d82e067b1861e513587c166ee")) + (let ((commit "748f0a1613ce161edccad4cc815eccd7fc55aaf3") + (revision "1")) (package (name "sbcl-collectors") - (version (git-version "0.1" "1" commit)) + (version (git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/AccelerationNet/collectors") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-collectors" version)) (sha256 - (base32 "1si68n1j6rpns8jw6ksqjpb937pdl30v7xza8rld7j5vh0jhy2yi")))) + (base32 "1mxcq7wq2jwbjd39afihpd46qkaidq76prgjbzpkv5749wf2spib")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria sbcl-closer-mop sbcl-symbol-munger)) -- cgit 1.4.1 From 9542ca07d09f2c92d54c3e5a2095e7439d9d9715 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:30:18 +0100 Subject: gnu: cl-djula: Update to 0.2.0-2.6f14259. * gnu/packages/lisp-xyz.scm (sbcl-djula): Update to 0.2.0-2.6f14259. --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 025f555cda..51332232b8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19250,8 +19250,8 @@ CL-I18N and CL-L10N.") (sbcl-package->cl-source-package sbcl-cl-slice)) (define-public sbcl-djula - (let ((commit "5df7af35a21503d468a878fc6029caa527a7d204") - (revision "1")) + (let ((commit "6f142594e0372437e64f610b796350ad89ba0be1") + (revision "2")) (package (name "sbcl-djula") (version (git-version "0.2.0" revision commit)) @@ -19261,9 +19261,9 @@ CL-I18N and CL-L10N.") (uri (git-reference (url "https://github.com/mmontone/djula") (commit commit))) - (file-name (git-file-name "djula" version)) + (file-name (git-file-name "cl-djula" version)) (sha256 - (base32 "1lk2ypm3sacf60h96a7hv9jwjlxkl4k40yzdalmqdg548vrd1jjm")))) + (base32 "0yyg61hrql1vrwllyd23vidiff28ridh0avxyvnqb89v060d1j83")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam)) -- cgit 1.4.1 From e8a7e4ac58a8b1df7bcfcb9cc47a36b5d41f36d6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:39:22 +0100 Subject: gnu: cl-freetype2: Update to 1.1-1.8bcb232. * gnu/packages/lisp-xyz.scm (sbcl-cl-freetype2): Update to 1.1-1.8bcb232. [inputs]: Remove labels. --- gnu/packages/lisp-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 51332232b8..0e83ed098d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13548,8 +13548,8 @@ wrappers of deflate streams. It currently does not handle compression.") (sbcl-package->ecl-package sbcl-skippy)) (define-public sbcl-cl-freetype2 - (let ((commit "96058da730b4812df916c1f4ee18c99b3b15a3de") - (revision "0")) + (let ((commit "8bcb232b319a66fb700eaea88d0b308a837bce04") + (revision "1")) (package (name "sbcl-cl-freetype2") (version (git-version "1.1" revision commit)) @@ -13559,17 +13559,17 @@ wrappers of deflate streams. It currently does not handle compression.") (uri (git-reference (url "https://github.com/rpav/cl-freetype2") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-freetype2" version)) (sha256 - (base32 "0f8darhairgxnb5bzqcny7nh7ss3471bdzix5rzcyiwdbr5kymjl")))) + (base32 "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam)) (inputs - `(("alexandria" ,sbcl-alexandria) - ("cffi" ,sbcl-cffi) - ("freetype" ,freetype) - ("trivial-garbage" ,sbcl-trivial-garbage))) + (list freetype + sbcl-alexandria + sbcl-cffi + sbcl-trivial-garbage)) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 57a06374143de29311de2c7731fc79479386962b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:44:54 +0100 Subject: gnu: cl-pdf: Update to 2.0.0-3.ee904a1. * gnu/packages/lisp-xyz.scm (sbcl-cl-pdf): Update to 2.0.0-3.ee904a1. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0e83ed098d..00fa78909c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1872,8 +1872,8 @@ a sequence (or chain) of such elements.") (sbcl-package->cl-source-package sbcl-flexichain)) (define-public sbcl-cl-pdf - (let ((commit "f57905e0b5adb365d611a912613cee70d78d20d8") - (revision "2")) + (let ((commit "ee904a118a0f060279ad9d253a3e8e3997609213") + (revision "3")) (package (name "sbcl-cl-pdf") (version (git-version "2.0.0" revision commit)) @@ -1885,7 +1885,7 @@ a sequence (or chain) of such elements.") (commit commit))) (file-name (git-file-name "cl-pdf" version)) (sha256 - (base32 "0ir9xyj10lyp8mwb3n2pbhnwv0jx0ph1xlhh32sfgalk3bz0ms58")))) + (base32 "0j7hbqv6yzrgx0inqinpw8h22728l53ccciw6iymzz4g92j9fzlq")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-iterate sbcl-zpb-ttf)) -- cgit 1.4.1 From da16d56773ae6b69103fae71c03d87d4b05e4a5f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 13:58:16 +0100 Subject: gnu: cl-clx: Update to 0.7.5-1.3840045. * gnu/packages/lisp-xyz.scm (sbcl-clx): Update to 0.7.5-1.3840045. [native-inputs]: Add xorg-server-for-tests. [arguments]: Add 'prepare-test-environment' phase. --- gnu/packages/lisp-xyz.scm | 50 +++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 00fa78909c..7fa700bfbb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1905,30 +1905,38 @@ files.") (sbcl-package->cl-source-package sbcl-cl-pdf)) (define-public sbcl-clx - (package - (name "sbcl-clx") - (version "0.7.5") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/sharplispers/clx") - (commit version))) - (sha256 - (base32 - "1vi67z9hpj5rr4xcmfbfwzmlcc0ah7hzhrmfid6lqdkva238v2wf")) - (file-name (string-append "clx-" version)))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-fiasco)) - (home-page "https://www.cliki.net/portable-clx") - (synopsis "X11 client library for Common Lisp") - (description "CLX is an X11 client library for Common Lisp. The code was + (let ((commit "38400456d66823e417d1d27d339b09885e25eb59") + (revision "1")) + (package + (name "sbcl-clx") + (version (git-version "0.7.5" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/sharplispers/clx") + (commit commit))) + (sha256 + (base32 "1c05gjqh5lil2sgma0yap4mxd9y1cjkp933hyx1iaj14950nhfnl")) + (file-name (git-file-name "cl-clx" version)))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiasco xorg-server-for-tests)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-test-environment + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) + (home-page "https://www.cliki.net/portable-clx") + (synopsis "X11 client library for Common Lisp") + (description "CLX is an X11 client library for Common Lisp. The code was originally taken from a CMUCL distribution, was modified somewhat in order to make it compile and run under SBCL, then a selection of patches were added from other CLXes around the net.") - (license license:x11))) + (license license:x11)))) (define-public cl-clx (sbcl-package->cl-source-package sbcl-clx)) -- cgit 1.4.1 From 7e21652b4114b29f4edf9536a89048523cb90658 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 14:04:51 +0100 Subject: gnu: cl-log4cl: Update to 1.1.4-1.75c4184. * gnu/packages/lisp-xyz.scm (sbcl-log4cl): Update to 1.1.4-1.75c4184. --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7fa700bfbb..c7ccbac017 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6396,20 +6396,20 @@ theory accurate to internal-time-units-per-second.") (sbcl-package->ecl-package sbcl-cl-log)) (define-public sbcl-log4cl - (let ((commit "8c48d6f41d3a1475d0a91eed0638b9eecc398e35") + (let ((commit "75c4184fe3dbd7dec2ca590e5f0176de8ead7911") (revision "1")) (package (name "sbcl-log4cl") - (version (git-version "1.1.3" revision commit)) + (version (git-version "1.1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/sharplispers/log4cl") (commit commit))) - (file-name (git-file-name "log4cl" version)) + (file-name (git-file-name "cl-log4cl" version)) (sha256 - (base32 "0166d9aip366pbpdk5gsi2f6xad6q61lssxgbrypa8zslwjn8736")))) + (base32 "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-stefil)) -- cgit 1.4.1 From 5ea9788b5873133eedbcd18f5ba95b1f5006440a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 14:11:11 +0100 Subject: gnu: cl-slime-swank: Update to 2.28. * gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.28. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c7ccbac017..50efb5a592 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3237,16 +3237,16 @@ writing code that contains string literals that contain code themselves.") (define-public sbcl-slime-swank (package (name "sbcl-slime-swank") - (version "2.27") + (version "2.28") (source (origin - (file-name (git-file-name "slime-swank" version)) + (file-name (git-file-name "cl-slime-swank" version)) (method git-fetch) (uri (git-reference (url "https://github.com/slime/slime/") (commit (string-append "v" version)))) (sha256 - (base32 "1s5mbljlz22pb90gwbd380nighkz6gdxl77hc08gri7wwr5gy5n2")) + (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll")) (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already -- cgit 1.4.1 From fb83e06943567f41e493e665be04e9ef725f3ad0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 14:14:47 +0100 Subject: gnu: cl-zpb-ttf: Update to 1.0.6. * gnu/packages/lisp-xyz.scm (sbcl-zpb-ttf): Update to 1.0.6. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 50efb5a592..06541f1e11 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1706,7 +1706,7 @@ ANSI-compliant Common Lisp implementations.") (define-public sbcl-zpb-ttf (package (name "sbcl-zpb-ttf") - (version "1.0.4") + (version "1.0.6") (source (origin (method git-fetch) @@ -1715,7 +1715,7 @@ ANSI-compliant Common Lisp implementations.") (commit (string-append "release-" version)))) (file-name (git-file-name "cl-zpb-ttf" version)) (sha256 - (base32 "1ziwlfys15m95hh5c54g3xv78vjxadd6qi9zf9kvd2bv70qsixqk")))) + (base32 "043xga76jms7dipcwnyh8lkj3gx66cvrkwhc728hjaf7axarvcmv")))) (build-system asdf-build-system/sbcl) (home-page "https://github.com/xach/zpb-ttf") (synopsis "TrueType font file access for Common Lisp") -- cgit 1.4.1 From a35226284e1601198cce4654e9d00aaba27574ee Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 14:38:48 +0100 Subject: gnu: cl-mcclim: Update to 0.9.7-3.ece91cf. * gnu/packages/lisp-xyz.scm (sbcl-mcclim): Update to 0.9.7-3.ece91cf. [inputs]: Add cl-base64 and cl-who. [arguments]: Remove 'fix-build' phase. --- gnu/packages/lisp-xyz.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 06541f1e11..a4e0c89694 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13930,8 +13930,8 @@ functions.") (sbcl-package->ecl-package sbcl-cl-dejavu)) (define-public sbcl-mcclim - (let ((commit "292343f9e30c7ef54a3d9b4b045495387c51585e") - (revision "2")) + (let ((commit "ece91cf035e2ccb1c6eb0bb867ae2bc45f627982") + (revision "3")) (package (name "sbcl-mcclim") (version (git-version "0.9.7" revision commit)) @@ -13943,7 +13943,7 @@ functions.") (commit commit))) (file-name (git-file-name "cl-mcclim" version)) (sha256 - (base32 "10sq34rk11p2lrpqg5hr4721y2yqpmz9yk88mgdmwn7iyga5f2fp")))) + (base32 "0prn4f0nz604ykcg8004f1vndgjm7181wrlblq6mhasphca28c2k")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam pkg-config)) @@ -13954,20 +13954,22 @@ functions.") sbcl-alexandria sbcl-babel sbcl-bordeaux-threads + sbcl-cffi + sbcl-cl-base64 sbcl-cl-dejavu sbcl-cl-freetype2 sbcl-cl-pdf - sbcl-cffi sbcl-cl-unicode sbcl-cl-vectors + sbcl-cl-who sbcl-closer-mop sbcl-clx sbcl-flexi-streams sbcl-flexichain sbcl-log4cl sbcl-opticl - sbcl-spatial-trees sbcl-slime-swank + sbcl-spatial-trees sbcl-trivial-features sbcl-trivial-garbage sbcl-trivial-gray-streams @@ -13986,17 +13988,7 @@ functions.") (search-input-file inputs "/lib/libfontconfig.so"))) (substitute* "Extensions/harfbuzz/src/functions.lisp" (("libharfbuzz\\.so") - (search-input-file inputs "/lib/libharfbuzz.so"))))) - (add-after 'unpack 'fix-build - (lambda _ - ;; The cffi-grovel system does not get loaded automatically, - ;; so we load it explicitly. - (substitute* "Extensions/fontconfig/mcclim-fontconfig.asd" - (("\\(asdf:defsystem #:mcclim-fontconfig" all) - (string-append "(asdf:load-system :cffi-grovel)\n" all))) - (substitute* "Extensions/harfbuzz/mcclim-harfbuzz.asd" - (("\\(asdf:defsystem #:mcclim-harfbuzz" all) - (string-append "(asdf:load-system :cffi-grovel)\n" all)))))))) + (search-input-file inputs "/lib/libharfbuzz.so")))))))) (home-page "https://common-lisp.net/project/mcclim/") (synopsis "Common Lisp GUI toolkit") (description -- cgit 1.4.1 From 67e4596781e11cd93b1fc6708484b6468388a18a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 15:40:04 +0100 Subject: gnu: cl-mcclim: Enable Freetype renderer. * gnu/packages/lisp-xyz.scm (sbcl-mcclim)[arguments]: Add 'enable-freetype-renderer' phase. --- gnu/packages/lisp-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a4e0c89694..2e69a01dcd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13988,7 +13988,12 @@ functions.") (search-input-file inputs "/lib/libfontconfig.so"))) (substitute* "Extensions/harfbuzz/src/functions.lisp" (("libharfbuzz\\.so") - (search-input-file inputs "/lib/libharfbuzz.so")))))))) + (search-input-file inputs "/lib/libharfbuzz.so"))))) + (add-after 'unpack 'enable-freetype-renderer + (lambda _ + (substitute* "mcclim.asd" + (("\\(:feature :mcclim-ffi-freetype \"mcclim-clx/freetype\"\\)") + "\"mcclim-clx/freetype\""))))))) (home-page "https://common-lisp.net/project/mcclim/") (synopsis "Common Lisp GUI toolkit") (description -- cgit 1.4.1 From ea2fa86f31a83195ac789a6d92bcaee8e53e4397 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 24 Feb 2023 17:19:40 +0100 Subject: Revert "gnu: cl-mcclim: Enable Freetype renderer." This reverts commit 67e4596781e11cd93b1fc6708484b6468388a18a. This will need more work to work properly. --- gnu/packages/lisp-xyz.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2e69a01dcd..a4e0c89694 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13988,12 +13988,7 @@ functions.") (search-input-file inputs "/lib/libfontconfig.so"))) (substitute* "Extensions/harfbuzz/src/functions.lisp" (("libharfbuzz\\.so") - (search-input-file inputs "/lib/libharfbuzz.so"))))) - (add-after 'unpack 'enable-freetype-renderer - (lambda _ - (substitute* "mcclim.asd" - (("\\(:feature :mcclim-ffi-freetype \"mcclim-clx/freetype\"\\)") - "\"mcclim-clx/freetype\""))))))) + (search-input-file inputs "/lib/libharfbuzz.so")))))))) (home-page "https://common-lisp.net/project/mcclim/") (synopsis "Common Lisp GUI toolkit") (description -- cgit 1.4.1 From 5cd36195451b734211bd49131d196439790d91e6 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 24 Feb 2023 17:35:02 +0100 Subject: gnu: qpdfview: Update to 0.5.0. * gnu/packages/pdf.scm (qpdfview): Update to 0.5.0. * gnu/packages/patches/qpdfview-qt515-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/patches/qpdfview-qt515-compat.patch | 17 ----------------- gnu/packages/pdf.scm | 7 +++---- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/qpdfview-qt515-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0838f66618..9ae37a9bb4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1770,7 +1770,6 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ - %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ diff --git a/gnu/packages/patches/qpdfview-qt515-compat.patch b/gnu/packages/patches/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f1..0000000000 --- a/gnu/packages/patches/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c040afcae7..9926739973 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -888,16 +888,15 @@ program capable of converting PDF into other formats.") (define-public qpdfview (package (name "qpdfview") - (version "0.4.18") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/qpdfview/" "trunk/" version "/+download/" - "qpdfview-" version ".tar.gz")) + "qpdfview-" (version-major+minor version) ".tar.gz")) (sha256 - (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")) - (patches (search-patches "qpdfview-qt515-compat.patch")))) + (base32 "16dy341927r2s1dza7g8ci1jyypfc4a6yfcvg9sxvjv1li0c9vs4")))) (build-system qt-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 5609d7dab9b606247b65bd303ffdaa2b24d58f82 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 24 Feb 2023 17:35:04 +0100 Subject: gnu: qpdfview: Use new package style. * gnu/packages/pdf.scm (qpdfview)[arguments]: Use gexps. Signed-off-by: Leo Famulari --- gnu/packages/pdf.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9926739973..6eee460740 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -908,14 +908,14 @@ program capable of converting PDF into other formats.") qtbase-5 qtsvg-5)) (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "qpdfview.pri" - (("/usr") (assoc-ref outputs "out"))) - (invoke "qmake" "qpdfview.pro")))))) + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "qpdfview.pri" + (("/usr") #$output)) + (invoke "qmake" "qpdfview.pro")))))) (home-page "https://launchpad.net/qpdfview") (synopsis "Tabbed document viewer") (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU -- cgit 1.4.1 From df8b8f0c76388239dac9f2892c97b92e92c92901 Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 24 Feb 2023 15:08:09 -0500 Subject: gnu: u-boot-rock64-rk3328: Fix typo that causes boot failure. * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)[arguments]: Fix typo. Signed-off-by: Leo Famulari --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9d56efb628..7e839fa859 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1193,7 +1193,7 @@ Documentation} for more information (for example by running @samp{info #~(modify-phases #$phases (add-after 'unpack 'set-environment (lambda* (#:key native-inputs inputs #:allow-other-keys) - (setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) + (setenv "BL31" (search-input-file inputs "bl31.elf")))))))) (inputs (modify-inputs (package-inputs base) (append arm-trusted-firmware-rk3328)))))) -- cgit 1.4.1 From 7dbd73a329d9918711f45c8090a3a92520836211 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 22:12:59 +0100 Subject: gnu: python: Remove input labels. * gnu/packages/python.scm (python-3.9)[native-inputs]: Remove labels. (python2-minimal)[inputs]: Likewise. (python-minimal)[inputs]: Likewise. --- gnu/packages/python.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0c164d7991..077814719d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2021 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2021, 2023 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017, 2019 Eric Bavier @@ -559,13 +559,13 @@ data types.") (modify-inputs (package-inputs python-2.7) (replace "openssl" openssl))) (native-inputs - `(("tzdata" ,tzdata-for-tests) - ("unzip" ,unzip) - ("zip" ,(@ (gnu packages compression) zip)) - ,@(if (%current-target-system) - `(("python3" ,this-package)) - '()) - ,@(package-native-inputs python-2))) + (let ((inputs (modify-inputs (package-native-inputs python-2) + (prepend tzdata-for-tests + unzip + (@ (gnu packages compression) zip))))) + (if (%current-target-system) + (modify-inputs inputs (prepend this-package)) + inputs))) (native-search-paths (list (guix-pythonpath-search-path version) ;; Used to locate tzdata by the zoneinfo module introduced in @@ -592,9 +592,7 @@ data types.") ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus ;; libffi. Expat is needed for XML support which is expected by a lot ;; of libraries out there. - (inputs `(("expat" ,expat) - ("libffi" ,libffi) - ("zlib" ,zlib))))) + (inputs (list expat libffi zlib)))) (define-public python-minimal (package/inherit python @@ -605,10 +603,7 @@ data types.") ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; ;; zlib is required by 'zipimport', used by pip. Expat is needed ;; for XML support, which is generally expected to be available. - (inputs `(("expat" ,expat) - ("libffi" ,libffi) - ("openssl" ,openssl) - ("zlib" ,zlib))))) + (inputs (list expat libffi openssl zlib)))) (define-public python-debug (package/inherit python -- cgit 1.4.1 From 85e55dd90b50b4803dd002a9237e4c0c4d628525 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Feb 2023 23:03:28 +0100 Subject: gnu: binutils-gold: Remove input label. * gnu/packages/base.scm (binutils-gold)[native-inputs]: Remove label. --- gnu/packages/base.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 36b27a4e25..fa5f1ef32b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022 Ludovic Courtès +;;; Copyright © 2012-2023 Ludovic Courtès ;;; Copyright © 2014, 2019 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver @@ -648,8 +648,7 @@ included.") (substitute* "gold/Makefile.in" ((" testsuite") " "))))) '()))))) - (native-inputs - `(("bc" ,bc))))) + (native-inputs (list bc)))) (define* (make-ld-wrapper name #:key (target (const #f)) -- cgit 1.4.1 From 279b0122b63502f1d5ea027025dcc4dd4180e478 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Feb 2023 14:43:07 +0100 Subject: gnu: perl-gd: Remove input labels. * gnu/packages/gd.scm (perl-gd)[inputs]: Remove labels. --- gnu/packages/gd.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 9e422dbe97..02e05c6072 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -108,12 +108,12 @@ most common applications of GD involve website development.") (base32 "0arjpa8id6k5yjxfq0j2hsinhhjzjch5lwk6gscf48l54drrw729")))) (build-system perl-build-system) (inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("gd" ,gd) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("zlib" ,zlib))) + (list fontconfig + freetype + gd + libpng + libjpeg-turbo + zlib)) (native-inputs (list perl-extutils-pkgconfig)) (arguments -- cgit 1.4.1 From 5c4240442cd39fd5d279e080184f0ee2fb1c8af4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Feb 2023 14:53:56 +0100 Subject: gnu: perl-gd: Use gexps. This helps cross-compilation: in that case, '%build-inputs' was unbound. * gnu/packages/gd.scm (perl-gd)[arguments]: Rewrite using gexps. --- gnu/packages/gd.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 02e05c6072..90023ddc84 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2016 Ludovic Courtès +;;; Copyright © 2013, 2016, 2023 Ludovic Courtès ;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2017 Leo Famulari @@ -23,6 +23,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gd) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -117,9 +118,9 @@ most common applications of GD involve website development.") (native-inputs (list perl-extutils-pkgconfig)) (arguments - `(#:make-maker-flags - (list (string-append "--lib_jpeg_path=" - (assoc-ref %build-inputs "libjpeg"))))) + (list #:make-maker-flags + #~(list (string-append "--lib_jpeg_path=" + #$(this-package-input "libjpeg-turbo"))))) (home-page "https://metacpan.org/release/GD") (synopsis "Perl interface to the GD graphics library") (description "GD.pm is an autoloadable interface module for libgd, a -- cgit 1.4.1 From 55d5a5edc74906e0ba659ba1a58e801144fa7a0b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Feb 2023 15:07:56 +0100 Subject: gnu: goffice@0.8: Remove input labels. * gnu/packages/gnome.scm (goffice-0.8)[inputs]: Remove label, use 'modify-inputs'. --- gnu/packages/gnome.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f329ff1dc4..b290a93723 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014-2022 Ludovic Courtès +;;; Copyright © 2014-2023 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -4343,7 +4343,8 @@ Hints specification (EWMH).") (list license:gpl2 license:gpl3)))) (define-public goffice-0.8 - (package (inherit goffice) + (package + (inherit goffice) (version "0.8.17") (source (origin (method url-fetch) @@ -4366,9 +4367,8 @@ Hints specification (EWMH).") (propagated-inputs ;; libgoffice-0.8.pc mentions libgsf-1 (list libgsf)) - (inputs - `(("gtk" ,gtk+-2) - ,@(alist-delete "gtk" (package-inputs goffice)))))) + (inputs (modify-inputs (package-inputs goffice) + (replace "gtk+" gtk+-2))))) (define-public gnumeric (package -- cgit 1.4.1 From ff98a9f75a3e81ebea2cf576d85737db81f61fb0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Feb 2023 17:06:12 +0100 Subject: gnu: libgc: Define properties for the 'generic-html' updater. * gnu/packages/bdw-gc.scm (libgc)[source]: Add second URL. [properties]: New field. --- gnu/packages/bdw-gc.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index c812248e86..ae0d761ac3 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021, 2023 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2017 Rene Saavedra @@ -36,8 +36,11 @@ (version "8.0.4") (source (origin (method url-fetch) - (uri (string-append "https://github.com/ivmai/bdwgc/releases" - "/download/v" version "/gc-" version ".tar.gz")) + (uri (list (string-append "https://github.com/ivmai/bdwgc/releases" + "/download/v" version + "/gc-" version ".tar.gz") + (string-append "https://www.hboehm.info/gc/gc_source" + "/gc-" version ".tar.gz"))) (sha256 (base32 "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3")))) @@ -69,6 +72,9 @@ `(("libatomic-ops" ,libatomic-ops)) '())) (outputs '("out" "debug")) + (properties + '((release-monitoring-url . "https://www.hboehm.info/gc/gc_source/") + (upstream-name . "gc"))) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") (description -- cgit 1.4.1 From 1c13606a289b9ca97cf6aee2fddc14360b348ef3 Mon Sep 17 00:00:00 2001 From: Jake Leporte Date: Mon, 20 Feb 2023 10:13:06 -0600 Subject: gnu: python-paste: Update to 3.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-paste): Update to 3.5.2. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8c5b185e3f..8a73c929a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4599,23 +4599,23 @@ available in Django, but is a standalone package.") (define-public python-paste (package (name "python-paste") - (version "3.0.6") + (version "3.5.2") (source (origin (method url-fetch) (uri (pypi-uri "Paste" version)) (sha256 (base32 - "14lbi9asn5agsdf7r97prkjpz7amgmp529lbvfhf0nv881xczah6")) + "1xjakxrdvy4kgfy170gb9bl8zp9hqjjwh1h1vlik1pxw606399ym")) (patches (search-patches "python-paste-remove-timing-test.patch")) (modules '((guix build utils))) (snippet '(begin ;; This test calls out to the internet. (delete-file "tests/test_proxy.py") #t)))) - (build-system python-build-system) + (build-system pyproject-build-system) (native-inputs - (list python-pytest python-pytest-runner python-nose)) + (list python-pytest python-nose)) (propagated-inputs (list python-six)) (home-page "https://pythonpaste.readthedocs.io/") -- cgit 1.4.1 From b15658a60e83ab01df76825923c1404f53a840c2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Feb 2023 23:24:36 +0100 Subject: gnu: guix-icons: Never cross-compile. * gnu/packages/package-management.scm (guix-icons)[arguments]: Add #:target #f. --- gnu/packages/package-management.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3efcadb50d..c7d61f0070 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -627,6 +627,11 @@ overridden by setting the 'current-guix-package' parameter." (arguments `(#:modules ((guix build utils) (gnu build svg)) + + ;; There's no point in cross-compiling: a native build gives the same + ;; result, independently of the system type. + #:target #f + #:builder ,(with-extensions (list guile-rsvg guile-cairo) #~(begin -- cgit 1.4.1 From 3164d48e55b2d614bcd8def064d4671578617963 Mon Sep 17 00:00:00 2001 From: conses Date: Mon, 20 Feb 2023 20:58:46 +0100 Subject: gnu: Add postmarketos-theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (postmarketos-theme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index f25cf446d7..74b676c484 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1436,6 +1436,30 @@ variants.") license:lgpl2.1 ; Some style sheets. license:cc-by-sa4.0)))) ; Some icons +(define-public postmarketos-theme + (package + (name "postmarketos-theme") + (version "0.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/postmarketOS/postmarketos-theme") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09in7737cirmw2c0ac40ac29szfgdva6q0zl32mdi12marybd2g5")))) + (build-system meson-build-system) + (native-inputs (list sassc)) + (home-page "https://gitlab.com/postmarketOS/postmarketos-theme") + (synopsis "PostmarketOS themed themes") + (description + "@code{postmarketos-theme} contains a GTK3 and GTK4 theme which is based +on Adwaita but replaces the standard blue highlights in the theme with +postmarketOS green. There's also the oled and paper variants of the theme +that are completely black and completely white.") + (license license:lgpl2.0+))) + (define-public eiciel (package (name "eiciel") -- cgit 1.4.1 From b12ee1ee5b8b53bf27b79ce81b1b2158cc7de484 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 23 May 2022 23:44:58 +0100 Subject: gnu: Add python-spherical-geometry. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm (python-spherical-geometry): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 02d6dc0aa1..b6ed1e2f49 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) #:use-module (gnu packages perl) @@ -1680,6 +1681,54 @@ positions of the sun: dawn, sunrise, solar noon, sunset, dusk, solar elevation, solar azimuth, rahukaalam, and the phases of the moon.") (license license:asl2.0))) +(define-public python-spherical-geometry + (package + (name "python-spherical-geometry") + (version "1.2.22") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spacetelescope/spherical_geometry") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kzcncqir4v7nhk9lxj9gxr32p3krkaqa58y2i4kksgxxy24qw4z")))) + (build-system python-build-system) + (arguments + (list + ;; NOTE: (Sharlatan-20220523T231348+0100): Tests depends on old Python2 + ;; libarry `sphere' + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'preparations + (lambda _ + ;; Fixing: setuptools-scm was unable to detect version for ... + (substitute* "setup.py" + (("use_scm_version=True") + (format #f "version=~s" #$version)) + (("setup_requires=\\['setuptools_scm'\\],.*") + "")) + ;; Use our own libraries in place of bundles. + (setenv "USE_SYSTEM_QD" "1")))))) + (native-inputs + (list python-pytest + python-setuptools-scm)) + (inputs + (list qd)) + (propagated-inputs + (list python-astropy + python-numpy)) + (home-page "https://github.com/spacetelescope/tweakwcs") + (synopsis "Python astronimical package for handling spherical polygons") + (description + "The @code{spherical_geometry} library is a Python package for handling +spherical polygons that represent arbitrary regions of the sky.") + ;; LICENSE.rst Association of Universities for Research in Astronomy (AURA) + ;; QD_LIBRARY_LICENSE.rst for bandeled QD source + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 01fd830f2fdd388f56e6e00df747f052bbde3906 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Feb 2023 23:25:56 -0500 Subject: gnu: u-boot-ts7970-q-2g-1000mhz-c: Adjust description. * gnu/packages/bootloaders.scm (u-boot-ts7970-q-2g-1000mhz-c): Adjust the u-boot.imx file name on the SD card to the default one used by the 'u-boot-ts7970-q-2g-1000mhz-c-bootloader' bootloader. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 7e839fa859..b1276f90dd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1517,7 +1517,7 @@ To flash this bootloader, write it to an SD card, then using the U-Boot serial console: @example mmc dev 0 -load mmc 0:1 ${loadaddr} /u-boot.imx +load mmc 0:1 ${loadaddr} /boot/u-boot.imx sf probe sf erase 0 0x80000 sf write ${loadaddr} 0x400 $filesize -- cgit 1.4.1 From d03ad1a8b309fa02e6f6da8f69d54f4110b8bdf5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Feb 2023 11:57:19 +0100 Subject: gnu: texlive-soul: Supersede texlive-generic-soul. * gnu/packages/tex.scm (texlive-soul): New variable. (texlive-generic-soul): Deprecate in favour of the above. --- gnu/packages/tex.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bea4b4b307..cf649e0cfd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -12091,16 +12091,34 @@ which the command @code{\\tab} advances typesetting position to the next defined ``tab stop''.") (license license:lppl1.3+))) -(define-public texlive-generic-soul +(define-public texlive-soul (let ((template (simple-texlive-package - "texlive-generic-soul" - (list "/doc/generic/soul/" - "/tex/generic/soul/") + "texlive-soul" + (list "doc/generic/soul/" + "source/generic/soul/" + "tex/generic/soul/") (base32 - "11jdgvfpcv10y5j898495lf29k2m03x39v9jzb4v79w4cgxcmfps") - #:trivial? #t))) + "0ikipdswzsafi4rr6q9xh3hkxk2n2683ym1879qcax41xs6cizdl")))) (package (inherit template) + (outputs '("out" "doc")) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) "generic/soul") + ((#:build-targets _ '()) '(list "soul.ins")) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/generic/soul/"))) + (replace 'copy-files + (lambda* (#:key inputs #:allow-other-keys) + (let ((origin (assoc-ref inputs "source")) + (source (string-append #$output + "/share/texmf-dist/source")) + (doc (string-append #$output:doc + "/share/texmf-dist/doc"))) + (copy-recursively (string-append origin "/source") source) + (copy-recursively (string-append origin "/doc") doc)))))))) (home-page "http://www.ctan.org/pkg/soul") (synopsis "Hyphenation for letterspacing, underlining, and more") (description @@ -12112,6 +12130,8 @@ syllable. The package itself does not support UTF-8 input in ordinary (PDF)LaTeX; some UTF-8 support is offered by package @code{soulutf8}.") (license license:lppl)))) +(define-deprecated-package texlive-generic-soul texlive-soul) + (define-public texlive-generic-xstring (let ((template (simple-texlive-package "texlive-generic-xstring" -- cgit 1.4.1 From 82fc07363b1600b0bfbf4a3327ea516a7b480f6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Feb 2023 12:23:34 +0100 Subject: gnu: texlive-xstring: Supersed texlive-generic-xstring. * gnu/packages/tex.scm (texlive-xstring): New variable. (texlive-generic-xstring): Deprecate in favour of the above. (texlive-minted): Use new name. --- gnu/packages/tex.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index cf649e0cfd..1dc74d848d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -10076,12 +10076,12 @@ the bundle.") texlive-etoolbox texlive-fancyvrb texlive-fvextra - texlive-generic-xstring texlive-latex-float texlive-latex-framed texlive-latex-ifplatform texlive-latex-newfloat - texlive-lineno)) + texlive-lineno + texlive-xstring)) (home-page "https://ctan.org/pkg/minted") (synopsis "Highlight source code in LaTeX documents") (description "This package facilitates expressive syntax highlighting in @@ -12132,9 +12132,9 @@ syllable. The package itself does not support UTF-8 input in ordinary (define-deprecated-package texlive-generic-soul texlive-soul) -(define-public texlive-generic-xstring +(define-public texlive-xstring (let ((template (simple-texlive-package - "texlive-generic-xstring" + "texlive-xstring" (list "/doc/generic/xstring/" "/tex/generic/xstring/") (base32 @@ -12153,6 +12153,8 @@ recurrences of, a substring. The package works equally in Plain TeX and LaTeX (expandable) macros.") (license license:lppl1.3c)))) +(define-deprecated texlive-generic-xstring texlive-xstring) + (define-public texlive-substr (package (inherit (simple-texlive-package -- cgit 1.4.1 From 7b40cb7c6e310652c118f339422e3ab9f87d67eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Feb 2023 08:36:33 -0500 Subject: gnu: guix: Update to 1.4.0-4.01fd830. * gnu/packages/package-management.scm (guix): Update to 1.4.0-4.01fd830. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c7d61f0070..5527eb6875 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -165,8 +165,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "d5fece6bfe6b2eaf93f936a4a6dea8fbfe118140") - (revision 3)) + (commit "01fd830f2fdd388f56e6e00df747f052bbde3906") + (revision 4)) (package (name "guix") @@ -182,7 +182,7 @@ (commit commit))) (sha256 (base32 - "1q7qfxhfayhcia30w60klnv3q29a2n72vvf1wkdvwx55q3p8prsc")) + "1kc4p6sakj57mdcd6avvbbw72q8irddn0cz7l17k0dp1463vjfl1")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From f702206a371e74964747c3d95241dd027e77d2a6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 00:08:53 -0500 Subject: gnu: spice-gtk: Fix indentation and normalize field order. * gnu/packages/spice.scm (spice-gtk): Fix indentation. Move and re-order inputs below arguments. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 120 ++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 62 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 2be724c455..139ef4867e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -141,73 +141,69 @@ which allows users to view a desktop computing environment.") (source (origin (method url-fetch) (uri (string-append - "https://spice-space.org/download/gtk/" - "spice-gtk-" version ".tar.bz2")) + "https://spice-space.org/download/gtk/" + "spice-gtk-" version ".tar.bz2")) (sha256 (base32 "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) (build-system gnu-build-system) - (propagated-inputs - (list gstreamer - gst-plugins-base - gst-plugins-good - spice-protocol - ;; These are required by the pkg-config files. - gtk+ - pixman - openssl-1.1)) - (inputs - `(("glib-networking" ,glib-networking) - ("gobject-introspection" ,gobject-introspection) - ("json-glib" ,json-glib) - ("libepoxy" ,libepoxy) - ("libjpeg" ,libjpeg-turbo) - ("libxcb" ,libxcb) - ("lz4" ,lz4) - ("mesa" ,mesa) - ("pulseaudio" ,pulseaudio) - ("python" ,python) - ("opus" ,opus) - ("usbredir" ,usbredir))) - (native-inputs - `(("glib:bin" ,glib "bin") - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) (arguments - `(#:configure-flags - '("--enable-gstaudio" - "--enable-gstvideo" - "--enable-pulse" - "--enable-vala" - "--enable-introspection") - #:phases - (modify-phases %standard-phases - (add-before 'check 'disable-session-test - (lambda _ - ;; XXX: Disable session tests, because they require USB support, - ;; which is not available in the build container. - (substitute* "tests/Makefile" - (("test-session\\$\\(EXEEXT\\) ") "")) - #t)) - (add-after 'install 'patch-la-files - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libjpeg (assoc-ref inputs "libjpeg"))) - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append out "/lib") "\\.la$") - (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg"))) - #t))) - (add-after - 'install 'wrap-spicy - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/spicy") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) - #t))))) + `(#:configure-flags '("--enable-gstaudio" + "--enable-gstvideo" + "--enable-pulse" + "--enable-vala" + "--enable-introspection") + #:phases + (modify-phases %standard-phases + (add-before 'check 'disable-session-test + (lambda _ + ;; XXX: Disable session tests, because they require USB support, + ;; which is not available in the build container. + (substitute* "tests/Makefile" + (("test-session\\$\\(EXEEXT\\) ") "")))) + (add-after 'install 'patch-la-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libjpeg (assoc-ref inputs "libjpeg"))) + ;; Add an absolute reference for libjpeg in the .la files + ;; so it does not have to be propagated. + (substitute* (find-files (string-append out "/lib") "\\.la$") + (("-ljpeg") + (string-append "-L" libjpeg "/lib -ljpeg")))))) + (add-after 'install 'wrap-spicy + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/spicy") + `("GST_PLUGIN_SYSTEM_PATH" ":" + prefix (,gst-plugin-path))))))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("glib-networking" ,glib-networking) + ("gobject-introspection" ,gobject-introspection) + ("json-glib" ,json-glib) + ("libepoxy" ,libepoxy) + ("libjpeg" ,libjpeg-turbo) + ("libxcb" ,libxcb) + ("lz4" ,lz4) + ("mesa" ,mesa) + ("pulseaudio" ,pulseaudio) + ("python" ,python) + ("opus" ,opus) + ("usbredir" ,usbredir))) + (propagated-inputs + (list gstreamer + gst-plugins-base + gst-plugins-good + spice-protocol + ;; These are required by the pkg-config files. + gtk+ + pixman + openssl-1.1)) (synopsis "Gtk client and libraries for SPICE remote desktop servers") (description "Gtk client and libraries for SPICE remote desktop servers.") (home-page "https://www.spice-space.org") -- cgit 1.4.1 From da6d173980820a6f8e119ebba17f0e61b8ec9468 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 00:13:06 -0500 Subject: gnu: spice-gtk: Remove input labels. * gnu/packages/spice.scm (spice-gtk): Remove input labels. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 139ef4867e..c513e3db13 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -178,23 +178,23 @@ which allows users to view a desktop computing environment.") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))))) (native-inputs - `(("glib:bin" ,glib "bin") - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) + (list `(,glib "bin") + intltool + pkg-config + vala)) (inputs - `(("glib-networking" ,glib-networking) - ("gobject-introspection" ,gobject-introspection) - ("json-glib" ,json-glib) - ("libepoxy" ,libepoxy) - ("libjpeg" ,libjpeg-turbo) - ("libxcb" ,libxcb) - ("lz4" ,lz4) - ("mesa" ,mesa) - ("pulseaudio" ,pulseaudio) - ("python" ,python) - ("opus" ,opus) - ("usbredir" ,usbredir))) + (list glib-networking + gobject-introspection + json-glib + libepoxy + libjpeg-turbo + libxcb + lz4 + mesa + pulseaudio + python + opus + usbredir)) (propagated-inputs (list gstreamer gst-plugins-base -- cgit 1.4.1 From d5fa1203f654616c5991cad55ed89ca47051ecb3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 00:14:12 -0500 Subject: gnu: spice-gtk: Use gexps. * gnu/packages/spice.scm (spice-gtk) [arguments]: Streamline and use gexps. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 59 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index c513e3db13..3d625a063a 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019, 2020, 2022 Marius Bakke -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,35 +148,34 @@ which allows users to view a desktop computing environment.") "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-gstaudio" - "--enable-gstvideo" - "--enable-pulse" - "--enable-vala" - "--enable-introspection") - #:phases - (modify-phases %standard-phases - (add-before 'check 'disable-session-test - (lambda _ - ;; XXX: Disable session tests, because they require USB support, - ;; which is not available in the build container. - (substitute* "tests/Makefile" - (("test-session\\$\\(EXEEXT\\) ") "")))) - (add-after 'install 'patch-la-files - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libjpeg (assoc-ref inputs "libjpeg"))) - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append out "/lib") "\\.la$") - (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg")))))) - (add-after 'install 'wrap-spicy - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/spicy") - `("GST_PLUGIN_SYSTEM_PATH" ":" - prefix (,gst-plugin-path))))))))) + (list + #:configure-flags #~(list "--enable-gstaudio" + "--enable-gstvideo" + "--enable-pulse" + "--enable-vala" + "--enable-introspection") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'disable-session-test + (lambda _ + ;; XXX: Disable session tests, because they require USB support, + ;; which is not available in the build container. + (substitute* "tests/Makefile" + (("test-session\\$\\(EXEEXT\\) ") "")))) + (add-after 'install 'patch-la-files + (lambda _ + ;; Add an absolute reference for libjpeg in the .la files + ;; so it does not have to be propagated. + (substitute* (find-files (string-append #$output "/lib") + "\\.la$") + (("-ljpeg") + (string-append "-L" #$(this-package-input "libjpeg-turbo") + "/lib -ljpeg"))))) + (add-after 'install 'wrap-spicy + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/spicy") + `("GST_PLUGIN_SYSTEM_PATH" ":" + prefix (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))) (native-inputs (list `(,glib "bin") intltool -- cgit 1.4.1 From 9f3494fa9c12bfd3df937893683f8c5402f1e7f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 09:09:06 -0500 Subject: gnu: spice-gtk: Update to 0.42. * gnu/packages/spice.scm (spice-gtk): Update to 0.42. [build-system]: Use meson-build-system. [arguments]: Remove configure-flags. Rename disable-session-test phase to disable-problematic-tests, and adjust. Remove the patch-la-files phase. [native-inputs]: Add python, python-pyparsing and python-six. [inputs]: Remove python. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 3d625a063a..f67a049176 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -41,6 +41,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages security-token) #:use-module (gnu packages tls) #:use-module (gnu packages virtualization) @@ -137,40 +139,29 @@ which allows users to view a desktop computing environment.") (define-public spice-gtk (package (name "spice-gtk") - (version "0.37") + (version "0.42") (source (origin (method url-fetch) (uri (string-append "https://spice-space.org/download/gtk/" - "spice-gtk-" version ".tar.bz2")) + "spice-gtk-" version ".tar.xz")) (sha256 (base32 - "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) - (build-system gnu-build-system) + "0n3s1rn7yzs28hnl9k6ql3a90qlv8w16djqj32m1zb8i31zi304k")))) + (build-system meson-build-system) (arguments (list - #:configure-flags #~(list "--enable-gstaudio" - "--enable-gstvideo" - "--enable-pulse" - "--enable-vala" - "--enable-introspection") #:phases #~(modify-phases %standard-phases - (add-before 'check 'disable-session-test - (lambda _ - ;; XXX: Disable session tests, because they require USB support, - ;; which is not available in the build container. - (substitute* "tests/Makefile" - (("test-session\\$\\(EXEEXT\\) ") "")))) - (add-after 'install 'patch-la-files + (add-after 'unpack 'disable-problematic-tests (lambda _ - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append #$output "/lib") - "\\.la$") - (("-ljpeg") - (string-append "-L" #$(this-package-input "libjpeg-turbo") - "/lib -ljpeg"))))) + ;; XXX: Disable the session and cd-emu tests, because they + ;; require USB support, which is not available in the build + ;; container. + (substitute* "tests/meson.build" + ((".*'session.c',.*") "") + (("tests_sources \\+= 'cd-emu.c'" all) + (string-append "# " all))))) (add-after 'install 'wrap-spicy (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/spicy") @@ -180,6 +171,9 @@ which allows users to view a desktop computing environment.") (list `(,glib "bin") intltool pkg-config + python + python-pyparsing + python-six vala)) (inputs (list glib-networking @@ -191,7 +185,6 @@ which allows users to view a desktop computing environment.") lz4 mesa pulseaudio - python opus usbredir)) (propagated-inputs -- cgit 1.4.1 From 2a607b27a21e06dd1bcad5d909479a50c0e0ee52 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:35:38 -0500 Subject: gnu: spice-gtk: Propagate libjpeg-turbo, lz4, opus, and usbredir. * gnu/packages/spice.scm (spice-gtk) [inputs]: Move libjpeg-turbo, lz4, opus, and usbredir to... [propagated-inputs]: ... here. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index f67a049176..2309287bbb 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -180,22 +180,23 @@ which allows users to view a desktop computing environment.") gobject-introspection json-glib libepoxy - libjpeg-turbo libxcb - lz4 mesa - pulseaudio - opus - usbredir)) + pulseaudio)) (propagated-inputs (list gstreamer gst-plugins-base gst-plugins-good spice-protocol - ;; These are required by the pkg-config files. + ;; These are required by the pkg-config files (needed for example + ;; when building GNOME Boxes). gtk+ + openssl-1.1 + opus + libjpeg-turbo + lz4 pixman - openssl-1.1)) + usbredir)) (synopsis "Gtk client and libraries for SPICE remote desktop servers") (description "Gtk client and libraries for SPICE remote desktop servers.") (home-page "https://www.spice-space.org") -- cgit 1.4.1 From c4678cf19b295cbaf6196ca83947c2ea7ce487b5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:39:53 -0500 Subject: gnu: spice-protocol: Update to 0.14.4. * gnu/packages/spice.scm (spice-protocol): Update to 0.14.4. [arguments]: Use gexps. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 2309287bbb..44bcd5156b 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -109,26 +109,24 @@ system to use the host GPU to accelerate 3D rendering.") (define-public spice-protocol (package (name "spice-protocol") - (version "0.14.3") + (version "0.14.4") (source (origin (method url-fetch) (uri (string-append - "https://www.spice-space.org/download/releases/" - "spice-protocol-" version ".tar.xz")) + "https://www.spice-space.org/download/releases/" + "spice-protocol-" version ".tar.xz")) (sha256 (base32 - "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr")))) + "04nr2w6ymy5jinfi3lj6205yd5h0swss3ykxqk7l3m4z1mhvmzq4")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" - ,name "-" ,version))) - (install-file "COPYING" doc) - #t)))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'install-documentation + (lambda _ + (install-file "COPYING" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) (synopsis "Protocol headers for the SPICE protocol") (description "SPICE (the Simple Protocol for Independent Computing Environments) is a remote-display system built for virtual environments -- cgit 1.4.1 From 0d07629295b5e9a0f170640b1aa741ffc3b1153c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:41:53 -0500 Subject: gnu: usbredir: Update to 0.13.0. * gnu/packages/spice.scm (usbredir): Update to 0.13.0. [inputs]: Add glib. [native-inputs]: Remove autoconf, automake, and libtool. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 44bcd5156b..fc63b7228f 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -62,19 +62,18 @@ (package (name "usbredir") (home-page "https://spice-space.org") - (version "0.9.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (string-append home-page "/download/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "19jnpzlanq0a1m5lmlcsp50wxf7icxvpvclx7hnf0zxw8azngqd3")))) - (build-system gnu-build-system) - (propagated-inputs - (list libusb)) - (native-inputs - (list autoconf automake libtool pkg-config)) + "0vn4gnd8nmnrvvj2rm7akf4sbcslmdk3v22k9kmxxrha5jhgm9jb")))) + (build-system meson-build-system) + (propagated-inputs (list libusb)) + (inputs (list glib)) + (native-inputs (list pkg-config)) (synopsis "Tools for sending USB device traffic over a network") (description "Usbredir is a network protocol for sending USB device traffic over a -- cgit 1.4.1 From 7b64e57c4c5eeb539fce45ca030c7ec708611894 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:44:30 -0500 Subject: gnu: virglrenderer: Update to 0.7.0. * gnu/packages/spice.scm (virglrenderer): Update to 0.7.0. Remove patch. Re-indent and sort inputs. * gnu/packages/patches/virglrenderer-CVE-2017-6386.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - .../patches/virglrenderer-CVE-2017-6386.patch | 54 ---------------------- gnu/packages/spice.scm | 11 ++--- 3 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/virglrenderer-CVE-2017-6386.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9ae37a9bb4..13a5011932 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1980,7 +1980,6 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ - %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ diff --git a/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch b/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch deleted file mode 100644 index bd3bf106bf..0000000000 --- a/gnu/packages/patches/virglrenderer-CVE-2017-6386.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix CVE-2017-6386 (memory leak introduced by fix for CVE-2017-5994). - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5994 - -Patch copied from upstream source repository: - -https://cgit.freedesktop.org/virglrenderer/commit/?id=737c3350850ca4dbc5633b3bdb4118176ce59920 - -From 737c3350850ca4dbc5633b3bdb4118176ce59920 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Tue, 28 Feb 2017 14:52:09 +1000 -Subject: renderer: fix memory leak in vertex elements state create - -Reported-by: Li Qiang -Free the vertex array in error path. -This was introduced by this commit: -renderer: fix heap overflow in vertex elements state create. - -I rewrote the code to not require the allocation in the first -place if we have an error, seems nicer. - -Signed-off-by: Dave Airlie - -diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c -index 1bca7ad..e5d9f5c 100644 ---- a/src/vrend_renderer.c -+++ b/src/vrend_renderer.c -@@ -1648,18 +1648,19 @@ int vrend_create_vertex_elements_state(struct vrend_context *ctx, - unsigned num_elements, - const struct pipe_vertex_element *elements) - { -- struct vrend_vertex_element_array *v = CALLOC_STRUCT(vrend_vertex_element_array); -+ struct vrend_vertex_element_array *v; - const struct util_format_description *desc; - GLenum type; - int i; - uint32_t ret_handle; - -- if (!v) -- return ENOMEM; -- - if (num_elements > PIPE_MAX_ATTRIBS) - return EINVAL; - -+ v = CALLOC_STRUCT(vrend_vertex_element_array); -+ if (!v) -+ return ENOMEM; -+ - v->count = num_elements; - for (i = 0; i < num_elements; i++) { - memcpy(&v->elements[i].base, &elements[i], sizeof(struct pipe_vertex_element)); --- -cgit v0.10.2 - diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index fc63b7228f..46bb9844f2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -84,21 +84,18 @@ different (virtual) machine than the one to which the USB device is attached.") (define-public virglrenderer (package (name "virglrenderer") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/virgl/" "virglrenderer-" version ".tar.bz2")) - (patches (search-patches "virglrenderer-CVE-2017-6386.patch")) (sha256 (base32 - "06kf0q4l52gzx5p63l8850hff8pmhp7xv1hk8zgx2apbw18y6jd5")))) + "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m")))) (build-system gnu-build-system) - (inputs - (list libepoxy mesa eudev)) - (native-inputs - (list pkg-config)) + (inputs (list eudev libepoxy mesa)) + (native-inputs (list pkg-config)) (synopsis "Virtual 3D GPU library") (description "A virtual 3D GPU library that enables a virtualized operating system to use the host GPU to accelerate 3D rendering.") -- cgit 1.4.1 From 5770a6e56b6a1395e83695f32b4267d62d0bd9dd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:51:17 -0500 Subject: gnu: libcacard: Remove obsolete configure flags. * gnu/packages/spice.scm (libcacard) [arguments]: Delete field. [propagated-inputs]: Reword comment. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 46bb9844f2..191495b5fc 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -329,17 +329,11 @@ resolution scaling on graphical console window resize.") (base32 "1rrjlclm6ad63gah1fa4yfwrz4z6vgq2yrybbvzvvdbxrgl4vgzv")))) (build-system meson-build-system) - (arguments - (list #:configure-flags - ;; XXX: For some reason NSS is not automatically added on RUNPATH - ;; with newer versions of Meson (after 0.60). - #~(list (string-append "-Dc_link_args=-Wl,-rpath=" - (search-input-directory - %build-inputs "lib/nss"))))) (propagated-inputs - (list glib ; Requires: in the pkg-config file - nss ; Requires.private: in the pkg-config - pcsc-lite)) ; file + ;; The following inputs are required in the pkg-config file. + (list glib + nss + pcsc-lite)) (native-inputs (list openssl `(,nss "bin") -- cgit 1.4.1 From 0d08e90abc7064aba13a56de63c8ecfa1f97d72c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:52:25 -0500 Subject: gnu: spice: Update to 0.15.1. * gnu/packages/spice.scm (spice): Update to 0.15.1. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 191495b5fc..9483a5966d 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -199,7 +199,7 @@ which allows users to view a desktop computing environment.") (define-public spice (package (name "spice") - (version "0.15.0") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append @@ -207,7 +207,7 @@ which allows users to view a desktop computing environment.") "spice-server/spice-" version ".tar.bz2")) (sha256 (base32 - "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k")))) + "0ym3n60gq0kzzknk5ir8ib09cxsak9hkv7mmgsyic69jmdkszadd")))) (build-system gnu-build-system) (propagated-inputs (list openssl-1.1 pixman spice-protocol)) -- cgit 1.4.1 From 3b18fbabb6b47bfdb625a291b284ded689a34c93 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 10:55:26 -0500 Subject: gnu: spice-vdagent: Update to 0.22.1. * gnu/packages/spice.scm (spice-vdagent): Update to 0.22.1. [source]: Delete patch. * gnu/packages/patches/spice-vdagent-glib-2.68.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - gnu/packages/patches/spice-vdagent-glib-2.68.patch | 112 --------------------- gnu/packages/spice.scm | 6 +- 3 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 gnu/packages/patches/spice-vdagent-glib-2.68.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 13a5011932..63ec92ebef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1863,7 +1863,6 @@ dist_patch_DATA = \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \ - %D%/packages/patches/spice-vdagent-glib-2.68.patch \ %D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \ diff --git a/gnu/packages/patches/spice-vdagent-glib-2.68.patch b/gnu/packages/patches/spice-vdagent-glib-2.68.patch deleted file mode 100644 index cd5f13a909..0000000000 --- a/gnu/packages/patches/spice-vdagent-glib-2.68.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 8348ef3c6121247e2b8be0641bbf3df3d55d9bff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 4 May 2021 13:20:47 +0400 -Subject: [PATCH] Fix g_memdup deprecation warning with glib >= 2.68 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Related to: -https://bugzilla.redhat.com/show_bug.cgi?id=1943059 - -Signed-off-by: Marc-André Lureau ---- - configure.ac | 4 ++++ - src/vdagent/vdagent.c | 4 ++-- - src/vdagent/x11-randr.c | 2 +- - src/vdagentd/vdagentd.c | 8 ++++---- - 4 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b2a99c..3de9b9b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,6 +124,10 @@ PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.22]) - PKG_CHECK_MODULES([DBUS], [dbus-1]) - PKG_CHECK_MODULES([DRM], [libdrm]) - -+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.68], [], [ -+ AC_DEFINE(g_memdup2, g_memdup, [GLib2 < 2.68 compatibility]) -+]) -+ - if test "$with_session_info" = "auto" || test "$with_session_info" = "systemd"; then - PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN], - [libsystemd >= 209], -diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c -index 0c69907..fd08522 100644 ---- a/src/vdagent/vdagent.c -+++ b/src/vdagent/vdagent.c -@@ -228,7 +228,7 @@ static void daemon_read_complete(UdscsConnection *conn, - break; - case VDAGENTD_AUDIO_VOLUME_SYNC: { - VDAgentAudioVolumeSync *avs = (VDAgentAudioVolumeSync *)data; -- uint16_t *volume = g_memdup(avs->volume, sizeof(uint16_t) * avs->nchannels); -+ uint16_t *volume = g_memdup2(avs->volume, sizeof(uint16_t) * avs->nchannels); - - if (avs->is_playback) { - vdagent_audio_playback_sync(avs->mute, avs->nchannels, volume); -@@ -414,7 +414,7 @@ int main(int argc, char *argv[]) - GOptionContext *context; - GError *error = NULL; - VDAgent *agent; -- char **orig_argv = g_memdup(argv, sizeof(char*) * (argc+1)); -+ char **orig_argv = g_memdup2(argv, sizeof(char*) * (argc+1)); - orig_argv[argc] = NULL; /* To avoid clang analyzer false-positive */ - - context = g_option_context_new(NULL); -diff --git a/src/vdagent/x11-randr.c b/src/vdagent/x11-randr.c -index 27404a1..037aded 100644 ---- a/src/vdagent/x11-randr.c -+++ b/src/vdagent/x11-randr.c -@@ -982,7 +982,7 @@ void vdagent_x11_set_monitor_config(struct vdagent_x11 *x11, - fullscreen it will keep sending the failing config. */ - g_free(x11->randr.failed_conf); - x11->randr.failed_conf = -- g_memdup(mon_config, config_size(mon_config->num_of_monitors)); -+ g_memdup2(mon_config, config_size(mon_config->num_of_monitors)); - return; - } - } -diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c -index 78378aa..3e59331 100644 ---- a/src/vdagentd/vdagentd.c -+++ b/src/vdagentd/vdagentd.c -@@ -216,7 +216,7 @@ static void do_client_monitors(VirtioPort *vport, int port_nr, - vdagentd_write_xorg_conf(new_monitors); - - g_free(mon_config); -- mon_config = g_memdup(new_monitors, size); -+ mon_config = g_memdup2(new_monitors, size); - - /* Send monitor config to currently active agent */ - if (active_session_conn) -@@ -249,7 +249,7 @@ static void do_client_capabilities(VirtioPort *vport, - { - capabilities_size = VD_AGENT_CAPS_SIZE_FROM_MSG_SIZE(message_header->size); - g_free(capabilities); -- capabilities = g_memdup(caps->caps, capabilities_size * sizeof(uint32_t)); -+ capabilities = g_memdup2(caps->caps, capabilities_size * sizeof(uint32_t)); - - if (caps->request) { - /* Report the previous client has disconnected. */ -@@ -647,7 +647,7 @@ static void virtio_port_read_complete( - case VD_AGENT_GRAPHICS_DEVICE_INFO: { - // store device info for re-sending when a session agent reconnects - g_free(device_info); -- device_info = g_memdup(data, message_header->size); -+ device_info = g_memdup2(data, message_header->size); - device_info_size = message_header->size; - forward_data_to_session_agent(VDAGENTD_GRAPHICS_DEVICE_INFO, data, message_header->size); - break; -@@ -1090,7 +1090,7 @@ static void do_agent_xorg_resolution(UdscsConnection *conn, - } - - g_free(agent_data->screen_info); -- agent_data->screen_info = g_memdup(data, header->size); -+ agent_data->screen_info = g_memdup2(data, header->size); - agent_data->width = header->arg1; - agent_data->height = header->arg2; - agent_data->screen_count = n; --- -GitLab - diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 9483a5966d..1654ae141e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -253,7 +253,7 @@ Internet and from a wide variety of machine architectures.") (define-public spice-vdagent (package (name "spice-vdagent") - (version "0.21.0") + (version "0.22.1") (source (origin (method url-fetch) (uri (string-append @@ -261,9 +261,7 @@ Internet and from a wide variety of machine architectures.") "spice-vdagent-" version ".tar.bz2")) (sha256 (base32 - "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx")) - (patches - (search-patches "spice-vdagent-glib-2.68.patch")))) + "18472sqr0gibzgzi48dpcbnvm78l05qrl5wv6xywqqj7r9dd3c4k")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 5219284621f438cbb1ef0f7c62882f6e7cd473f9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 11:10:34 -0500 Subject: gnu: usbutils: Update to 015. * gnu/packages/linux.scm (usbutils): Update to 015. Signed-off-by: Maxim Cournoyer --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 691e0d2edc..92159990ad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2297,14 +2297,14 @@ slabtop, tload, top, vmstat, w, watch and sysctl.") (define-public usbutils (package (name "usbutils") - (version "014") + (version "015") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/usb/usbutils/" "usbutils-" version ".tar.xz")) (sha256 - (base32 "0sgwfvr1b5w3ai1c0rmvzhk67y9vh7bq490rcxxj4q05svx9q1rs")))) + (base32 "0vnsdzx997v8ksi5dbsi2vc8b3mcm5b6jnmcdhszdyag3yxm3d63")))) (build-system gnu-build-system) (outputs (list "out" "python")) (arguments -- cgit 1.4.1 From 9582f49a0c9063f3668ff3d16fd4c1a5ee8071eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 11:16:31 -0500 Subject: gnu: phodav: Propagate glib, libsoup and libxml2. * gnu/packages/gnome.scm (phodav) [inputs]: Move libsoup to... [propagated-inputs]: ... here. Add glib and libxml2. Signed-off-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b290a93723..9ffbce2df3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1268,8 +1268,12 @@ Library reference documentation.") pkg-config)) (inputs (list avahi - libgudev - libsoup)) + libgudev)) + (propagated-inputs + ;; These inputs are required by the pkg-config file. + (list glib + libsoup + libxml2)) (synopsis "WebDav server implementation using libsoup") (description "PhoDav was initially developed as a file-sharing mechanism for Spice, but it is generic enough to be reused in other projects, -- cgit 1.4.1 From 27ae83f5f044a0aa80d804b576c397f9596b95c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 12:00:25 -0500 Subject: gnu: spice-gtk: Enable support for polkit, webdav and others. * gnu/packages/spice.scm (spice-gtk) [arguments]: Add the correct-polkit-dir and fake-pkexec phases. [inputs]: Add acl, cyrus-sasl, libcap-ng, polkit and usbutils. [propagated-inputs]: Add libcacard and phodav. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 1654ae141e..62d1d50e5b 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -22,6 +22,8 @@ (define-module (gnu packages spice) #:use-module (gnu packages) + #:use-module (gnu packages acl) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -39,6 +41,7 @@ #:use-module (gnu packages nss) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -156,6 +159,13 @@ which allows users to view a desktop computing environment.") ((".*'session.c',.*") "") (("tests_sources \\+= 'cd-emu.c'" all) (string-append "# " all))))) + (add-before 'configure 'correct-polkit-dir + (lambda _ + (substitute* "meson.build" + (("d.get_variable\\(pkgconfig: 'policydir')") + (string-append "'" #$output "/share/polkit-1/actions'"))))) + (add-before 'install 'fake-pkexec + (lambda _ (setenv "PKEXEC_UID" "-1"))) (add-after 'install 'wrap-spicy (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/spicy") @@ -170,13 +180,18 @@ which allows users to view a desktop computing environment.") python-six vala)) (inputs - (list glib-networking + (list cyrus-sasl + glib-networking gobject-introspection json-glib + acl + libcap-ng libepoxy libxcb mesa - pulseaudio)) + polkit + pulseaudio + usbutils)) (propagated-inputs (list gstreamer gst-plugins-base @@ -187,8 +202,10 @@ which allows users to view a desktop computing environment.") gtk+ openssl-1.1 opus + libcacard libjpeg-turbo lz4 + phodav pixman usbredir)) (synopsis "Gtk client and libraries for SPICE remote desktop servers") -- cgit 1.4.1 From 542e9060fe85464579163839e0c24705d6eeef8d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 01:25:33 +0100 Subject: gnu: osinfo-db: Use libsoup 3. * gnu/packages/virtualization.scm (libosinfo) [inputs]: Replace libsoup2 with libsoup. Signed-off-by: Maxim Cournoyer --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7aaa816308..4fc6f1868c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1192,7 +1192,7 @@ of one or more RISC-V harts.") (format #f "path = ~s;" (search-input-directory (or native-inputs inputs) "share/osinfo"))))))))) - (inputs (list libsoup-minimal-2 libxml2 libxslt osinfo-db)) + (inputs (list libsoup libxml2 libxslt osinfo-db)) (native-inputs (list `(,glib "bin") ;glib-mkenums, etc. gobject-introspection -- cgit 1.4.1 From a02189e4cad445659f2256027d8c44207af45870 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 23:23:41 +0100 Subject: gnu: gnome-boxes: Update to 43.3. * gnu/packages/gnome.scm (gnome-boxes): Update to 43.3. [arguments]: Remove configure-flags. Adjust disable-gtk-update-icon-cache phase. [inputs]: Replace gtk+ with gtk, libsoup-minimal-2 with libsoup, webkitgtk-with-libsoup2 with webkitgtk. [native-inputs]: Replace vala with vala-next. Signed-off-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ffbce2df3..b44f47f861 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12496,7 +12496,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "42.3") + (version "43.3") (source (origin (method url-fetch) @@ -12504,18 +12504,16 @@ integrate seamlessly with the GNOME desktop.") (version-major version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 "1lv0bdh935qj6wkv3ixg2pcv8yrapj79z02gw4fal3rhz3xggvsn")))) + (base32 "14zd5ii3igy0am4zqw2jg1xshf2zxsy96yv5pss2vf6rh3svmnzf")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t - #:configure-flags #~(list "-Drdp=false" - (string-append "-Dc_link_args=-Wl,-rpath=" - #$output - "/lib/gnome-boxes")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-gtk-update-icon-cache (lambda _ - (setenv "DESTDIR" "/"))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-before 'configure 'set-qemu-file-name (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/installed-media.vala" @@ -12529,11 +12527,11 @@ integrate seamlessly with the GNOME desktop.") itstool pkg-config python - vala)) + vala-next)) (inputs (list glib-networking ;for TLS support gsettings-desktop-schemas - gtk+ + gtk gtk-vnc gtksourceview json-glib @@ -12542,7 +12540,7 @@ integrate seamlessly with the GNOME desktop.") libhandy libosinfo libsecret - libsoup-minimal-2 + libsoup libusb libvirt libvirt-glib @@ -12552,7 +12550,7 @@ integrate seamlessly with the GNOME desktop.") spice-gtk tracker vte - webkitgtk-with-libsoup2)) ;for webkit2gtk-4.0 + webkitgtk)) (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and -- cgit 1.4.1 From e403096b4ab43d983fe31441ac85cd3b9097ffba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 16 Feb 2023 15:13:29 -0500 Subject: gnu: gnome-boxes: Mention extra configuration requirements. * gnu/packages/gnome.scm (gnome-boxes) [description]: Mention about extending polkit and setuid services with spice-gtk. Signed-off-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b44f47f861..620f5953d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12545,7 +12545,7 @@ integrate seamlessly with the GNOME desktop.") libvirt libvirt-glib libxml2 - qemu-minimal ;for qemu-img + qemu-minimal ;for qemu-img sparql-query spice-gtk tracker @@ -12557,7 +12557,12 @@ integrate seamlessly with the GNOME desktop.") manage remote and virtual systems. Note that this application requires the @code{libvirt} and @code{virtlog} daemons to run. Use the command @command{info '(guix) Virtualization Services'} to learn how to configure -these services on the Guix System.") +these services on the Guix System. If you do not use the +@code{gnome-desktop-service-type}, you will also want to extend the +@code{polkit-service-type} with the @code{spice-gtk} package, as well as +configure the @file{libexec/spice-client-glib-usb-acl-helper} executable of +@code{spice-gtk} as setuid, to make it possible to redirect USB devices as a +non-privileged user.") (license (list ;; For data/icons/empty-boxes.png. license:cc-by2.0 -- cgit 1.4.1 From bbc10628b62d9b057b4b77b941c0d8678af9e2a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 09:35:15 -0500 Subject: gnu: spice-gtk: Adjust the default file name of the ACL helper binary. * gnu/packages/spice.scm (spice-gtk) [arguments]: Add adjust-default-acl-helper-path phase. Signed-off-by: Maxim Cournoyer --- gnu/packages/spice.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 62d1d50e5b..8d2bed38b2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -159,6 +159,16 @@ which allows users to view a desktop computing environment.") ((".*'session.c',.*") "") (("tests_sources \\+= 'cd-emu.c'" all) (string-append "# " all))))) + (add-after 'unpack 'adjust-default-acl-helper-path + (lambda _ + ;; The USB ACL helper used to allow USB redirection as a + ;; non-privileged user needs to be setuid, as configured by the + ;; gnome-desktop-service-type. A user can still change the + ;; location by specifying the SPICE_USB_ACL_BINARY environment + ;; variable. + (substitute* "src/usb-acl-helper.c" + (("ACL_HELPER_PATH\"/spice-client-glib-usb-acl-helper\"") + "\"/run/setuid-programs/spice-client-glib-usb-acl-helper\"")))) (add-before 'configure 'correct-polkit-dir (lambda _ (substitute* "meson.build" -- cgit 1.4.1 From 1dac5b21579cacd8d4a74bea1e181e68d412e246 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 2 Feb 2023 22:01:00 +0100 Subject: gnu: virglrenderer: Update to 0.10.4. * gnu/packages/spice.scm (virglrenderer): Update to 0.10.4. [source]: Use git-fetch and update URI. [build-system] Change to meson-build-system. [inputs]: Remove eudev. [native-inputs]: Add python. [home-page]: Update URL. Co-authored-by: Maxim Cournoyer --- gnu/packages/spice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 8d2bed38b2..f492957fb2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -56,6 +56,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) @@ -87,22 +88,23 @@ different (virtual) machine than the one to which the USB device is attached.") (define-public virglrenderer (package (name "virglrenderer") - (version "0.7.0") + (version "0.10.4") (source (origin - (method url-fetch) - (uri (string-append - "https://www.freedesktop.org/software/virgl/" - "virglrenderer-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/virgl/virglrenderer") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m")))) - (build-system gnu-build-system) - (inputs (list eudev libepoxy mesa)) - (native-inputs (list pkg-config)) + "06pwavrknyhghlxyh7ckq4scjx47v9fhy08r6pn194whzvzivmqg")))) + (build-system meson-build-system) + (inputs (list libepoxy mesa)) + (native-inputs (list pkg-config python)) (synopsis "Virtual 3D GPU library") (description "A virtual 3D GPU library that enables a virtualized operating system to use the host GPU to accelerate 3D rendering.") - (home-page "https://virgil3d.github.io") + (home-page "https://gitlab.freedesktop.org/virgl/virglrenderer") (license (list license:expat license:bsd-3)))) (define-public spice-protocol -- cgit 1.4.1 From 9a2cf9ef0a9ece9aa0dcb24a31fe0c313d06988f Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sat, 25 Feb 2023 19:47:26 +0000 Subject: gnu: ethtool: Update to 6.2. * gnu/packages/networking.scm (ethtool): Update to 6.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b5e8afc728..b6cbd8e80a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1517,14 +1517,14 @@ receiving NDP messages.") (define-public ethtool (package (name "ethtool") - (version "5.15") + (version "6.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "0v8i592vwjypf111w0lfvaxdwhzybp6w600g28m9rm490c8xcvv8")))) + "1qbhwp8d4nh0cnxd3hg0kr8lm5ikbkl07gvjpzv76kad0qa03pw6")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From a7c7363a825e176ae25f5f69cacfff0880b23e80 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 25 Feb 2023 03:45:11 +0100 Subject: gnu: gparted: Update to 1.5.0. * gnu/packages/disk.scm (gparted): Update to 1.5.0. Signed-off-by: Leo Famulari --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 6fc69a8a63..894a542171 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -575,14 +575,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1gl7g1lg72s63a9xlc4kcc6ksq6r7h8k9a6456xbxzak5rwklag5")))) + (base32 "1pm8jah6lakv83zm3isx4bgmi5xdwaqkjxmiv7qky224m4kfm59w")))) (build-system glib-or-gtk-build-system) (arguments ;; Tests require access to files outside the build container, such -- cgit 1.4.1 From 420cf2bf2a1b4b592d32b4f666c2facae4cabde0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 16 Feb 2023 21:36:52 +0100 Subject: gnu: Add emacs-next-tree-sitter. * gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable. (emacs-next): Remove tree sitter support. --- gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 953aad961c..e230fdc84d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -397,6 +397,35 @@ languages.") (inherit emacs) (name "emacs-next") (version (git-version "29.0.60" revision commit)) + (source + (origin + (inherit (package-source emacs)) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/emacs.git/") + (commit commit))) + (file-name (git-file-name name version)) + ;; emacs-source-date-epoch.patch is no longer necessary + (patches (search-patches "emacs-exec-path.patch" + "emacs-fix-scheme-indent-function.patch" + "emacs-native-comp-driver-options.patch")) + (sha256 + (base32 + "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z")))) + (inputs + (modify-inputs (package-inputs emacs) + (prepend sqlite))) + (native-inputs + (modify-inputs (package-native-inputs emacs) + (prepend autoconf)))))) + +(define-public emacs-next-tree-sitter + (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778") + (revision "0")) + (package + (inherit emacs) + (name "emacs-next-tree-sitter") + (version (git-version "30.0.50" revision commit)) (source (origin (inherit (package-source emacs)) -- cgit 1.4.1 From d529be6abb80333c36621095234a109a848472e8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 16 Feb 2023 21:45:24 +0100 Subject: gnu: emacs-next: Update to 29.0.60-1.f1f571e. * gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-1.f1f571e. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e230fdc84d..51ce4e481b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -391,8 +391,8 @@ languages.") (license license:gpl3+))) (define-public emacs-next - (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778") - (revision "0")) + (let ((commit "f1f571e72ae10285762d3a941e56f7c4048272af") + (revision "1")) (package (inherit emacs) (name "emacs-next") @@ -411,7 +411,7 @@ languages.") "emacs-native-comp-driver-options.patch")) (sha256 (base32 - "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z")))) + "1rildbxq53yvc2rllg2qccgxzbbnr6qbija0lyqacsy8dlzaysch")))) (inputs (modify-inputs (package-inputs emacs) (prepend sqlite))) -- cgit 1.4.1 From 525e5be3c562cf7cbd1c6d608718c2324f9353ca Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 19 Feb 2023 09:19:46 +0100 Subject: gnu: xpadneo: Update to 0.9.5. * gnu/packages/linux.scm (xpadneo): Update to 0.9.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 92159990ad..e8dcbc3ec8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1676,7 +1676,7 @@ application by hooking GStreamer into the loopback device.") (define-public xpadneo (package (name "xpadneo") - (version "0.9.1") + (version "0.9.5") (source (origin (method git-fetch) (uri (git-reference @@ -1685,7 +1685,7 @@ application by hooking GStreamer into the loopback device.") (file-name (git-file-name name version)) (sha256 (base32 - "0xr0zx134s56h4ij6c3fh8ki0h58h61minbfxcl3sgpgxkh14ism")))) + "1pq7p9sxlw1v9rnny9070b39rpwfq6rip0z92mwlw4qzinmqqgdd")))) (build-system linux-module-build-system) (arguments (list #:tests? #f ; no `check' target -- cgit 1.4.1 From 128a55ad9fc727a630207baaf78c37eb9b8b0657 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Oct 2022 13:18:46 -0700 Subject: gnu: libssh: Update to 0.10.4. * gnu/packages/ssh.scm (libssh): Update to 0.10.4. Signed-off-by: Liliana Marie Prikler --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2618ba2dec..d4a73df335 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -132,7 +132,7 @@ file names. (define-public libssh (package (name "libssh") - (version "0.9.6") + (version "0.10.4") (source (origin (method url-fetch) (uri (string-append "https://www.libssh.org/files/" @@ -140,7 +140,7 @@ file names. "/libssh-" version ".tar.xz")) (sha256 (base32 - "16w2mc7pyv9mijjlgacbz8dgczc7ig2m6m70w1pld04vpn2zig46")))) + "0zfr9fy4vg1bmz1k836hg9wi20mmaz2sgw61s6464iv1mda2qf87")))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments -- cgit 1.4.1 From b75969a03269ec58869fbea2563d6679b6d8e8b9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:22:53 -0500 Subject: gnu: linux-libre: Update to 6.1.14. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.14. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e8dcbc3ec8..f40d1aa5c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.1-version "6.1.13") +(define-public linux-libre-6.1-version "6.1.14") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -491,7 +491,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1g9xqc8ajs0g2yq9xizlgr7k47x75rk3y99yicky01fm13rvfvv3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0rvss7g77kp1hldhwrpfc7ck50rd0cjfcxj1bshps1xhyhci7128"))) + (hash (base32 "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit 1.4.1 From fa8c1044fff5feb525235735e896026ea9ae3acf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:23:11 -0500 Subject: gnu: linux-libre 5.15: Update to 5.15.96. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.96. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f40d1aa5c5..5f88b0d420 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.95") +(define-public linux-libre-5.15-version "5.15.96") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lwmax7078w5p6li1gf66m494xijy4bwa7nm5dlx0k09cfif9q2f"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "06s4aqkk26fph8hm15m7cssjrwa5y7cqy9y2znfnf0w8sbqd2wga"))) + (hash (base32 "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 5d82eecb21b3061a99310c91364b7e9c2457ea00 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:23:29 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.170. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.170. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f88b0d420..0e9482e81e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.169") +(define-public linux-libre-5.10-version "5.10.170") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fk954nniva8a7s423fnfn2wz9j9jdhscc4pqyvwn0wlxxbjgyap"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1kxgxdbgymdhf7w416qxv948py0mq8qlhz5ag962322ynmp4yxfr"))) + (hash (base32 "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From c2f9ae0bf90a861f4f83dfa624524ca7ca450ea5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:24:03 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.233. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.233. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e9482e81e..bed3cdccc0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -529,7 +529,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.232") +(define-public linux-libre-5.4-version "5.4.233") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -539,7 +539,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "19yydaws3vfiz9qilg665q3lysf1hy9pzx0414dis01ikyd27qr2"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "14qf8ddyhcs1ga1zqj4q2si6nc48sfc67nn9nigsnbcbg5g6lrdh"))) + (hash (base32 "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 84377ee73640270e677dfb3d7acbdecc66a5c599 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:24:17 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.274. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.274. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bed3cdccc0..097687056b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -544,7 +544,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.273") +(define-public linux-libre-4.19-version "4.19.274") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -554,7 +554,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0g1yhzxm3ixfll6n630v7lddcyvf888sg114nimh0lkvzd180s99"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0wr7sprmqkdr6d44cj3rvaynyvrmyn1rax9wjqa7sk36yhvz47ij"))) + (hash (base32 "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From c08e9599ef2b3d55cf5a766729335c8c6e8bf107 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 25 Feb 2023 19:24:31 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.307. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.307. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 097687056b..f9d75f8c6b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -559,7 +559,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.306") +(define-public linux-libre-4.14-version "4.14.307") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -569,7 +569,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "17phif2kazp5wykjv7vphjzv8bcanvpv5qq4v3df5nq9gbpypfsq"))) + (hash (base32 "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From f2205096430230ad185b1ee1dc01d46599904ae8 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 31 Dec 2022 12:25:49 +0100 Subject: gnu: Switch default to GHC 9.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-9.0): Rename to just “ghc”. (ghc-9.2): Ditto. (ghc): Use ghc-9.2. --- gnu/packages/haskell.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4eb13f76d7..3955e20f88 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1235,19 +1235,12 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -;; Versions newer than ghc defined below (i.e. the compiler -;; haskell-build-system uses) should use ghc-next as their name to -;; ensure ghc (without version specification) and ghc-* packages are -;; always compatible. See https://issues.guix.gnu.org/issue/47335. - (define-public ghc-8 ghc-8.10) -(define-public ghc ghc-8) - (define-public ghc-9.0 (package (inherit ghc-8.10) - (name "ghc-next") + (name "ghc") (version "9.0.2") (source (origin (method url-fetch) @@ -1285,7 +1278,7 @@ interactive environment for the functional language Haskell.") (let ((base ghc-8.10)) (package (inherit base) - (name "ghc-next") + (name "ghc") (version "9.2.5") (source (origin (method url-fetch) @@ -1327,6 +1320,12 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory))))))) +;; Versions newer than ghc defined below (i.e. the compiler +;; haskell-build-system uses) should use ghc-next as their name to +;; ensure ghc (without version specification) and ghc-* packages are +;; always compatible. See https://issues.guix.gnu.org/issue/47335. +(define-public ghc ghc-9.2) + ;; 9.4 is the last version to support the make-based build system, ;; but it boot with 9.2, only 9.0 is supported. (define ghc-bootstrap-for-9.4 ghc-9.0) -- cgit 1.4.1 From cad6aa8082e99fe60570e3fd53a0e5876a8f243e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 4 Jan 2023 09:37:26 +0100 Subject: gnu: Add upstream-name property to Haskell packages. Script-aided bulk change. --- gnu/packages/agda.scm | 1 + gnu/packages/dhall.scm | 1 + gnu/packages/finance.scm | 2 + gnu/packages/haskell-apps.scm | 16 +- gnu/packages/haskell-check.scm | 43 ++++ gnu/packages/haskell-crypto.scm | 28 +++ gnu/packages/haskell-web.scm | 68 +++++ gnu/packages/haskell-xyz.scm | 546 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/purescript.scm | 2 + gnu/packages/wm.scm | 3 + 10 files changed, 709 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 0cc3151e3f..b54ba11721 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -47,6 +47,7 @@ (sha256 (base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5")))) (build-system haskell-build-system) + (properties '((upstream-name . "Agda"))) (inputs (list ghc-aeson ghc-alex diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index b406d89eb5..ce933da9a8 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -39,6 +39,7 @@ (sha256 (base32 "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab")))) (build-system haskell-build-system) + (properties '((upstream-name . "dhall"))) (inputs (list ghc-aeson ghc-aeson-pretty diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5b534f9429..7f681b5b55 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -237,6 +237,7 @@ line client and a client based on Qt.") (lambda _ (install-file "hledger.info" (string-append #$output "/share/info")) (install-file "hledger.1" (string-append #$output "/man/man1"))))))) + (properties '((upstream-name . "hledger"))) (inputs (list ghc-ansi-terminal ghc-base-compat-batteries @@ -1981,6 +1982,7 @@ generate a variety of reports from them, and provides a web interface.") (base32 "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2")))) (build-system haskell-build-system) + (properties '((upstream-name . "hledger-web"))) (arguments `(#:tests? #f ; TODO: fail. #:cabal-revision diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 8f9ca50c00..4e6a1d00cb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -72,6 +72,7 @@ (base32 "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w")))) (build-system haskell-build-system) + (properties '((upstream-name . "apply-refact"))) (inputs (list ghc-refact ghc-exactprint @@ -109,6 +110,7 @@ library. It is primarily used with HLint's @code{--refactor} flag.") (sha256 (base32 "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0")))) (build-system haskell-build-system) + (properties '((upstream-name . "cabal-install"))) (arguments `(#:phases (modify-phases %standard-phases @@ -155,6 +157,7 @@ installation of Haskell libraries and programs.") (base32 "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz")))) (build-system haskell-build-system) + (properties '((upstream-name . "cpphs"))) (inputs (list ghc-polyparse ghc-old-locale ghc-old-time)) (home-page "https://projects.haskell.org/cpphs/") @@ -192,6 +195,7 @@ unlit literate code files; and an option to turn off macro-expansion.") (("__TIME__") "\"00:00:00\"")) #t)))) (build-system haskell-build-system) + (properties '((upstream-name . "darcs"))) (arguments `(#:tests? #f ; TODO: Needs QuickCheck ==2.13.*, and more… #:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" @@ -288,6 +292,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (sha256 (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghcid"))) (inputs (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify ghc-terminal-size)) @@ -316,6 +321,7 @@ to @code{cabal repl}).") (sha256 (base32 "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm")))) (build-system haskell-build-system) + (properties '((upstream-name . "git-annex"))) (arguments `(#:configure-flags '("--flags=-Android -Webapp") @@ -524,6 +530,7 @@ used to keep a folder in sync between computers.") (base32 "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g")))) (build-system haskell-build-system) + (properties '((upstream-name . "hlint"))) (inputs (list ghc-unordered-containers ghc-yaml @@ -563,6 +570,7 @@ unwanted suggestions, and to add your own custom suggestions.") (base32 "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7")))) (build-system haskell-build-system) + (properties '((upstream-name . "hoogle"))) (inputs (list ghc-quickcheck ghc-aeson @@ -615,6 +623,7 @@ or by approximate type signature.") (base32 "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) (build-system haskell-build-system) + (properties '((upstream-name . "hscolour"))) (home-page "https://hackage.haskell.org/package/hscolour") (synopsis "Script to colourise Haskell code") (description "HSColour is a small Haskell script to colourise Haskell @@ -698,6 +707,7 @@ Wayland, and Linux console environments alike.") (sha256 (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) (build-system haskell-build-system) + (properties '((upstream-name . "nixfmt"))) (inputs (list ghc-megaparsec ghc-parser-combinators ghc-cmdargs ghc-safe-exceptions)) @@ -765,6 +775,7 @@ Haskell.") (base32 "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c")))) (build-system haskell-build-system) + (properties '((upstream-name . "Raincat"))) (arguments `(#:phases (modify-phases %standard-phases @@ -808,6 +819,7 @@ is programmed in Haskell.") (base32 "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj")))) (build-system haskell-build-system) + (properties '((upstream-name . "scroll"))) (arguments '(#:phases (modify-phases %standard-phases @@ -884,7 +896,7 @@ that cause a shell to behave strangely and counter-intuitively. advanced user's otherwise working script to fail under future circumstances. @end enumerate") ;; CVE-2021-28794 is for a completely different, unofficial add-on. - (properties `((lint-hidden-cve . ("CVE-2021-28794")))) + (properties `((lint-hidden-cve . ("CVE-2021-28794")) (upstream-name . "ShellCheck"))) (license license:gpl3+))) (define-public shelltestrunner @@ -899,6 +911,7 @@ advanced user's otherwise working script to fail under future circumstances. (base32 "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b")))) (build-system haskell-build-system) + (properties '((upstream-name . "shelltestrunner"))) (arguments '(#:phases (modify-phases %standard-phases @@ -954,6 +967,7 @@ output, stderr, and exit status.") (base32 "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf")))) (build-system haskell-build-system) + (properties '((upstream-name . "stylish-haskell"))) (inputs (list ghc-aeson ghc-file-embed diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index e0443c1c29..0c5776047a 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -56,6 +56,7 @@ (base32 "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-ant-xml"))) (inputs (list ghc-generic-deriving ghc-xml ghc-tagged ghc-tasty)) (home-page @@ -83,6 +84,7 @@ framework.") (base32 "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-smallcheck"))) (inputs (list ghc-tasty ghc-smallcheck ghc-async ghc-tagged)) (home-page "https://documentup.com/feuerbach/tasty") @@ -105,6 +107,7 @@ Haskell test framework.") (base32 "0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-quickcheck"))) (inputs (list ghc-quickcheck ghc-tagged @@ -134,6 +137,7 @@ Haskell test framework.") (base32 "1nskavqgfxx1cw7q6c0cmizlwj54rnlv93yhgssaa77gv1nbvwpn")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-golden"))) (inputs (list ghc-async ghc-optparse-applicative @@ -167,6 +171,7 @@ contains the correct result for the test.") (base32 "0574hbqzxzyv6vsk5kzbf04kz58y0iy8x9ydcj4b8fpncgmgy63g")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty"))) (inputs (list ghc-tagged ghc-regex-tdfa @@ -196,6 +201,7 @@ and any other types of tests into a single test suite.") (base32 "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-hedgehog"))) (inputs (list ghc-tagged ghc-tasty ghc-hedgehog)) (native-inputs @@ -223,6 +229,7 @@ framework}.") (base32 "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-hspec"))) (inputs (list ghc-hspec ghc-hspec-core @@ -257,6 +264,7 @@ framework}.") (base32 "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-hunit"))) (inputs (list ghc-call-stack-boot ghc-tasty)) (home-page "http://documentup.com/feuerbach/tasty") @@ -277,6 +285,7 @@ test framework.") (base32 "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-kat"))) (inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) (home-page "https://github.com/vincenthz/tasty-kat") @@ -299,6 +308,7 @@ tasty.") (base32 "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-lua"))) (inputs (list ghc-file-embed ghc-hslua ghc-tasty)) (native-inputs @@ -323,6 +333,7 @@ from Lua.") (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-th"))) (inputs (list ghc-haskell-src-exts ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/bennofs/tasty-th") @@ -347,6 +358,7 @@ test-framework.") (base32 "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-rerun"))) (inputs (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged ghc-tasty)) @@ -372,6 +384,7 @@ been added since previous test run.") (base32 "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-expected-failure"))) (arguments `(#:tests? #f)) ; TODO: Loops. ; (native-inputs ; `(("ghc-tasty-hunit" ,ghc-tasty-hunit) @@ -404,6 +417,7 @@ development.") (base32 "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-instances"))) (arguments `(#:cabal-revision ("2" "1lsa3pbg4ljlk29fhm3mdklnx3hwffyga1nr5krbpcyc3ywq8fq8"))) @@ -444,6 +458,7 @@ provided by the Haskell Platform.") (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-unicode"))) (inputs (list ghc-quickcheck)) (home-page "https://github.com/bos/quickcheck-unicode") @@ -467,6 +482,7 @@ testing Unicode-related software.") (base32 "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-io"))) (inputs (list ghc-quickcheck ghc-hunit)) (home-page @@ -491,6 +507,7 @@ use HUnit assertions as QuickCheck properties.") (base32 "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq")))) (build-system haskell-build-system) + (properties '((upstream-name . "QuickCheck"))) (inputs (list ghc-random ghc-splitmix-bootstrap)) (home-page "https://github.com/nick8325/quickcheck") @@ -516,6 +533,7 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") (sha256 (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-assertions"))) (native-inputs (list ghc-hspec)) (inputs @@ -541,6 +559,7 @@ HUnit.") (base32 "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm")))) (build-system haskell-build-system) + (properties '((upstream-name . "test-framework"))) (arguments `(#:tests? #f ; FIXME: Tests do not build. #:cabal-revision @@ -581,6 +600,7 @@ reporting and test statistics output.") (base32 "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) (build-system haskell-build-system) + (properties '((upstream-name . "test-framework-hunit"))) (arguments `(#:cabal-revision ("3" "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z"))) @@ -606,6 +626,7 @@ reporting and test statistics output.") (base32 "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9")))) (build-system haskell-build-system) + (properties '((upstream-name . "test-framework-quickcheck2"))) (arguments `(#:cabal-revision ("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh"))) @@ -632,6 +653,7 @@ package.") (sha256 (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0")))) (build-system haskell-build-system) + (properties '((upstream-name . "test-framework-smallcheck"))) (inputs (list ghc-smallcheck ghc-test-framework)) (home-page "https://github.com/Bodigrim/smallcheck") @@ -655,6 +677,7 @@ test-framework. New projects should use ghc-tasty-smallcheck instead.") (base32 "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b")))) (build-system haskell-build-system) + (properties '((upstream-name . "test-framework-th"))) (inputs (list ghc-test-framework ghc-language-haskell-extract ghc-haskell-src-exts ghc-regex-posix)) @@ -687,6 +710,7 @@ using Template Haskell") (base32 "1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh")))) (build-system haskell-build-system) + (properties '((upstream-name . "HUnit"))) (inputs ;; We cannot use ghc-call-stack there, because it depends on ;; ghc-nanospec, which depends on ghc-hunit. @@ -712,6 +736,7 @@ JUnit tool for Java.") (base32 "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-discover"))) (native-inputs (list ghc-quickcheck ghc-hspec-meta)) (home-page "https://hspec.github.io/") @@ -733,6 +758,7 @@ runs Hspec tests.") (base32 "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-core"))) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs (list ghc-setenv @@ -763,6 +789,7 @@ be used to extend Hspec's functionality.") (base32 "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-meta"))) (inputs (list ghc-quickcheck ghc-hunit @@ -791,6 +818,7 @@ used to test the in-development version of Hspec.") (base32 "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec"))) (outputs '("out" "static" "doc")) (inputs (list ghc-hspec-core @@ -819,6 +847,7 @@ Haskell, inspired by the Ruby library RSpec.") (base32 "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-contrib"))) (inputs (list ghc-hspec-core ghc-hunit ghc-hspec ghc-quickcheck)) (native-inputs @@ -843,6 +872,7 @@ Haskell, inspired by the Ruby library RSpec.") (base32 "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-expectations"))) ;; Tests depend on ghc-nanospec. (arguments '(#:tests? #f)) (inputs (list ghc-hunit)) @@ -866,6 +896,7 @@ Haskell, inspired by the Ruby library RSpec.") (base32 "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g")))) (build-system haskell-build-system) + (properties '((upstream-name . "nanospec"))) (inputs (list ghc-hspec ghc-silently)) (home-page "https://github.com/hspec/nanospec#readme") @@ -889,6 +920,7 @@ minimal dependencies.") (base32 "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz")))) (build-system haskell-build-system) + (properties '((upstream-name . "crypto-cipher-tests"))) (inputs (list ghc-quickcheck ghc-hunit ghc-test-framework @@ -919,6 +951,7 @@ implementations of cryptographic ciphers.") (base32 "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6")))) (build-system haskell-build-system) + (properties '((upstream-name . "hedgehog"))) (inputs (list ghc-ansi-terminal ghc-async @@ -959,6 +992,7 @@ To get started quickly, see the examples: (base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) (build-system haskell-build-system) + (properties '((upstream-name . "cabal-doctest"))) (arguments `(#:cabal-revision ("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"))) @@ -984,6 +1018,7 @@ configuration. This library provides the common bits for writing custom (base32 "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5")))) (build-system haskell-build-system) + (properties '((upstream-name . "testing-type-modifiers"))) (home-page "https://hackage.haskell.org/package/testing-type-modifiers") (synopsis "Data type modifiers for property based testing") (description "Property based testing libraries such as QuickCheck tend to @@ -1006,6 +1041,7 @@ testing frameworks.") (base32 "1v2qzzpf1s008g7q6q67glf7vbm1pkpq4rc3ii74f4g6vhfx610r")))) (build-system haskell-build-system) + (properties '((upstream-name . "testing-feat"))) (inputs (list ghc-quickcheck ghc-size-based ghc-testing-type-modifiers ghc-semigroups)) @@ -1032,6 +1068,7 @@ random testing, and hybrids of the two.") (base32 "0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig")))) (build-system haskell-build-system) + (properties '((upstream-name . "inspection-testing"))) (home-page "https://github.com/nomeata/inspection-testing") (synopsis "GHC plugin to do inspection testing") @@ -1072,6 +1109,7 @@ examples and more information.") (sha256 (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-classes"))) (inputs (list ghc-quickcheck ghc-primitive @@ -1116,6 +1154,7 @@ constraints more cleanly.") (sha256 (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch")))) (build-system haskell-build-system) + (properties '((upstream-name . "quickcheck-classes-base"))) (inputs (list ghc-quickcheck ghc-contravariant @@ -1157,6 +1196,7 @@ these constraints more cleanly.") (sha256 (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2")))) (build-system haskell-build-system) + (properties '((upstream-name . "doctest-lib"))) (home-page "https://hub.darcs.net/thielema/doctest-lib/") (synopsis "Parts of doctest exposed as library") (description @@ -1177,6 +1217,7 @@ these constraints more cleanly.") (sha256 (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x")))) (build-system haskell-build-system) + (properties '((upstream-name . "doctest-exitcode-stdio"))) (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups)) (home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/") @@ -1200,6 +1241,7 @@ environment.") (sha256 (base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) (build-system haskell-build-system) + (properties '((upstream-name . "cabal-doctest"))) (arguments `(#:cabal-revision ("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"))) @@ -1223,6 +1265,7 @@ environment.") (sha256 (base32 "0nvh2k8iqqkanmp7lpwd3asimyarzisly8wavbdahcxryn0j4xb7")))) (build-system haskell-build-system) + (properties '((upstream-name . "tasty-silver"))) (inputs (list ghc-ansi-terminal ghc-async diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 6ddb459138..fb907dce00 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -47,6 +47,7 @@ (base32 "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq")))) (build-system haskell-build-system) + (properties '((upstream-name . "asn1-types"))) (inputs (list ghc-memory ghc-hourglass)) (home-page "https://github.com/vincenthz/hs-asn1-types") @@ -69,6 +70,7 @@ format.") (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r")))) (build-system haskell-build-system) + (properties '((upstream-name . "asn1-encoding"))) (inputs (list ghc-hourglass ghc-asn1-types)) (native-inputs @@ -93,6 +95,7 @@ supports for high level forms of ASN1 (BER, and DER).") (base32 "17pk8y3nwv9b9i5j15qlmwi7fmq9ab2z4kfpjk2rvcrh9lsf27wg")))) (build-system haskell-build-system) + (properties '((upstream-name . "asn1-parse"))) (inputs (list ghc-asn1-types ghc-asn1-encoding)) (home-page "https://github.com/vincenthz/hs-asn1") @@ -116,6 +119,7 @@ when ASN1 pattern matching is not convenient.") (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9")))) (build-system haskell-build-system) + (properties '((upstream-name . "crypto-api"))) (inputs (list ghc-cereal ghc-tagged ghc-entropy)) (home-page "https://github.com/TomMD/crypto-api") (synopsis "Provides generic interface for cryptographic operations @@ -145,6 +149,7 @@ algorithm (ex: padding) is within scope of this package.") (base32 "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl")))) (build-system haskell-build-system) + (properties '((upstream-name . "crypto-api-tests"))) (outputs '("out" "static" "doc")) (inputs (list ghc-test-framework-quickcheck2 ghc-crypto-api @@ -174,6 +179,7 @@ for common cryptographic algorithms are included.") (base32 "1yr2iyb779znj79j3fq4ky8l1y8a600a2x1fx9p5pmpwq5zq93y2")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptohash"))) (inputs (list ghc-byteable ghc-cryptonite @@ -206,6 +212,7 @@ that hides the C implementation.") (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptohash-md5"))) (native-inputs (list ghc-base16-bytestring ghc-puremd5 ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) (home-page "https://github.com/hvr/cryptohash-md5") @@ -227,6 +234,7 @@ that hides the C implementation.") (base32 "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptohash-sha1"))) (arguments `(#:cabal-revision ("6" "10rpxrmqgwihmplczglwxf5q3l13z9j3kvi065z884y4dymmnkgc") @@ -258,6 +266,7 @@ the C implementation.") (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptohash-sha256"))) (arguments `(#:cabal-revision ("1" "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs") @@ -289,6 +298,7 @@ the C implementation.") (base32 "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptonite"))) ;; FIXME: tests are broken. ;; See https://github.com/haskell-crypto/cryptonite/issues/260 (arguments '(#:tests? #f)) @@ -321,6 +331,7 @@ generators, and more.") (base32 "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm")))) (build-system haskell-build-system) + (properties '((upstream-name . "digest"))) (arguments `(#:extra-directories ("zlib"))) (inputs @@ -348,6 +359,7 @@ are implemented as FFI bindings to efficient code from zlib.") (sha256 (base32 "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd")))) (build-system haskell-build-system) + (properties '((upstream-name . "entropy"))) (home-page "https://github.com/TomMD/entropy") (synopsis "Provides platform independent entropy source for Haskell") (description "This Haskell package provides a platform independent method @@ -366,6 +378,7 @@ to obtain cryptographically strong entropy.") (base32 "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p")))) (build-system haskell-build-system) + (properties '((upstream-name . "pem"))) (inputs (list ghc-basement ghc-memory)) (native-inputs @@ -392,6 +405,7 @@ Mail} (PEM) format.") (base32 "0qwkvxwi9wh6knn69rg2hvc8ngmv1if77kmpcnp0xqr0l30fwavq")))) (build-system haskell-build-system) + (properties '((upstream-name . "pureMD5"))) (inputs (list ghc-cereal ghc-crypto-api ghc-tagged)) (native-inputs (list ghc-crypto-api-tests ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2 @@ -415,6 +429,7 @@ interface.") (base32 "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb")))) (build-system haskell-build-system) + (properties '((upstream-name . "SHA"))) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) @@ -441,6 +456,7 @@ libraries, like OpenSSL.") (base32 "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i")))) (build-system haskell-build-system) + (properties '((upstream-name . "x509"))) (inputs (list ghc-memory ghc-hourglass @@ -470,6 +486,7 @@ libraries, like OpenSSL.") (base32 "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp")))) (build-system haskell-build-system) + (properties '((upstream-name . "x509-store"))) (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-cryptonite ghc-x509)) @@ -495,6 +512,7 @@ collections, certificates, revocation lists, and exception lists.") (base32 "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr")))) (build-system haskell-build-system) + (properties '((upstream-name . "x509-validation"))) (inputs (list ghc-memory ghc-byteable @@ -528,6 +546,7 @@ list validation.") (base32 "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20")))) (build-system haskell-build-system) + (properties '((upstream-name . "x509-system"))) (inputs (list ghc-pem ghc-x509 ghc-x509-store)) (home-page "https://github.com/vincenthz/hs-certificate") @@ -551,6 +570,7 @@ for X.509 certificates.") (base32 "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0")))) (build-system haskell-build-system) + (properties '((upstream-name . "crypto-cipher-types"))) (inputs (list ghc-byteable ghc-securemem)) (home-page "https://github.com/vincenthz/hs-crypto-cipher") (synopsis "Generic cryptography cipher types for Haskell") @@ -572,6 +592,7 @@ for symmetric ciphers.") (base32 "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk")))) (build-system haskell-build-system) + (properties '((upstream-name . "cipher-aes"))) (inputs (list ghc-byteable ghc-securemem ghc-crypto-cipher-types)) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2 @@ -609,6 +630,7 @@ AES-NI available, or you'll need to use a different implementation.") (base32 "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp")))) (build-system haskell-build-system) + (properties '((upstream-name . "crypto-random"))) (inputs (list ghc-securemem ghc-vector)) (home-page "https://github.com/vincenthz/hs-crypto-random") (synopsis "Simple cryptographic random related types for Haskell") @@ -630,6 +652,7 @@ abstraction for CPRNGs.") (base32 "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4")))) (build-system haskell-build-system) + (properties '((upstream-name . "cprng-aes"))) (inputs (list ghc-byteable ghc-crypto-random ghc-cipher-aes)) (home-page "https://github.com/vincenthz/hs-cprng-aes") (synopsis "Crypto Pseudo Random Number Generator using AES in counter mode @@ -674,6 +697,7 @@ percent. (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq")))) (build-system haskell-build-system) + (properties '((upstream-name . "ed25519"))) (arguments `(#:cabal-revision ("3" "1yidh86ymzwmp2b449pwim6vvfcs1qgkkncbixw1zmb7wj6v167v") @@ -702,6 +726,7 @@ guidelines.") (base32 "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a")))) (build-system haskell-build-system) + (properties '((upstream-name . "tls"))) (inputs (list ghc-cereal ghc-data-default-class @@ -743,6 +768,7 @@ extensions.") (base32 "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5")))) (build-system haskell-build-system) + (properties '((upstream-name . "HsOpenSSL"))) (arguments `(#:extra-directories ("openssl"))) (inputs @@ -773,6 +799,7 @@ implementation of SSL.") (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm")))) (build-system haskell-build-system) + (properties '((upstream-name . "openssl-streams"))) (inputs (list ghc-hsopenssl ghc-io-streams ghc-network)) (native-inputs @@ -797,6 +824,7 @@ networking using OpenSSL (by way of HsOpenSSL).") (base32 "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh")))) (build-system haskell-build-system) + (properties '((upstream-name . "cryptonite-conduit"))) (inputs (list ghc-conduit ghc-conduit-extra diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a83cffd1ee..9d98fed34d 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -55,6 +55,7 @@ (base32 "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms")))) (build-system haskell-build-system) + (properties '((upstream-name . "tagsoup"))) (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/ndmitchell/tagsoup") @@ -84,6 +85,7 @@ for screen-scraping.") (base32 "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh")))) (build-system haskell-build-system) + (properties '((upstream-name . "cookie"))) (inputs (list ghc-old-locale ghc-blaze-builder @@ -110,6 +112,7 @@ for screen-scraping.") (base32 "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh")))) (build-system haskell-build-system) + (properties '((upstream-name . "curl"))) (inputs (list curl)) (home-page "https://hackage.haskell.org/package/curl") @@ -132,6 +135,7 @@ This package provides a Haskell binding to libcurl.") (base32 "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr")))) (build-system haskell-build-system) + (properties '((upstream-name . "httpd-shed"))) (inputs (list ghc-network-bsd ghc-network-uri ghc-network)) (home-page "https://hackage.haskell.org/package/httpd-shed") @@ -155,6 +159,7 @@ requests, and the library is intended for implementing Ajax APIs.") (base32 "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-types"))) (native-inputs (list ghc-doctest ghc-hspec ghc-quickcheck ghc-quickcheck-instances hspec-discover)) @@ -180,6 +185,7 @@ both client and server code).") (base32 "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn")))) (build-system haskell-build-system) + (properties '((upstream-name . "HTTP"))) (native-inputs (list ghc-httpd-shed ghc-hunit ghc-test-framework ghc-test-framework-hunit)) @@ -232,6 +238,7 @@ responses coming back.") (base32 "12j7vkpkm2djws6ny7vm2324c7916d0iaf1mbvf4mfjxzy2w7imv")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-client"))) ;; Tests require access to the web. (arguments `(#:tests? #f)) (inputs @@ -274,6 +281,7 @@ for more user-friendly packages.") (base32 "03f8p9gxdzl6slyw1r6vpv2dqhsyjvbaawbjv75kaq0vlj3gz7xi")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-client-tls"))) ;; Tests require Internet access (arguments `(#:tests? #f)) (inputs @@ -304,6 +312,7 @@ libraries, such as http-conduit.") (sha256 (base32 "1vfm9qc3zr0rmq2ddgyg13i67020cdk8xqhyzfc2zcn1km2p6r85")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-client-restricted"))) (inputs (list ghc-http-client ghc-http-client-tls @@ -335,6 +344,7 @@ servers on localhost or only allow connections to a specific server.") (base32 "1lzlrj2flcnz3k5kfhf11nk5n8m6kcya0lkwrsnzxgfr3an27y9j")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-date"))) (inputs (list ghc-attoparsec)) (native-inputs @@ -359,6 +369,7 @@ Date in Haskell.") (base32 "13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1")))) (build-system haskell-build-system) + (properties '((upstream-name . "http2"))) (inputs (list ghc-aeson ghc-aeson-pretty @@ -402,6 +413,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (base32 "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-conduit"))) ;; FIXME: `httpLbs TLS` in test-suite `test` fails with ;; ConnectionFailure getProtocolByName: does not exist (no such protocol ;; name: tcp) @@ -461,6 +473,7 @@ which allow you to avoid direct usage of conduits.") (base32 "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-reverse-proxy"))) (inputs (list ghc-case-insensitive ghc-http-types @@ -502,6 +515,7 @@ approach performs full request/response parsing via WAI and http-conduit.") (base32 "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai"))) (inputs (list ghc-bytestring-builder ghc-unix-compat @@ -533,6 +547,7 @@ communication between web applications and web servers.") (base32 "0hbm7if28p6qa36cgpyq6i569275si53z9gsl2g1z8x09z3xiyz2")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-logger"))) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. (inputs @@ -566,6 +581,7 @@ communication between web applications and web servers.") (base32 "1avf7bjcsbs8l6klp5kkd0cd2dc5n0j0a2yf8813pnwfn5b7qyd4")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-extra"))) (inputs (list ghc-ansi-terminal ghc-base64-bytestring @@ -607,6 +623,7 @@ functionality.") (base32 "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-conduit"))) (inputs (list ghc-conduit ghc-http-types ghc-wai ghc-blaze-builder)) (home-page "https://github.com/yesodweb/wai") @@ -630,6 +647,7 @@ Haskell's Web Application Interface (WAI).") (base32 "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql")))) (build-system haskell-build-system) + (properties '((upstream-name . "bsb-http-chunked"))) (arguments `(;; XXX: As of 0.0.4, one property test ("Identical output as Blaze") ;; fails on i686-linux. @@ -666,6 +684,7 @@ transfers.") (sha256 (base32 "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0")))) (build-system haskell-build-system) + (properties '((upstream-name . "warp"))) (inputs (list ghc-async ghc-auto-update @@ -717,6 +736,7 @@ based WAI (Web Application Interface in Haskell).") (base32 "134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s")))) (build-system haskell-build-system) + (properties '((upstream-name . "tls-session-manager"))) (inputs (list ghc-auto-update ghc-clock ghc-psqueues ghc-tls)) (home-page "https://hackage.haskell.org/package/tls-session-manager") @@ -739,6 +759,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (base32 "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m")))) (build-system haskell-build-system) + (properties '((upstream-name . "warp-tls"))) (inputs (list ghc-cryptonite ghc-data-default-class @@ -770,6 +791,7 @@ a WAI handler, via the native Haskell TLS implementation.") (base32 "1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44")))) (build-system haskell-build-system) + (properties '((upstream-name . "websockets"))) (inputs (list ghc-attoparsec ghc-base64-bytestring @@ -820,6 +842,7 @@ See also: (base32 "0b2xmdsrsqpssyib53wbr6r8hf75789ndyyanv37sv99iyqcwz4i")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-websockets"))) (inputs (list ghc-wai ghc-case-insensitive ghc-network ghc-websockets ghc-http-types)) @@ -846,6 +869,7 @@ See also: (base32 "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) (build-system haskell-build-system) + (properties '((upstream-name . "xss-sanitize"))) (inputs (list ghc-tagsoup ghc-utf8-string ghc-css-text ghc-network-uri)) (native-inputs @@ -872,6 +896,7 @@ attacks.") (base32 "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) (build-system haskell-build-system) + (properties '((upstream-name . "css-text"))) (inputs (list ghc-attoparsec ghc-hspec ghc-quickcheck)) (home-page "https://www.yesodweb.com/") @@ -893,6 +918,7 @@ Haskell.") (base32 "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha")))) (build-system haskell-build-system) + (properties '((upstream-name . "mime-types"))) (home-page "https://github.com/yesodweb/wai") (synopsis "Basic MIME type handling types and functions") (description @@ -914,6 +940,7 @@ Haskell.") (base32 "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c")))) (build-system haskell-build-system) + (properties '((upstream-name . "html"))) (home-page "https://hackage.haskell.org/package/html") (synopsis "HTML combinator library") @@ -936,6 +963,7 @@ documents.") (base32 "09bwrdam3y47kqllgg6w098ghqb8jb10dp4wxirsvx5ddpx9zpi6")))) (build-system haskell-build-system) + (properties '((upstream-name . "html-conduit"))) (inputs (list ghc-resourcet ghc-conduit @@ -970,6 +998,7 @@ entity decoding bugfixes applied.") (base32 "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30")))) (build-system haskell-build-system) + (properties '((upstream-name . "blaze-html"))) (arguments `(#:tests? #f ; TODO: Depends on quickcheck<2.14 #:cabal-revision @@ -999,6 +1028,7 @@ entity decoding bugfixes applied.") (base32 "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson"))) (arguments `(#:tests? #f ; FIXME: testing libraries are missing. #:cabal-revision @@ -1054,6 +1084,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (base32 "021az9az6xik9c9s3rnar5fr1lgy2h3igibf5ixnc7ps3m2lzg2x")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson-pretty"))) (inputs (list ghc-aeson ghc-base-compat @@ -1086,6 +1117,7 @@ essentially the opposite of pretty-printing.") (base32 "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson-qq"))) (inputs (list ghc-base-compat ghc-attoparsec @@ -1118,6 +1150,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (base32 "09vkyrhwak3bmpfsqcd2az8hfqqkxyhg468hv5avgisy0nzh3w38")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson-better-errors"))) (inputs (list ghc-aeson ghc-unordered-containers @@ -1151,6 +1184,7 @@ good error messages when parsing fails. See also (base32 "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn")))) (build-system haskell-build-system) + (properties '((upstream-name . "multipart"))) (inputs (list ghc-stringsearch)) (home-page @@ -1175,6 +1209,7 @@ good error messages when parsing fails. See also (base32 "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767")))) (build-system haskell-build-system) + (properties '((upstream-name . "uri-encode"))) (inputs (list ghc-utf8-string ghc-network-uri)) (home-page "https://hackage.haskell.org/package/uri-encode") @@ -1196,6 +1231,7 @@ good error messages when parsing fails. See also (base32 "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8")))) (build-system haskell-build-system) + (properties '((upstream-name . "path-pieces"))) (native-inputs (list ghc-hunit ghc-hspec ghc-quickcheck)) (home-page "https://github.com/yesodweb/path-pieces") (synopsis "Used in Yesod to automatically marshall data in the request path") @@ -1217,6 +1253,7 @@ Haskell data types to and from route pieces.") (base32 "1jdqdk0rz2wnvw735clnj8jh0a9rkrbqjg7vk3w6wczdql6cm0pq")))) (build-system haskell-build-system) + (properties '((upstream-name . "skein"))) (inputs (list ghc-cereal ghc-tagged ghc-crypto-api)) (native-inputs (list ghc-hspec)) (home-page "https://github.com/yesodweb/path-pieces") @@ -1243,6 +1280,7 @@ This Haskell package uses bindings to the optimized C implementation of Skein.") (base32 "0s6h4ykj16mpf7nlw2iqn2ji0p8g1fn5ni0s7yqaili6vv2as5ar")))) (build-system haskell-build-system) + (properties '((upstream-name . "clientsession"))) (inputs (list ghc-cereal ghc-tagged ghc-crypto-api @@ -1276,6 +1314,7 @@ avoid any issues with characters.") (base32 "0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod-core"))) (inputs (list ghc-wai ghc-extra ghc-shakespeare @@ -1345,6 +1384,7 @@ functions, widgets, etc.") (base32 "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod-persistent"))) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs (list ghc-yesod-core ghc-persistent @@ -1376,6 +1416,7 @@ from Yesod.") (base32 "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod-form"))) (inputs (list ghc-yesod-core ghc-yesod-persistent @@ -1417,6 +1458,7 @@ providing richtext field using Nic editor.") (base32 "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod"))) (inputs (list ghc-yesod-core ghc-yesod-persistent @@ -1456,6 +1498,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.") (base32 "0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8")))) (build-system haskell-build-system) + (properties '((upstream-name . "hxt-charproperties"))) (home-page "https://github.com/UweSchmidt/hxt") (synopsis "Character properties and classes for XML and Unicode") (description @@ -1479,6 +1522,7 @@ supported Unicode version is 7.0.0") (base32 "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v")))) (build-system haskell-build-system) + (properties '((upstream-name . "hxt-unicode"))) (inputs (list ghc-hxt-charproperties)) (home-page @@ -1506,6 +1550,7 @@ ignored.") (base32 "0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr")))) (build-system haskell-build-system) + (properties '((upstream-name . "hxt-regex-xmlschema"))) (inputs (list ghc-hxt-charproperties ghc-hunit)) (home-page "https://wiki.haskell.org/Regular_expressions_for_XML_Schema") @@ -1531,6 +1576,7 @@ derivations of regular expressions.") (base32 "1n9snbdl46x23ka7bbsls1vsn0plpmfmbpbl0msjfm92fkk2yq7g")))) (build-system haskell-build-system) + (properties '((upstream-name . "hxt"))) (outputs '("out" "static" "doc")) (inputs (list ghc-hxt-charproperties ghc-hxt-unicode ghc-hxt-regex-xmlschema @@ -1553,6 +1599,7 @@ introduces a more general approach for processing XML with Haskell.") (base32 "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh")))) (build-system haskell-build-system) + (properties '((upstream-name . "hxt-xpath"))) (inputs (list ghc-hxt)) (home-page "https://github.com/UweSchmidt/hxt") (synopsis "The XPath modules for HXT") @@ -1575,6 +1622,7 @@ from them. Some primitives have both a functional and an arrow interface.") (base32 "1xpbnfac0fqa5r670ggwm4kq3cmz9jpaw9bx40j9w9qiw6xi4i28")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-common"))) (inputs (list ghc-base64-bytestring ghc-blaze-builder @@ -1604,6 +1652,7 @@ pipes-http re-export this package's types and functions.") (base32 "03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-streams"))) (inputs (list ghc-attoparsec ghc-base64-bytestring @@ -1640,6 +1689,7 @@ deal with the result.") (base32 "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs")))) (build-system haskell-build-system) + (properties '((upstream-name . "snap-core"))) (arguments `(#:tests? #f ; TODO: Fail to compile. #:cabal-revision @@ -1691,6 +1741,7 @@ contains the core definitions and types for the Snap framework.") (base32 "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j")))) (build-system haskell-build-system) + (properties '((upstream-name . "snap-server"))) (inputs (list ghc-attoparsec ghc-blaze-builder @@ -1744,6 +1795,7 @@ protocol.") (base32 "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70")))) (build-system haskell-build-system) + (properties '((upstream-name . "js-jquery"))) (arguments `(#:tests? #f)) ; tests do network IO (home-page "https://github.com/ndmitchell/js-jquery") (synopsis "Obtain minified jQuery code") @@ -1770,6 +1822,7 @@ users (e.g. Debian).") (base32 "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv")))) (build-system haskell-build-system) + (properties '((upstream-name . "js-flot"))) (inputs (list ghc-http)) (home-page "https://github.com/ndmitchell/js-flot") @@ -1796,6 +1849,7 @@ requirements of downstream users (e.g. Debian).") (base32 "0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n")))) (build-system haskell-build-system) + (properties '((upstream-name . "happstack-server"))) (inputs (list ghc-network ghc-network-bsd @@ -1840,6 +1894,7 @@ cookies, serving files, and more.") (base32 "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0")))) (build-system haskell-build-system) + (properties '((upstream-name . "sendfile"))) (inputs (list ghc-network)) (home-page "https://hub.darcs.net/stepcut/sendfile") @@ -1862,6 +1917,7 @@ cookies, serving files, and more.") (base32 "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf")))) (build-system haskell-build-system) + (properties '((upstream-name . "scalpel-core"))) (inputs (list ghc-data-default ghc-fail @@ -1894,6 +1950,7 @@ non-Haskell dependencies.") (base32 "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch")))) (build-system haskell-build-system) + (properties '((upstream-name . "scalpel"))) (inputs (list ghc-scalpel-core ghc-case-insensitive @@ -1925,6 +1982,7 @@ declarative and monadic interface.") (base32 "0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a")))) (build-system haskell-build-system) + (properties '((upstream-name . "sourcemap"))) (inputs (list ghc-aeson ghc-unordered-containers ghc-attoparsec ghc-utf8-string)) @@ -1957,6 +2015,7 @@ proposed by Google and Mozilla here (base32 "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i")))) (build-system haskell-build-system) + (properties '((upstream-name . "language-javascript"))) (inputs (list ghc-blaze-builder ghc-utf8-string)) (native-inputs @@ -1984,6 +2043,7 @@ as frontend to hjsmin.") (base32 "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs")))) (build-system haskell-build-system) + (properties '((upstream-name . "bower-json"))) (inputs (list ghc-aeson ghc-aeson-better-errors ghc-scientific ghc-transformers ghc-unordered-containers)) @@ -2008,6 +2068,7 @@ Bower's package manifest file, bower.json.") (sha256 (base32 "1isvi4fahq70lzxfz23as7qzkc01g7kba568l6flrgd0j1984fsy")))) (build-system haskell-build-system) + (properties '((upstream-name . "DAV"))) (inputs (list ghc-case-insensitive ghc-data-default @@ -2044,6 +2105,7 @@ Authoring and Versioning (WebDAV) extensions to HTTP as well an executable, (base32 "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod-test"))) (inputs (list ghc-hunit ghc-aeson @@ -2090,6 +2152,7 @@ HTML responses using CSS selectors.") (base32 "138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-app-static"))) (inputs (list ghc-wai ghc-http-types @@ -2132,6 +2195,7 @@ helper functions and datatypes for use outside of WAI.") (base32 "1r2p5rjdjr25j3w4s57q5hxw2c3ymw12x7ms18yvglnq2ivr9fc1")))) (build-system haskell-build-system) + (properties '((upstream-name . "hjsmin"))) (arguments `(#:phases (modify-phases %standard-phases @@ -2163,6 +2227,7 @@ syntactic elements, without changing the semantics.") (base32 "18f5hm9ncvkzl8bkn39cg841z0k5iqs5w45afsyk9y6k98pjd54p")))) (build-system haskell-build-system) + (properties '((upstream-name . "yesod-static"))) (inputs (list ghc-async ghc-attoparsec @@ -2206,6 +2271,7 @@ for the Yesod Web Framework.") (base32 "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-handler-launch"))) (inputs (list ghc-wai ghc-warp ghc-http-types ghc-streaming-commons ghc-async)) @@ -2229,6 +2295,7 @@ server no longer receives pings, it shuts down.") (base32 "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5")))) (build-system haskell-build-system) + (properties '((upstream-name . "wai-cors"))) (arguments `(#:phases (modify-phases %standard-phases @@ -2273,6 +2340,7 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.") (sha256 (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-run"))) (inputs (list ghc-network)) (home-page "https://hackage.haskell.org/package/network-run") (synopsis "Simple network runner library") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 58a0e18f29..e626c1f326 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -98,6 +98,7 @@ (base32 "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9")))) (build-system haskell-build-system) + (properties '((upstream-name . "abstract-deque"))) (inputs (list ghc-random)) (home-page "https://github.com/rrnewton/haskell-lockfree/wiki") (synopsis "Abstract, parameterized interface to mutable Deques for Haskell") @@ -135,6 +136,7 @@ This package also includes a simple reference implementation based on (base32 "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4")))) (build-system haskell-build-system) + (properties '((upstream-name . "abstract-par"))) (home-page "https://github.com/simonmar/monad-par") (synopsis "Abstract parallelization interface for Haskell") (description "This Haskell package is an abstract interface @@ -157,6 +159,7 @@ module for more details.") (base32 "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74")))) (build-system haskell-build-system) + (properties '((upstream-name . "active"))) (inputs (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens ghc-linear)) @@ -186,6 +189,7 @@ diagrams framework}.") (base32 "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) (build-system haskell-build-system) + (properties '((upstream-name . "adjunctions"))) (arguments `(#:cabal-revision ("2" "1yfsjx7dqikg3hvld7i91xfsg5lawmr5980lvfd794sybmgxsf17"))) @@ -222,6 +226,7 @@ for Haskell.") (base32 "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson-compat"))) (inputs (list ghc-base-compat ghc-aeson ghc-attoparsec @@ -258,6 +263,7 @@ ghc-aeson.") (base32 "18bm4qyjjwgrr6dxc4y0vai0z6qgrh2lcqb4jrr4xqs4cxrlwr92")))) (build-system haskell-build-system) + (properties '((upstream-name . "aeson-diff"))) (inputs (list ghc-aeson ghc-edit-distance-vector @@ -299,6 +305,7 @@ systems.") (base32 "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali")))) (build-system haskell-build-system) + (properties '((upstream-name . "alex"))) (arguments (list #:phases #~(modify-phases %standard-phases @@ -335,6 +342,7 @@ tool lex or flex for C/C++.") (base32 "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b")))) (build-system haskell-build-system) + (properties '((upstream-name . "alsa-core"))) (arguments `(#:extra-directories ("alsa-lib"))) (inputs @@ -362,6 +370,7 @@ needed by both alsa-seq and alsa-pcm.") (base32 "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb")))) (build-system haskell-build-system) + (properties '((upstream-name . "alsa-mixer"))) (inputs (list ghc-alsa-core)) (native-inputs (list ghc-c2hs)) (home-page "https://github.com/ttuegel/alsa-mixer") @@ -385,6 +394,7 @@ needed by both alsa-seq and alsa-pcm.") (base32 "061xfz6qany3wf95csl8dcik2pz22cn8iv1qchhm16isw5zjs9hc")))) (build-system haskell-build-system) + (properties '((upstream-name . "annotated-wl-pprint"))) (home-page "https://github.com/david-christiansen/annotated-wl-pprint") (synopsis @@ -410,6 +420,7 @@ a variety of ways.") (base32 "14rp62c7y79n9dmmi7m0l9n3mcq6dh331b4yyyrivm5da6g1nqf6")))) (build-system haskell-build-system) + (properties '((upstream-name . "ansi-terminal"))) (inputs (list ghc-colour)) (home-page "https://github.com/feuerbach/ansi-terminal") @@ -433,6 +444,7 @@ cursor, and changing the title.") (base32 "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7")))) (build-system haskell-build-system) + (properties '((upstream-name . "ansi-wl-pprint"))) (arguments `(#:cabal-revision ("2" "1xrv66v5hqchjhj8a0g3awy1qpsswk2jqb4w4yh3mm1py5s0dlr0"))) @@ -460,6 +472,7 @@ colored output using the ansi-terminal package.") (base32 "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4")))) (build-system haskell-build-system) + (properties '((upstream-name . "appar"))) (home-page "https://hackage.haskell.org/package/appar") (synopsis "Simple applicative parser") @@ -482,6 +495,7 @@ style.") (base32 "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q")))) (build-system haskell-build-system) + (properties '((upstream-name . "assoc"))) (inputs (list ghc-bifunctors ghc-tagged)) (home-page @@ -509,6 +523,7 @@ similar operations (e.g. @code{Either}, @code{These}).") (base32 "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8")))) (build-system haskell-build-system) + (properties '((upstream-name . "async"))) (inputs (list ghc-hashable)) (native-inputs @@ -534,6 +549,7 @@ will eventually deliver a value of type @code{a}.") (base32 "0gidqyk913vhcz3q4vnpadx3vkkrwb66rqhsxvdba8g2p5z63a12")))) (build-system haskell-build-system) + (properties '((upstream-name . "atomic-primops"))) (inputs (list ghc-primitive)) (home-page "https://github.com/rrnewton/haskell-lockfree/wiki") (synopsis "Safe approach to CAS and other atomic ops") @@ -558,6 +574,7 @@ This library provides a safer method based on the concept of @code{Ticket}s.") (base32 "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl")))) (build-system haskell-build-system) + (properties `((upstream-name . "atomic-write"))) (inputs (list ghc-temporary ghc-unix-compat)) (native-inputs @@ -602,6 +619,7 @@ permissions while atomically writing to a file.") (base32 "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11")))) (build-system haskell-build-system) + (properties '((upstream-name . "attoparsec"))) (arguments `(#:phases (modify-phases %standard-phases @@ -651,6 +669,7 @@ complicated text/binary file formats.") (base32 "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582")))) (build-system haskell-build-system) + (properties '((upstream-name . "attoparsec-iso8601"))) (arguments `(#:cabal-revision ("2" "18557xy5gvkhj0sb35wwxmhqirkiqrkwm0y0pqygsr0aimccs5zm"))) @@ -676,6 +695,7 @@ from aeson.") (base32 "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l")))) (build-system haskell-build-system) + (properties '((upstream-name . "auto-update"))) (native-inputs (list ghc-hspec ghc-hunit ghc-retry hspec-discover)) (home-page "https://github.com/yesodweb/wai") @@ -696,6 +716,7 @@ periodic, on-demand actions in Haskell.") (sha256 (base32 "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r")))) (build-system haskell-build-system) + (properties '((upstream-name . "aws"))) (arguments `(#:tests? #f ; Tests require AWS credentials. #:configure-flags (list "-fNetworkBSD") ; Use network-bsd. @@ -767,6 +788,7 @@ Web Services.") (base32 "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0")))) (build-system haskell-build-system) + (properties '((upstream-name . "base16-bytestring"))) (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) @@ -791,6 +813,7 @@ data quickly and efficiently, using the ByteString type.") (sha256 (base32 "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391")))) (build-system haskell-build-system) + (properties '((upstream-name . "base64-bytestring"))) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (home-page "https://github.com/bos/base64-bytestring") (synopsis "Base64 encoding and decoding for ByteStrings") @@ -813,6 +836,7 @@ Haskell @code{ByteString}s.") (base32 "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk")))) (build-system haskell-build-system) + (properties '((upstream-name . "base-compat"))) (outputs '("out" "static" "doc")) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) @@ -837,6 +861,7 @@ pragmas in your code.") (base32 "08rh9nlm9ir28fm42xim06ga8qwdqdcvkbb5ckz99bwnmajndq1i")))) (build-system haskell-build-system) + (properties '((upstream-name . "base-compat-batteries"))) (inputs (list ghc-base-compat)) (native-inputs @@ -864,6 +889,7 @@ than @code{base-compat}, which has no dependencies.") (base32 "12zsnxkgv86im2prslk6ddhy0zwpawwjc1h4ff63kpxp2xdl7i2k")))) (build-system haskell-build-system) + (properties '((upstream-name . "basement"))) (outputs '("out" "static" "doc")) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Basic primitives for Foundation starter pack") @@ -887,6 +913,7 @@ packages.") (base32 "1lw1jhrrsdq7x9wr2bwkxq9mscidcad0n30kh9gfk8kgifl5xh9k")))) (build-system haskell-build-system) + (properties '((upstream-name . "base-orphans"))) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) (home-page "https://hackage.haskell.org/package/base-orphans") @@ -909,6 +936,7 @@ available in later versions of base to a wider (older) range of compilers.") (base32 "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs")))) (build-system haskell-build-system) + (properties '((upstream-name . "base-prelude"))) (outputs '("out" "static" "doc")) (home-page "https://github.com/nikita-volkov/base-prelude") (synopsis "The most complete prelude formed solely from the Haskell's base @@ -944,6 +972,7 @@ the bounds of \"base\" as well.") (base32 "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23")))) (build-system haskell-build-system) + (properties '((upstream-name . "base-unicode-symbols"))) (home-page "https://wiki.haskell.org/Unicode-symbols") (synopsis "Unicode alternatives for common functions and operators") (description "This package defines new symbols for a number of functions, @@ -971,6 +1000,7 @@ stand for certain ASCII character sequences, i.e. → instead of @code{->}, (base32 "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h")))) (build-system haskell-build-system) + (properties '((upstream-name . "basic-prelude"))) (inputs (list ghc-hashable ghc-unordered-containers ghc-vector)) (home-page "https://github.com/snoyberg/basic-prelude#readme") @@ -1006,6 +1036,7 @@ wishing to create a new prelude should use CorePrelude.") (sha256 (base32 "0znv0y3b3zm5jvhlvj5f5s7y93db67j9yd59w1bnrw2pqv30gqaq")))) (build-system haskell-build-system) + (properties '((upstream-name . "bencode"))) (inputs (list ghc-transformers-compat)) (native-inputs @@ -1033,6 +1064,7 @@ storing and transmitting loosely structured data.") (base32 "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb")))) (build-system haskell-build-system) + (properties '((upstream-name . "bifunctors"))) (inputs (list ghc-base-orphans ghc-comonad @@ -1060,6 +1092,7 @@ storing and transmitting loosely structured data.") (base32 "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3")))) (build-system haskell-build-system) + (properties '((upstream-name . "bindings-DSL"))) (home-page "https://github.com/jwiegley/bindings-dsl/wiki") (synopsis "FFI domain specific language, on top of hsc2hs") (description @@ -1085,6 +1118,7 @@ functions.") (base32 "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj")))) (build-system haskell-build-system) + (properties '((upstream-name . "bitarray"))) (arguments `(#:cabal-revision ("1" "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45"))) @@ -1108,6 +1142,7 @@ functions.") (base32 "0rxg6vjr0ji6g1nngrqpl4k1q9w66fwkhld9cqm5yfhx0a69kp1c")))) (build-system haskell-build-system) + (properties '((upstream-name . "blaze-builder"))) (inputs (list ghc-bytestring-builder ghc-semigroups)) (native-inputs @@ -1140,6 +1175,7 @@ interoperate with code that uses the new implementation.") (base32 "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23")))) (build-system haskell-build-system) + (properties '((upstream-name . "blaze-markup"))) (arguments `(#:phases (modify-phases %standard-phases @@ -1172,6 +1208,7 @@ library for Haskell.") (base32 "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")))) (build-system haskell-build-system) + (properties '((upstream-name . "bloomfilter"))) (native-inputs (list ghc-quickcheck ghc-random ghc-test-framework ghc-test-framework-quickcheck2)) @@ -1194,6 +1231,7 @@ interface.") (sha256 (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) (build-system haskell-build-system) + (properties '((upstream-name . "boxes"))) (inputs (list ghc-split ghc-quickcheck)) (home-page "https://hackage.haskell.org/package/boxes") @@ -1215,6 +1253,7 @@ using a simple box model.") (base32 "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4")))) (build-system haskell-build-system) + (properties '((upstream-name . "byteable"))) (home-page "https://github.com/vincenthz/hs-byteable") (synopsis "Type class for sequence of bytes") (description @@ -1238,6 +1277,7 @@ wrapping a bytestring with stronger and more meaniful name.") (base32 "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x")))) (build-system haskell-build-system) + (properties '((upstream-name . "byteorder"))) (home-page "http://community.haskell.org/~aslatter/code/byteorder") (synopsis @@ -1263,6 +1303,7 @@ system.") (base32 "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s")))) (build-system haskell-build-system) + (properties '((upstream-name . "bytes"))) (inputs (list ghc-binary-orphans ghc-cereal ghc-hashable @@ -1291,6 +1332,7 @@ serialization code.") (base32 "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7")))) (build-system haskell-build-system) + (properties '((upstream-name . "bytestring-builder"))) (arguments `(#:haddock? #f)) ; Package contains no documentation. (home-page "https://hackage.haskell.org/package/bytestring-builder") (synopsis "The new bytestring builder, packaged outside of GHC") @@ -1313,6 +1355,7 @@ Compatibility package for older packages.") (base32 "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) (build-system haskell-build-system) + (properties '((upstream-name . "bytestring-handle"))) (arguments `(#:cabal-revision ("2" "1x1sy3dz2ph9v6jk22wmcv5gk2bka5fv4s68i8q0j9m9pk085w37"))) @@ -1338,6 +1381,7 @@ Compatibility package for older packages.") (base32 "1p7i2haix4m11an3djaq65cnd293hzwqy4cd2i8jxzcl248pk6iy")))) (build-system haskell-build-system) + (properties '((upstream-name . "bytestring-lexing"))) (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-smallcheck)) (home-page "http://code.haskell.org/~wren/") @@ -1360,6 +1404,7 @@ from strict or lazy bytestrings.") (base32 "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b")))) (build-system haskell-build-system) + (properties '((upstream-name . "bzlib-conduit"))) (inputs (list ghc-bindings-dsl ghc-conduit ghc-data-default-class ghc-resourcet)) @@ -1387,6 +1432,7 @@ streaming compression and decompression.") (base32 "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir")))) (build-system haskell-build-system) + (properties '((upstream-name . "c2hs"))) (inputs (list ghc-language-c ghc-dlist)) (native-inputs @@ -1442,6 +1488,7 @@ imported with the correct Haskell types.") (base32 "1hpkyhrlg1d24s34kq6d379z8l8fvznm98wpq37haqjma4nl25hk")))) (build-system haskell-build-system) + (properties '((upstream-name . "cairo"))) (inputs (list ghc-utf8-string cairo)) (native-inputs @@ -1468,6 +1515,7 @@ documents, amongst others.") (base32 "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq")))) (build-system haskell-build-system) + (properties '((upstream-name . "call-stack"))) (native-inputs (list ghc-nanospec)) (home-page "https://github.com/sol/call-stack#readme") (synopsis "Use GHC call-stacks in a backward compatible way") @@ -1500,6 +1548,7 @@ call stacks with different versions of the compiler.") (base32 "01p40hfjyldfds5jg6vlvvn3ihs4ki63xn6fh8yzngaz1izc2v99")))) (build-system haskell-build-system) + (properties '((upstream-name . "case-insensitive"))) ;; these inputs are necessary to use this library (inputs (list ghc-hashable)) @@ -1530,6 +1579,7 @@ the resulting type will be insensitive to cases.") (base32 "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk")))) (build-system haskell-build-system) + (properties '((upstream-name . "cassava"))) (inputs (list ghc-attoparsec ghc-hashable @@ -1612,6 +1662,7 @@ very simple example of encoding CSV data: (base32 "0pg9z38jmrylbj683b6pf7psipp7lrdq6mn1hbj8v2gj5lh8yf8n")))) (build-system haskell-build-system) + (properties '((upstream-name . "cassava-megaparsec"))) (inputs (list ghc-cassava ghc-megaparsec ghc-unordered-containers ghc-vector)) (native-inputs @@ -1638,6 +1689,7 @@ provides for better error messages at the expense of some speed.") (base32 "08da498bpbnl5c919m45mjm7sr78nn6qs7xyl0smfgd06wwm65xf")))) (build-system haskell-build-system) + (properties '((upstream-name . "cborg"))) (inputs (list ghc-half ghc-primitive)) (native-inputs @@ -1684,6 +1736,7 @@ command-line utility for working with CBOR data.") (sha256 (base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b")))) (build-system haskell-build-system) + (properties '((upstream-name . "cborg-json"))) (arguments `(#:cabal-revision ("3" "1sn2f9nfjcbr0n62n4kklbdi3pzpwrcy7ilg7m3v41nwrk53ifwy"))) @@ -1716,6 +1769,7 @@ defined in the CBOR specification, RFC 7049.") (base32 "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id")))) (build-system haskell-build-system) + (properties '((upstream-name . "cereal"))) (native-inputs (list ghc-quickcheck ghc-fail ghc-test-framework ghc-test-framework-quickcheck2)) @@ -1740,6 +1794,7 @@ parser isolation, and labeled blocks for better error messages.") (base32 "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r")))) (build-system haskell-build-system) + (properties '((upstream-name . "cereal-conduit"))) (inputs (list ghc-conduit ghc-resourcet ghc-cereal)) (native-inputs @@ -1766,6 +1821,7 @@ parser isolation, and labeled blocks for better error messages.") (base32 "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a")))) (build-system haskell-build-system) + (properties '((upstream-name . "cgi"))) (inputs (list ghc-exceptions ghc-multipart ghc-network-uri ghc-network)) (native-inputs @@ -1792,6 +1848,7 @@ parser isolation, and labeled blocks for better error messages.") (base32 "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks")))) (build-system haskell-build-system) + (properties '((upstream-name . "charset"))) (inputs (list ghc-semigroups ghc-unordered-containers)) (home-page "https://github.com/ekmett/charset") @@ -1813,6 +1870,7 @@ Haskell, based on complemented PATRICIA tries.") (base32 "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry")))) (build-system haskell-build-system) + (properties '((upstream-name . "Chart"))) (arguments `(#:cabal-revision ("2" "04mmsm54mdqcrypvgawhhbwjscmky3j7g5841bc71c0q6d33h2k4"))) @@ -1843,6 +1901,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (base32 "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f")))) (build-system haskell-build-system) + (properties '((upstream-name . "Chart-cairo"))) (arguments `(#:cabal-revision ("2" "0z93znn3dpgj80iiz3a67m90x0j9ljr0jd1ws9jkzj7rk88014gp"))) @@ -1874,6 +1933,7 @@ backend for the Charts library.") (base32 "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3")))) (build-system haskell-build-system) + (properties '((upstream-name . "ChasingBottoms"))) (inputs (list ghc-quickcheck ghc-random ghc-syb)) (home-page "https://hackage.haskell.org/package/ChasingBottoms") @@ -1904,6 +1964,7 @@ Partial and Infinite Values\"}.") (base32 "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd")))) (build-system haskell-build-system) + (properties '((upstream-name . "cheapskate"))) (inputs (list ghc-blaze-html ghc-xss-sanitize ghc-data-default ghc-syb ghc-uniplate)) @@ -1930,6 +1991,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (base32 "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg")))) (build-system haskell-build-system) + (properties '((upstream-name . "chell"))) (arguments `(#:cabal-revision ("1" "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0"))) @@ -1959,6 +2021,7 @@ testing strategies.") (base32 "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03")))) (build-system haskell-build-system) + (properties '((upstream-name . "chell-quickcheck"))) (arguments `(#:phases (modify-phases %standard-phases @@ -2021,6 +2084,7 @@ testing strategies.") (base32 "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) (build-system haskell-build-system) + (properties '((upstream-name . "chunked-data"))) (inputs (list ghc-vector ghc-semigroups)) (home-page "https://github.com/snoyberg/mono-traversable") (synopsis "Typeclasses for dealing with various chunked data @@ -2043,6 +2107,7 @@ classy-prelude.") (sha256 (base32 "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b")))) (build-system haskell-build-system) + (properties '((upstream-name . "clock"))) (inputs (list ghc-tasty ghc-tasty-quickcheck)) (home-page "https://hackage.haskell.org/package/clock") @@ -2075,6 +2140,7 @@ timer functions of different operating systems via a unified API.") (base32 "1p41z6z8dqxk62287lvhhg4ayy9laai9ljh4azsnzb029v6mbv0d")))) (build-system haskell-build-system) + (properties '((upstream-name . "cmark"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/jgm/commonmark-hs") @@ -2100,6 +2166,7 @@ sources, and does not require prior installation of the C library.") (base32 "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f")))) (build-system haskell-build-system) + (properties '((upstream-name . "cmark-gfm"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/kivikakk/cmark-gfm-hs") @@ -2126,6 +2193,7 @@ of the C library.") (base32 "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) (build-system haskell-build-system) + (properties '((upstream-name . "cmdargs"))) (outputs '("out" "static" "doc")) (home-page "http://community.haskell.org/~ndm/cmdargs/") @@ -2148,6 +2216,7 @@ of the C library.") (base32 "1aiavczjk6f2kc1cdwjc1mwkr4d9shiz3xwmfbzsdn0yqqchxydj")))) (build-system haskell-build-system) + (properties '((upstream-name . "code-page"))) (home-page "https://github.com/RyanGlScott/code-page") (synopsis "Windows code page library for Haskell") (description "A cross-platform library with functions for adjusting @@ -2173,6 +2242,7 @@ nothing.") ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. `(#:tests? #f)) (build-system haskell-build-system) + (properties '((upstream-name . "colour"))) (home-page "https://wiki.haskell.org/Colour") (synopsis "Model for human colour perception") (description @@ -2196,6 +2266,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") (base32 "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g")))) (build-system haskell-build-system) + (properties '((upstream-name . "comonad"))) (inputs (list ghc-distributive ghc-tagged ghc-indexed-traversable ghc-transformers-compat)) @@ -2217,6 +2288,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") (base32 "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd")))) (build-system haskell-build-system) + (properties '((upstream-name . "concatenative"))) (home-page "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty") (synopsis "Library for postfix control flow") @@ -2240,6 +2312,7 @@ postfix notation. For more information on stack based languages, see (base32 "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4")))) (build-system haskell-build-system) + (properties '((upstream-name . "concurrent-extra"))) (arguments ;; XXX: The ReadWriteLock 'stressTest' fails. `(#:tests? #f)) @@ -2289,6 +2362,7 @@ Python.") (base32 "081wpag1d5znr0ynrjvkc14xl816m88vz9hgfm3g3sp6ak7s3y47")))) (build-system haskell-build-system) + (properties '((upstream-name . "concurrent-output"))) (inputs (list ghc-async ghc-exceptions ghc-ansi-terminal ghc-terminal-size)) (home-page @@ -2316,6 +2390,7 @@ concurrent threads. Can be used for progress displays etc.") (base32 "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) (build-system haskell-build-system) + (properties '((upstream-name . "conduit"))) (outputs '("out" "static" "doc")) (inputs (list ghc-exceptions @@ -2355,6 +2430,7 @@ space as enumerator/iteratee and pipes.") (base32 "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i")))) (build-system haskell-build-system) + (properties '((upstream-name . "conduit-algorithms"))) (inputs (list ghc-async ghc-bzlib-conduit @@ -2395,6 +2471,7 @@ level asynchronous processing and some other utilities.") (base32 "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp")))) (build-system haskell-build-system) + (properties '((upstream-name . "conduit-combinators"))) (inputs (list ghc-conduit ghc-conduit-extra ghc-transformers-base @@ -2431,6 +2508,7 @@ as well as a convenient Conduit module.") (base32 "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a")))) (build-system haskell-build-system) + (properties '((upstream-name . "conduit-extra"))) (inputs (list ghc-conduit ghc-exceptions @@ -2472,6 +2550,7 @@ dependencies. The basic idea is that this package should only depend on (base32 "0f0ir4zs3skw33c8mfppxhfsyqh1c2cnc4gkf8bvv3bdiikdj1yl")))) (build-system haskell-build-system) + (properties '((upstream-name . "conduit-zstd"))) (inputs (list ghc-conduit ghc-zstd)) (native-inputs @@ -2497,6 +2576,7 @@ interface}.") (sha256 (base32 "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf")))) (build-system haskell-build-system) + (properties '((upstream-name . "config-ini"))) (arguments ;; XXX The tests fail to compile: “The constructor ‘I1.Ini’ should have 2 ;; arguments, but has been given 1”. @@ -2533,6 +2613,7 @@ human-readable error messages when things go wrong.") (base32 "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf")))) (build-system haskell-build-system) + (properties '((upstream-name . "configurator"))) (inputs (list ghc-attoparsec ghc-hashable ghc-unix-compat ghc-unordered-containers)) @@ -2570,6 +2651,7 @@ and daemons. The features include: (base32 "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax")))) (build-system haskell-build-system) + (properties '((upstream-name . "connection"))) (inputs (list ghc-byteable ghc-data-default-class @@ -2602,6 +2684,7 @@ the choice of SSL/TLS, and SOCKS.") (base32 "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj")))) (build-system haskell-build-system) + (properties '((upstream-name . "constraints"))) (inputs (list ghc-hashable ghc-semigroups ghc-transformers-compat ghc-type-equality)) @@ -2630,6 +2713,7 @@ a vocabulary for working with them.") (base32 "1ynz89vfn7czxpa203zmdqknkvpylzzl9rlkpasx1anph1jxcbq6")))) (build-system haskell-build-system) + (properties '((upstream-name . "contravariant"))) (inputs (list ghc-void ghc-transformers-compat ghc-statevar ghc-semigroups)) (home-page @@ -2652,6 +2736,7 @@ a vocabulary for working with them.") (base32 "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9")))) (build-system haskell-build-system) + (properties '((upstream-name . "contravariant-extras"))) (inputs (list ghc-contravariant ghc-template-haskell-compat-v0208)) (home-page "https://github.com/nikita-volkov/contravariant-extras") @@ -2676,6 +2761,7 @@ a vocabulary for working with them.") (base32 "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33")))) (build-system haskell-build-system) + (properties '((upstream-name . "control-monad-free"))) (home-page "https://github.com/pepeiborra/control-monad-free") (synopsis "Free monads and monad transformers") (description @@ -2703,6 +2789,7 @@ Free Monads, MPC'08} (base32 "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9")))) (build-system haskell-build-system) + (properties '((upstream-name . "convertible"))) (inputs (list ghc-old-time ghc-old-locale)) (home-page "https://hackage.haskell.org/package/convertible") @@ -2730,6 +2817,7 @@ function performs the conversion you desire.") (base32 "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c")))) (build-system haskell-build-system) + (properties '((upstream-name . "csv"))) (arguments `(#:phases (modify-phases %standard-phases @@ -2760,6 +2848,7 @@ lingua franca for spreadsheets, and for certain web services.") (sha256 (base32 "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-accessor"))) (home-page "https://wiki.haskell.org/Record_access") (synopsis "Haskell utilities for accessing and manipulating fields of records") @@ -2780,6 +2869,7 @@ manipulating fields of records.") (sha256 (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-accessor-transformers"))) (inputs (list ghc-data-accessor)) (home-page "https://wiki.haskell.org/Record_access") (synopsis "Use Accessor to access state in transformers State monad") @@ -2799,6 +2889,7 @@ Accessor to access state in transformers State monad.") (sha256 (base32 "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-clist"))) (native-inputs (list ghc-quickcheck)) (arguments @@ -2827,6 +2918,7 @@ observed.") (sha256 (base32 "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default"))) (inputs (list ghc-data-default-class ghc-data-default-instances-base ghc-data-default-instances-containers @@ -2853,6 +2945,7 @@ packages.") (sha256 (base32 "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default-class"))) (home-page "https://hackage.haskell.org/package/data-default-class") (synopsis "Types with default values") (description @@ -2873,6 +2966,7 @@ packages.") (sha256 (base32 "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default-instances-base"))) (inputs (list ghc-data-default-class)) (home-page "https://hackage.haskell.org/package/data-default-instances-base") @@ -2896,6 +2990,7 @@ package.") (sha256 (base32 "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default-instances-containers"))) (inputs (list ghc-data-default-class)) (home-page "https://hackage.haskell.org/package/data-default-instances-containers") @@ -2918,6 +3013,7 @@ package.") (sha256 (base32 "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default-instances-dlist"))) (inputs (list ghc-data-default-class ghc-dlist)) (home-page "https://hackage.haskell.org/package/data-default-instances-dlist") @@ -2940,6 +3036,7 @@ package.") (sha256 (base32 "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-default-instances-old-locale"))) (inputs (list ghc-data-default-class ghc-old-locale)) (home-page @@ -2962,6 +3059,7 @@ package.") (sha256 (base32 "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-fix"))) (inputs (list ghc-hashable)) (home-page "https://github.com/spell-music/data-fix") (synopsis "Fixpoint data types") @@ -2984,6 +3082,7 @@ Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel") (sha256 (base32 "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-hash"))) (inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) @@ -3008,6 +3107,7 @@ It includes hashing functions for all basic Haskell98 types.") (base32 "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g")))) (build-system haskell-build-system) + (properties '((upstream-name . "data-ordlist"))) (home-page "https://hackage.haskell.org/package/data-ordlist") (synopsis "Set and bag operations on ordered lists") (description @@ -3029,6 +3129,7 @@ It includes hashing functions for all basic Haskell98 types.") (base32 "0iyfnkxcnm1vl379ry88fqxgn2y8q6ilsvpic6ciassnyv5pcbrv")))) (build-system haskell-build-system) + (properties '((upstream-name . "dbus"))) (inputs (list ghc-cereal ghc-conduit @@ -3078,6 +3179,7 @@ interfaces common to foreign bindings.") (base32 "19w7i9f0lbiyzwa0v3bm95233vi7f1688f0xms6cnjsf88h04ym3")))) (build-system haskell-build-system) + (properties '((upstream-name . "Decimal"))) (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2 ghc-test-framework-hunit)) @@ -3102,6 +3204,7 @@ value.") (base32 "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) (build-system haskell-build-system) + (properties '((upstream-name . "deepseq-generics"))) (arguments `(#:cabal-revision ("6" "1qwnpdjsrqzn18pjmvv9aqz3l12fbdcimf62wkj33yfh69rx4s42"))) @@ -3129,6 +3232,7 @@ providing an @code{rnf} implementation.") (base32 "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp")))) (build-system haskell-build-system) + (properties '((upstream-name . "dense-linear-algebra"))) (inputs (list ghc-math-functions ghc-primitive @@ -3159,6 +3263,7 @@ related modules split from the statistics library.") (base32 "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237")))) (build-system haskell-build-system) + (properties '((upstream-name . "descriptive"))) (inputs (list ghc-aeson ghc-bifunctors ghc-scientific ghc-vector)) (native-inputs @@ -3185,6 +3290,7 @@ and parsers with useful semantics.") (base32 "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn")))) (build-system haskell-build-system) + (properties '((upstream-name . "diagrams-core"))) (inputs (list ghc-unordered-containers ghc-semigroups @@ -3215,6 +3321,7 @@ declarative drawing.") (base32 "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy")))) (build-system haskell-build-system) + (properties '((upstream-name . "diagrams-lib"))) (inputs (list ghc-semigroups ghc-monoid-extras @@ -3268,6 +3375,7 @@ primitives and operations for creating diagrams.") (base32 "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17")))) (build-system haskell-build-system) + (properties '((upstream-name . "diagrams-solve"))) (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) (arguments @@ -3296,6 +3404,7 @@ and cyclic tridiagonal linear systems.") (base32 "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8")))) (build-system haskell-build-system) + (properties '((upstream-name . "diagrams-svg"))) (inputs (list ghc-base64-bytestring ghc-colour @@ -3333,6 +3442,7 @@ language (EDSL) to Scalable Vector Graphics (SVG) files.") (base32 "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc")))) (build-system haskell-build-system) + (properties '((upstream-name . "dictionary-sharing"))) (arguments `(#:cabal-revision ("3" "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"))) @@ -3354,6 +3464,7 @@ members are shared.") (base32 "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j")))) (build-system haskell-build-system) + (properties '((upstream-name . "Diff"))) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) @@ -3378,6 +3489,7 @@ and utilities for pretty printing.") (base32 "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi")))) (build-system haskell-build-system) + (properties '((upstream-name . "disk-free-space"))) (home-page "https://github.com/redneb/disk-free-space") (synopsis "Retrieve information about disk space usage") (description "A cross-platform library for retrieving information about @@ -3399,6 +3511,7 @@ disk space usage.") (base32 "14bb66qyfn43bj688igfvnfjw7iycjf4n2k38sm8rxbqw2916dfp")))) (build-system haskell-build-system) + (properties '((upstream-name . "distributive"))) (inputs (list ghc-tagged ghc-base-orphans ghc-transformers-compat ghc-semigroups ghc-generic-deriving)) @@ -3424,6 +3537,7 @@ Dual to @code{Traversable}.") (sha256 (base32 "0581a60xw4gw7pmqlmg5w2hr4hm9yjgx4c2z6v63y5xv51rn6g8p")))) (build-system haskell-build-system) + (properties '((upstream-name . "dlist"))) (inputs (list ghc-quickcheck)) (home-page "https://github.com/spl/dlist") @@ -3448,6 +3562,7 @@ Writer monad), where list append quickly becomes too expensive.") (base32 "048h8ka849h1f0xxwkasjbrrwq03rfz2m7aqg5xc5286kp02w9ns")))) (build-system haskell-build-system) + (properties '((upstream-name . "doctemplates"))) (inputs (list ghc-aeson ghc-doclayout @@ -3481,6 +3596,7 @@ Writer monad), where list append quickly becomes too expensive.") (base32 "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz")))) (build-system haskell-build-system) + (properties '((upstream-name . "doctest"))) (arguments `(#:tests? #f)) ; FIXME: missing test framework (inputs (list ghc-base-compat ghc-code-page ghc-paths ghc-syb)) @@ -3515,6 +3631,7 @@ It is modeled after doctest for Python, see (base32 "1jcn5m9342jrdq7jln2v9msf9978ngrx0pq9rrjh8izhvbvph76s")))) (build-system haskell-build-system) + (properties '((upstream-name . "dotgen"))) (home-page "https://github.com/ku-fpg/dotgen") (synopsis "Simple interface for building .dot graph files") @@ -3538,6 +3655,7 @@ monadic interface for building graphs.") (base32 "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) (build-system haskell-build-system) + (properties '((upstream-name . "double-conversion"))) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) @@ -3561,6 +3679,7 @@ between double precision floating point and text.") (base32 "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg")))) (build-system haskell-build-system) + (properties '((upstream-name . "dual-tree"))) (arguments `(#:tests? #f ; TODO: ghc-testing-feat does not build. #:cabal-revision @@ -3594,6 +3713,7 @@ diagrams framework}, but potentially has other applications as well.") (base32 "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) (build-system haskell-build-system) + (properties '((upstream-name . "easy-file"))) (home-page "https://github.com/kazu-yamamoto/easy-file") (synopsis "File handling library for Haskell") @@ -3613,6 +3733,7 @@ diagrams framework}, but potentially has other applications as well.") (sha256 (base32 "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk")))) (build-system haskell-build-system) + (properties '((upstream-name . "easyplot"))) (propagated-inputs (list gnuplot)) (arguments `(#:phases (modify-phases %standard-phases @@ -3638,6 +3759,7 @@ Haskell, using gnuplot for rendering.") (base32 "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9")))) (build-system haskell-build-system) + (properties '((upstream-name . "echo"))) (arguments `(#:cabal-revision ("1" "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"))) @@ -3662,6 +3784,7 @@ MinTTY and other consoles.") (sha256 (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) (build-system haskell-build-system) + (properties '((upstream-name . "edit-distance"))) (arguments `(#:tests? #f ; TODO: Needs quickcheck<2.10 #:cabal-revision @@ -3691,6 +3814,7 @@ Damerau-Levenshtein algorithms.") (base32 "07qgc8dyi9kkzkd3xcd78wdlljy0xwhz65b4r2qg2piidpcdvpxp")))) (build-system haskell-build-system) + (properties '((upstream-name . "edit-distance-vector"))) (inputs (list ghc-vector)) (native-inputs @@ -3723,6 +3847,7 @@ but is otherwise agnostic to: (base32 "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2")))) (build-system haskell-build-system) + (properties '((upstream-name . "either"))) (arguments `(#:cabal-revision ("1" "03bgnq55lc6f1nx4p662gidfsyyfm3xm4fi84h77wnsppxrpa5j1"))) @@ -3760,6 +3885,7 @@ but is otherwise agnostic to: (base32 "0n67wss6k8lhwfkybkhsa04bbdfdv541sacbxlylkx2hqpj5r5gh")))) (build-system haskell-build-system) + (properties '((upstream-name . "email-validate"))) (inputs (list ghc-attoparsec ghc-hspec ghc-quickcheck ghc-doctest)) (home-page @@ -3783,6 +3909,7 @@ address string against RFC 5322.") (base32 "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg")))) (build-system haskell-build-system) + (properties '((upstream-name . "enclosed-exceptions"))) ;; FIXME: one of the tests blocks forever: ;; "thread blocked indefinitely in an MVar operation" (arguments '(#:tests? #f)) @@ -3811,6 +3938,7 @@ asynchronous exceptions.") (sha256 (base32 "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp")))) (build-system haskell-build-system) + (properties '((upstream-name . "equivalence"))) (inputs (list ghc-stmonadtrans ghc-transformers-compat ghc-fail ghc-quickcheck)) @@ -3838,6 +3966,7 @@ monad transformer (instead of the IO monad).") (base32 "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14")))) (build-system haskell-build-system) + (properties '((upstream-name . "erf"))) (home-page "https://hackage.haskell.org/package/erf") (synopsis "The error function, erf, and related functions for Haskell") (description "This Haskell library provides a type class for the @@ -3859,6 +3988,7 @@ Double.") (base32 "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm")))) (build-system haskell-build-system) + (properties '((upstream-name . "errorcall-eq-instance"))) (inputs (list ghc-base-orphans)) (native-inputs @@ -3884,6 +4014,7 @@ This package provides an orphan instance.") (base32 "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) (build-system haskell-build-system) + (properties '((upstream-name . "errors"))) (inputs (list ghc-exceptions ghc-transformers-compat ghc-unexceptionalio ghc-safe)) @@ -3906,6 +4037,7 @@ directly uses the type system, rather than out-of-band exceptions.") (base32 "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz")))) (build-system haskell-build-system) + (properties '((upstream-name . "esqueleto"))) (arguments `(#:tests? #f)) ; TODO: Cannot connect to mysql server. (inputs @@ -3954,6 +4086,7 @@ generated SQL and optimize it for your backend.") (base32 "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghc-exactprint"))) (inputs (list ghc-paths ghc-syb ghc-free)) (native-inputs @@ -3982,6 +4115,7 @@ excluding @file{.lhs} files.") (base32 "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd")))) (build-system haskell-build-system) + (properties '((upstream-name . "exceptions"))) (arguments `(#:cabal-revision ("2" "1154g0dqil2xf4wc1v6gndzhnbf5saf2dzf77c6lcjxssx360m6j"))) @@ -4009,6 +4143,7 @@ for Haskell.") (base32 "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww")))) (build-system haskell-build-system) + (properties '((upstream-name . "executable-path"))) (home-page "https://hackage.haskell.org/package/executable-path") (synopsis "Find out the full path of the executable") (description @@ -4031,6 +4166,7 @@ as invoked.\" This library tries to provide the missing path.") (sha256 (base32 "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc")))) (build-system haskell-build-system) + (properties '((upstream-name . "extensible-exceptions"))) (home-page "https://hackage.haskell.org/package/extensible-exceptions") (synopsis "Extensible exceptions for Haskell") (description @@ -4053,6 +4189,7 @@ versions of GHC (i.e., < 6.10).") (base32 "17fzmxwrv0w7inhq7kia36prc2nsx845r9v56sihqvr17fk2cvpn")))) (build-system haskell-build-system) + (properties '((upstream-name . "extra"))) (inputs (list ghc-clock ghc-semigroups ghc-quickcheck ghc-quickcheck-instances)) @@ -4076,6 +4213,7 @@ this package makes them available back to GHC 7.2.") (sha256 (base32 "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d")))) (build-system haskell-build-system) + (properties '((upstream-name . "fail"))) (arguments `(#:haddock? #f)) ; Package contains no documentation. (home-page "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail") (synopsis "Forward-compatible MonadFail class") @@ -4104,6 +4242,7 @@ when used with GHC versions which already provide the (base32 "1mbnah6n8lig494523czcd95dfn01f438qai9pf20wpa2gdbz4x6")))) (build-system haskell-build-system) + (properties '((upstream-name . "fast-logger"))) (inputs (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat)) (native-inputs @@ -4126,6 +4265,7 @@ when used with GHC versions which already provide the (base32 "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk")))) (build-system haskell-build-system) + (properties '((upstream-name . "feed"))) (arguments `(#:tests? #f)) ; TODO: Fail. (inputs (list ghc-base-compat @@ -4166,6 +4306,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (base32 "04k5grp5d381wkc7sxgcl0sd3z3nlm6l6mmh103vhzh6p49vhs99")))) (build-system haskell-build-system) + (properties '((upstream-name . "fgl"))) (arguments `(#:phases (modify-phases %standard-phases @@ -4201,6 +4342,7 @@ encourages inductive, recursive definitions of graph algorithms.") (base32 "1mykbd1r43gpsn10ys8q3nr0i4wnhn6wq23hcici18mxxji11wkc")))) (build-system haskell-build-system) + (properties '((upstream-name . "fgl-arbitrary"))) (inputs (list ghc-fgl ghc-quickcheck ghc-hspec)) (home-page "https://hackage.haskell.org/package/fgl-arbitrary") @@ -4225,6 +4367,7 @@ for generating graph-like data structures.") (base32 "1pavxj642phrkq67620g10wqykjfhmm9yj2rm8pja83sadfvhrph")))) (build-system haskell-build-system) + (properties '((upstream-name . "file-embed"))) (home-page "https://github.com/snoyberg/file-embed") (synopsis "Use Template Haskell to embed file contents directly") (description @@ -4245,6 +4388,7 @@ embedded in your Haskell code.") (base32 "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) (build-system haskell-build-system) + (properties '((upstream-name . "filemanip"))) (inputs (list ghc-unix-compat)) (home-page "https://github.com/bos/filemanip") @@ -4269,6 +4413,7 @@ file contents, and more.") (base32 "0qrrvbjpjsk75ghqrdqzwqg7wjgm3rr9kk7p04ax98ilv90pm0ip")))) (build-system haskell-build-system) + (properties '((upstream-name . "filepath-bytestring"))) (native-inputs (list ghc-quickcheck)) (home-page "https://hackage.haskell.org/package/filepath-bytestring") @@ -4292,6 +4437,7 @@ file contents, and more.") (base32 "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717")))) (build-system haskell-build-system) + (properties '((upstream-name . "FindBin"))) (home-page "https://github.com/audreyt/findbin") (synopsis "Get the absolute path of the running program") (description @@ -4315,6 +4461,7 @@ an executable.") (base32 "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm")))) (build-system haskell-build-system) + (properties '((upstream-name . "fingertree"))) (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) @@ -4340,6 +4487,7 @@ simple general-purpose data structure\".") (sha256 (base32 "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj")))) (build-system haskell-build-system) + (properties '((upstream-name . "finite-typelits"))) (home-page "https://github.com/mniip/finite-typelits") (synopsis "Finitely many values, indexed by type-level naturals") (description @@ -4360,6 +4508,7 @@ and indexed by type-level naturals.") (base32 "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j")))) (build-system haskell-build-system) + (properties '((upstream-name . "fixed"))) (home-page "https://github.com/ekmett/fixed") (synopsis "Signed 15.16 precision fixed point arithmetic") (description @@ -4382,6 +4531,7 @@ arithmetic.") (base32 "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d")))) (build-system haskell-build-system) + (properties '((upstream-name . "fmlist"))) (home-page "https://github.com/sjoerdvisscher/fmlist") (synopsis "FoldMap lists") (description "FoldMap lists are lists represented by their @@ -4405,6 +4555,7 @@ completely unverified though.") (base32 "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag")))) (build-system haskell-build-system) + (properties '((upstream-name . "foldl"))) (outputs '("out" "static" "doc")) (inputs (list ghc-comonad ghc-contravariant @@ -4438,6 +4589,7 @@ and are often as efficient as hand-written folds.") (base32 "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d")))) (build-system haskell-build-system) + (properties '((upstream-name . "foundation"))) (arguments `(#:phases (modify-phases %standard-phases @@ -4485,6 +4637,7 @@ Foundation has the following goals: (base32 "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j")))) (build-system haskell-build-system) + (properties '((upstream-name . "free"))) (outputs '("out" "static" "doc")) (inputs (list ghc-prelude-extras @@ -4521,6 +4674,7 @@ definition of @code{Monad}.") (base32 "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) (build-system haskell-build-system) + (properties '((upstream-name . "fsnotify"))) (inputs (list ghc-async ghc-unix-compat @@ -4552,6 +4706,7 @@ specific Windows, Mac, and Linux file system event notification.") (base32 "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7")))) (build-system haskell-build-system) + (properties '((upstream-name . "generic-deriving"))) (outputs '("out" "static" "doc")) (inputs (list ghc-th-abstraction)) @@ -4576,6 +4731,7 @@ deriving mechanism in Haskell to arbitrary classes.") (sha256 (base32 "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv")))) (build-system haskell-build-system) + (properties `((upstream-name . "generic-random"))) (inputs (list ghc-quickcheck)) (native-inputs (list ghc-inspection-testing)) @@ -4631,6 +4787,7 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (base32 "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1")))) (build-system haskell-build-system) + (properties '((upstream-name . "generics-sop"))) (outputs '("out" "static" "doc")) (inputs (list ghc-sop-core ghc-th-abstraction)) @@ -4655,6 +4812,7 @@ each constructor are represented using an n-ary product.") (sha256 (base32 "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb")))) (build-system haskell-build-system) + (properties '((upstream-name . "geniplate-mirror"))) (home-page "https://github.com/danr/geniplate") (synopsis "Use Template Haskell to generate Uniplate-like functions") (description @@ -4678,6 +4836,7 @@ geniplate} package, written by Lennart Augustsson.") (base32 "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j")))) (build-system haskell-build-system) + (properties '((upstream-name . "genvalidity"))) (inputs (list ghc-quickcheck ghc-validity)) (native-inputs @@ -4707,6 +4866,7 @@ with the @code{Validity} typeclass.") (base32 "0cvzc4z4771vpycwfgcj0yswyglzl6cl1h2wrfhs224nrcmk5a7z")))) (build-system haskell-build-system) + (properties '((upstream-name . "genvalidity-property"))) (inputs (list ghc-quickcheck ghc-genvalidity @@ -4738,6 +4898,7 @@ properties for functions operating on them.") (base32 "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr")))) (build-system haskell-build-system) + (properties '((upstream-name . "getopt-generics"))) (inputs (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged)) (native-inputs @@ -4760,6 +4921,7 @@ interfaces with ease.") (sha256 (base32 "0cl3lfm6k1h8fxp2vxa6ihfp4v8igkz9h35iwyq2frzm4kdn96d8")))) (build-system haskell-build-system) + (properties '((upstream-name . "gitrev"))) (inputs (list ghc-base-compat)) (home-page "https://github.com/acfoltzer/gitrev") (synopsis "Compile git revision info into Haskell projects") @@ -4784,6 +4946,7 @@ info for more informative bug reports.") (base32 "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a")))) (build-system haskell-build-system) + (properties '((upstream-name . "Glob"))) (inputs (list ghc-dlist ghc-semigroups ghc-transformers-compat)) (native-inputs @@ -4810,6 +4973,7 @@ matching patterns against file paths.") (base32 "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) (build-system haskell-build-system) + (properties '((upstream-name . "GLURaw"))) (inputs (list ghc-openglraw)) (home-page "https://wiki.haskell.org/Opengl") @@ -4834,6 +4998,7 @@ basis for a nicer interface.") (base32 "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn")))) (build-system haskell-build-system) + (properties '((upstream-name . "GLUT"))) (inputs (list ghc-statevar ghc-opengl ghc-openglraw freeglut)) (home-page "https://wiki.haskell.org/Opengl") @@ -4856,6 +5021,7 @@ programs.") (sha256 (base32 "1rfq94lnsyjr8y9p5r56jpllv3p8rvh9xxzjji016b6r5adi8cnb")))) (build-system haskell-build-system) + (properties '((upstream-name . "gnuplot"))) (inputs (list ghc-temporary ghc-utility-ht @@ -4890,6 +5056,7 @@ programs.") (base32 "0l0zxgb938hh09qirggbaskq79mgj3s081cnr42y5vm1rp1jir2s")))) (build-system haskell-build-system) + (properties '((upstream-name . "graphviz"))) (inputs (list ghc-colour ghc-dlist @@ -4933,6 +5100,7 @@ and edge labels with positional information, etc. (base32 "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf")))) (build-system haskell-build-system) + (properties '((upstream-name . "groups"))) (home-page "https://hackage.haskell.org/package/groups") (synopsis "Haskell 98 groups") (description "This package provides Haskell 98 groups. A group is a @@ -4953,6 +5121,7 @@ monoid with invertibility.") (base32 "102x753jbc90lfm9s0ng5kvm0risqwpar331xwsd752as0bms142")))) (build-system haskell-build-system) + (properties '((upstream-name . "gtk2hs-buildtools"))) (inputs (list ghc-random ghc-hashtables)) (native-inputs @@ -4982,6 +5151,7 @@ tools are not needed to actually run Gtk2Hs programs.") (base32 "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli")))) (build-system haskell-build-system) + (properties '((upstream-name . "hackage-security"))) (arguments `(#:cabal-revision ("8" "1xpzcdpfz0agbv75sadsylq6r8pq7zr0pyzbzrz0nz130yixsv5f") @@ -5031,6 +5201,7 @@ Tor project}.") (base32 "1ha4hrnidwkmwalqwd1ixa2933as5n4sj1lvz0cx89a3png7r930")))) (build-system haskell-build-system) + (properties '((upstream-name . "haddock"))) (arguments `(#:tests? #f ; TODO: haddock-test does not build. #:phases @@ -5066,6 +5237,7 @@ Tor project}.") (base32 "1jj2csi85nlywsyvnbwhclfdz27j2kyfbhrl9cm7av0243br9vg1")))) (build-system haskell-build-system) + (properties '((upstream-name . "haddock-api"))) (inputs (list ghc-paths ghc-haddock-library)) (native-inputs @@ -5091,6 +5263,7 @@ documentation-generation tool for Haskell libraries.") (base32 "15ak06q8yp11xz1hwr0sg2jqi3r78p1n89ik05hicqvxl3awf1pq")))) (build-system haskell-build-system) + (properties '((upstream-name . "haddock-library"))) (arguments `(#:tests? #f)) ; TODO: optparse-applicative ==0.15.*, tree-diff ==0.1.* (native-inputs (list ghc-base-compat @@ -5156,6 +5329,7 @@ the ‘haddock’ package.") (base32 "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2")))) (build-system haskell-build-system) + (properties '((upstream-name . "half"))) (native-inputs (list ghc-test-framework ghc-test-framework-quickcheck2 ghc-quickcheck)) @@ -5180,6 +5354,7 @@ computation library for Haskell.") (base32 "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v")))) (build-system haskell-build-system) + (properties '((upstream-name . "happy"))) (arguments `(#:phases (modify-phases %standard-phases @@ -5212,6 +5387,7 @@ Happy works in a similar way to the yacc tool for C.") (base32 "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2")))) (build-system haskell-build-system) + (properties '((upstream-name . "hashable"))) (arguments `(#:tests? #f ; TODO: Tests require random<1.2 #:cabal-revision @@ -5253,6 +5429,7 @@ combine hash values.") (base32 "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh")))) (build-system haskell-build-system) + (properties '((upstream-name . "hashable-time"))) (arguments `(#:cabal-revision ("1" "151gxiprdlj3masa95vvrxal9nwa72n3p1y15xyj4hp7mvvl4s2l"))) @@ -5278,6 +5455,7 @@ combine hash values.") (sha256 (base32 "0vgggm7bqq55zmqj6qji89bfj3k1rdkikkfhyg81vsqf0f3bzhqa")))) (build-system haskell-build-system) + (properties '((upstream-name . "hashtables"))) (inputs (list ghc-hashable ghc-primitive ghc-vector)) (native-inputs @@ -5310,6 +5488,7 @@ a set of wrappers to use the hash tables in the IO monad.") (base32 "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskeline"))) (inputs (list ghc-exceptions)) (native-inputs (list ghc-hunit)) ;; FIXME: Tests failing @@ -5339,6 +5518,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (sha256 (base32 "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskell-lexer"))) (home-page "https://hackage.haskell.org/package/haskell-lexer") (synopsis "Fully compliant Haskell 98 lexer") (description @@ -5360,6 +5540,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (base32 "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskell-src"))) (arguments `(#:cabal-revision ("4" "0cyqdw77clzz7mq0b4c0jg2d1kdz9xii41268w2psmqmfpyn29pc"))) @@ -5391,6 +5572,7 @@ package are to parse or generate Haskell 98 code.") (base32 "01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskell-src-exts"))) (outputs '("out" "static" "doc")) (inputs (list cpphs ghc-happy ghc-pretty-show)) @@ -5419,6 +5601,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (base32 "0fvqi72m74p7q5sbpy8m2chm8a1lgy10mfrcxcz8wrh59vngj0n8")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskell-src-exts-util"))) (inputs (list ghc-data-default ghc-haskell-src-exts ghc-semigroups ghc-uniplate)) @@ -5442,6 +5625,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (base32 "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in")))) (build-system haskell-build-system) + (properties '((upstream-name . "haskell-src-meta"))) (inputs (list ghc-haskell-src-exts ghc-syb ghc-th-orphans)) (native-inputs @@ -5468,6 +5652,7 @@ template-haskell abstract syntax.") (base32 "09p79w16fgpqi6bwq162769xdrnyb7wnmz56k00nz6dj1a0bbbdd")))) (build-system haskell-build-system) + (properties '((upstream-name . "hasktags"))) (arguments `(#:cabal-revision ("1" "0q39ssdgm6lcmqj92frjvr53i34divx53zli0qar39mx8ka1l8ml"))) @@ -5496,6 +5681,7 @@ Vim.") (base32 "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va")))) (build-system haskell-build-system) + (properties '((upstream-name . "hex"))) (home-page "https://hackage.haskell.org/package/hex") (synopsis "Convert strings into hexadecimal and back") (description "This package converts between bytestrings and their @@ -5515,6 +5701,7 @@ hexadecimal string representation.") (base32 "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) (build-system haskell-build-system) + (properties '((upstream-name . "highlighting-kate"))) (inputs (list ghc-diff ghc-regex-pcre-builtin)) (native-inputs @@ -5545,6 +5732,7 @@ descriptions.") (base32 "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7")))) (build-system haskell-build-system) + (properties '((upstream-name . "hindent"))) (arguments `(#:modules ((guix build haskell-build-system) (guix build utils) @@ -5600,6 +5788,7 @@ library and an executable.") (base32 "06pqfikfa61i45g92b65br83kplwmizqkm42yp8d0ddgmq0b21qk")))) (build-system haskell-build-system) + (properties '((upstream-name . "hinotify"))) (inputs (list ghc-async)) (home-page "https://github.com/kolmodin/hinotify.git") @@ -5624,6 +5813,7 @@ accessed or modified.") (base32 "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y")))) (build-system haskell-build-system) + (properties '((upstream-name . "hledger-lib"))) (inputs (list ghc-aeson ghc-aeson-pretty @@ -5681,6 +5871,7 @@ Accounting.") (sha256 (base32 "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg")))) (build-system haskell-build-system) + (properties '((upstream-name . "hmatrix"))) (arguments `(#:extra-directories ("lapack"))) (inputs @@ -5714,6 +5905,7 @@ numerical computations based on BLAS and LAPACK.") (sha256 (base32 "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm")))) (build-system haskell-build-system) + (properties '((upstream-name . "hmatrix-gsl"))) (arguments `(#:extra-directories ("gsl"))) (inputs @@ -5740,6 +5932,7 @@ using GSL.") (sha256 (base32 "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q")))) (build-system haskell-build-system) + (properties '((upstream-name . "hmatrix-gsl-stats"))) (inputs (list ghc-vector ghc-storable-complex ghc-hmatrix gsl)) (native-inputs (list pkg-config)) @@ -5763,6 +5956,7 @@ interface for statistics based on hmatrix and GSL.") (sha256 (base32 "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz")))) (build-system haskell-build-system) + (properties '((upstream-name . "hmatrix-special"))) (inputs (list ghc-hmatrix ghc-hmatrix-gsl)) (home-page "https://github.com/albertoruiz/hmatrix") @@ -5784,6 +5978,7 @@ functions for Haskell.") (base32 "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv")))) (build-system haskell-build-system) + (properties '((upstream-name . "hostname"))) (home-page "https://hackage.haskell.org/package/hostname") (synopsis "Hostname in Haskell") (description "Network.HostName is a simple package providing a means to @@ -5802,6 +5997,7 @@ determine the hostname.") (base32 "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) (build-system haskell-build-system) + (properties '((upstream-name . "hourglass"))) (inputs (list ghc-old-locale)) (native-inputs @@ -5829,6 +6025,7 @@ representations of current time.") (base32 "0gmm6jgi1sgyilphww6apq1x04grqznm7xhyb7g1rj5j7my40ws2")))) (build-system haskell-build-system) + (properties '((upstream-name . "hpack"))) (inputs (list ghc-aeson ghc-bifunctors @@ -5877,6 +6074,7 @@ are described in a file named @code{package.yaml}. Both @code{cabal2nix} and (base32 "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-megaparsec"))) (inputs (list ghc-hspec-expectations ghc-megaparsec)) (native-inputs @@ -5902,6 +6100,7 @@ with Hspec.") (base32 "1wnpy1v5rbii2iwlcc9psnww8pkirv9zl21s64cmbi6q7dv15g3n")))) (build-system haskell-build-system) + (properties '((upstream-name . "hs-bibutils"))) (inputs (list ghc-syb)) (home-page "https://hackage.haskell.org/package/hs-bibutils") (synopsis "Haskell bindings to bibutils") @@ -5924,6 +6123,7 @@ MODS-format XML intermediate.") (sha256 (base32 "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz")))) (build-system haskell-build-system) + (properties '((upstream-name . "hslogger"))) (arguments `(#:cabal-revision ("3" "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"))) @@ -5951,6 +6151,7 @@ handler built in.") (base32 "0p39xm0mmxzs5x6aim11qkb7npn0d9h7li2kwfhry0dijd1vm18i")))) (build-system haskell-build-system) + (properties '((upstream-name . "hslua"))) (arguments `(#:configure-flags '("-fsystem-lua") #:extra-directories ("lua"))) @@ -5985,6 +6186,7 @@ described in @url{https://www.lua.org/}.") (base32 "0hk2splyasbplnggknjhlb423axc5b32xq8aq8zal4vvwlqhzvf1")))) (build-system haskell-build-system) + (properties '((upstream-name . "hslua-module-system"))) (inputs (list ghc-hslua ghc-temporary)) (native-inputs @@ -6012,6 +6214,7 @@ already been loaded before the loader can be added.") (base32 "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl")))) (build-system haskell-build-system) + (properties '((upstream-name . "hslua-module-text"))) (inputs (list ghc-hslua)) (native-inputs @@ -6037,6 +6240,7 @@ for Haskell. The functions provided by this module are @code{upper}, (base32 "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0")))) (build-system haskell-build-system) + (properties '((upstream-name . "HsYAML"))) (arguments `(#:tests? #f ; TODO: Loops. #:cabal-revision @@ -6089,6 +6293,7 @@ for user-defined custom schemas). (base32 "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl")))) (build-system haskell-build-system) + (properties '((upstream-name . "http-api-data"))) (inputs (list ghc-attoparsec ghc-attoparsec-iso8601 ghc-cookie @@ -6126,6 +6331,7 @@ Haskell data types to and from HTTP API data.") (base32 "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f")))) (build-system haskell-build-system) + (properties '((upstream-name . "ieee754"))) (home-page "https://github.com/patperry/hs-ieee754") (synopsis "Utilities for dealing with IEEE floating point numbers") (description "Utilities for dealing with IEEE floating point numbers, @@ -6146,6 +6352,7 @@ for general types.") (base32 "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) (build-system haskell-build-system) + (properties '((upstream-name . "IfElse"))) (home-page "https://hackage.haskell.org/package/IfElse") (synopsis "Monadic control flow with anaphoric variants") (description "This library provides functions for control flow inside of @@ -6166,6 +6373,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (base32 "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51")))) (build-system haskell-build-system) + (properties '((upstream-name . "indents"))) ;; This package needs an older version of tasty. (arguments '(#:tests? #f)) (inputs @@ -6193,6 +6401,7 @@ lines continued at an indented level below.") (base32 "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj")))) (build-system haskell-build-system) + (properties '((upstream-name . "infer-license"))) (inputs (list ghc-text-metrics)) (native-inputs @@ -6215,6 +6424,7 @@ license from a given license file.") (sha256 (base32 "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l")))) (build-system haskell-build-system) + (properties '((upstream-name . "ini"))) (native-inputs (list ghc-hspec)) (inputs (list ghc-attoparsec ghc-unordered-containers)) @@ -6239,6 +6449,7 @@ read and write configuration files in the simple INI format.") (base32 "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i")))) (build-system haskell-build-system) + (properties '((upstream-name . "inline-c"))) (inputs (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers ghc-unordered-containers ghc-vector)) @@ -6267,6 +6478,7 @@ minimal overhead. No FFI required.") (base32 "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0")))) (build-system haskell-build-system) + (properties '((upstream-name . "inline-c-cpp"))) (inputs (list ghc-inline-c ghc-safe-exceptions)) (native-inputs @@ -6292,6 +6504,7 @@ minimal overhead. No FFI required.") (base32 "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv")))) (build-system haskell-build-system) + (properties '((upstream-name . "integer-logarithms"))) (arguments `(#:tests? #f)) ; TODO: Needs tasty<1.4 (native-inputs (list ghc-quickcheck @@ -6332,6 +6545,7 @@ in migrated modules.") (base32 "03jrkj9c62w0c2awym8mhpsgpd0jffl50cqwfrm7bbdfhd8dsxi7")))) (build-system haskell-build-system) + (properties '((upstream-name . "interpolate"))) (inputs (list ghc-haskell-src-meta)) (native-inputs @@ -6356,6 +6570,7 @@ Haskell.") (base32 "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld")))) (build-system haskell-build-system) + (properties '((upstream-name . "IntervalMap"))) (native-inputs (list ghc-quickcheck)) (home-page "https://www.chr-breitkopf.de/comp/IntervalMap") @@ -6379,6 +6594,7 @@ example code on the home page for a quick introduction.") (base32 "1qibvgys8lw61x9na3iy3dcglyj9qyhcbfc00glnagl7cbk1shlv")))) (build-system haskell-build-system) + (properties '((upstream-name . "intervals"))) (inputs (list ghc-distributive)) (native-inputs @@ -6403,6 +6619,7 @@ which represets a closed, convex set of floating point values.") (base32 "1jlp0gbfjsx7k08275djh8m3v4rpg8llw5gdkg9s9qfx0lc0mymr")))) (build-system haskell-build-system) + (properties '((upstream-name . "invariant"))) (inputs (list ghc-bifunctors ghc-comonad @@ -6436,6 +6653,7 @@ functors). For more information, see Edward Kmett's article (base32 "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny")))) (build-system haskell-build-system) + (properties '((upstream-name . "io-streams"))) (inputs (list ghc-attoparsec ghc-bytestring-builder @@ -6470,6 +6688,7 @@ primitives for I/O using streams.") (base32 "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp")))) (build-system haskell-build-system) + (properties '((upstream-name . "io-streams-haproxy"))) (arguments `(#:cabal-revision ("3" "02k9halblgnynlm781ahc81yxla8z7cck1gikm8555v78rf5hv7x"))) @@ -6501,6 +6720,7 @@ through a forwarding proxy that is configured to speak this protocol.") (base32 "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90")))) (build-system haskell-build-system) + (properties '((upstream-name . "iproute"))) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, ; exported by ghc-byteorder. Doctest issue. (inputs @@ -6525,6 +6745,7 @@ removed. Both IPv4 and IPv6 are supported.") (base32 "0qky4l5aaiq7ypwbxh0mr7s572290fi596f18dg68qpyzc49a9kx")))) (build-system haskell-build-system) + (properties '((upstream-name . "ipynb"))) (inputs (list ghc-unordered-containers ghc-base64-bytestring ghc-aeson ghc-semigroups)) @@ -6549,6 +6770,7 @@ instances for conversion to and from JSON .ipynb files.") (sha256 (base32 "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz")))) (build-system haskell-build-system) + (properties '((upstream-name . "iwlib"))) (arguments `(#:extra-directories ("wireless-tools"))) (inputs @@ -6574,6 +6796,7 @@ supported systems.") (base32 "1fjnd2r4gl2hfqx158db3cn3rsyin4ch7rf9scb2hcy90cy6l10c")))) (build-system haskell-build-system) + (properties '((upstream-name . "json"))) (arguments `(#:cabal-revision ("1" "16fp0y95gaibjravzj1hxdkng1cr8zqjqzd14m48kf4jrq3npz6r"))) @@ -6599,6 +6822,7 @@ Notation, JSON} is a lightweight data-interchange format.") (base32 "1f8giivsqxma19ax78dr7j4gir12iyfqn2mlsd27zzl8dn7dy6w1")))) (build-system haskell-build-system) + (properties '((upstream-name . "JuicyPixels"))) (outputs '("out" "static" "doc")) (inputs (list ghc-zlib ghc-vector ghc-primitive)) @@ -6624,6 +6848,7 @@ TIFF and GIF formats.") (base32 "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml")))) (build-system haskell-build-system) + (properties '((upstream-name . "kan-extensions"))) (inputs (list ghc-adjunctions ghc-comonad @@ -6653,6 +6878,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (base32 "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk")))) (build-system haskell-build-system) + (properties '((upstream-name . "language-c"))) (inputs (list ghc-syb)) (native-inputs (list ghc-happy ghc-alex)) @@ -6677,6 +6903,7 @@ and a large set of GNU extensions.") (base32 "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1")))) (build-system haskell-build-system) + (properties '((upstream-name . "language-glsl"))) (inputs (list ghc-prettyclass)) (arguments `(#:tests? #f @@ -6703,6 +6930,7 @@ representation, parsing, and pretty-printing of GLSL 1.50 code.") (base32 "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl")))) (build-system haskell-build-system) + (properties '((upstream-name . "language-haskell-extract"))) (arguments `(#:cabal-revision ("1" "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip") @@ -6740,6 +6968,7 @@ with @code{wc} (for a web service).") (base32 "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j")))) (build-system haskell-build-system) + (properties '((upstream-name . "lens"))) (arguments `(#:tests? #f ; TODO: Needs vector<0.12.2 #:cabal-revision @@ -6801,6 +7030,7 @@ indexed variants.") (base32 "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r")))) (build-system haskell-build-system) + (properties '((upstream-name . "lens-family-core"))) (home-page "https://hackage.haskell.org/package/lens-family-core") (synopsis "Haskell 98 Lens Families") @@ -6835,6 +7065,7 @@ lenses and traversals for those who require Haskell 98.") (base32 "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28")))) (build-system haskell-build-system) + (properties '((upstream-name . "libffi"))) (native-inputs (list pkg-config)) (inputs (list libffi)) (home-page "https://hackage.haskell.org/package/libffi") @@ -6859,6 +7090,7 @@ to be called from Haskell.") (base32 "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh")))) (build-system haskell-build-system) + (properties '((upstream-name . "libmpd"))) (inputs (list ghc-attoparsec ghc-data-default-class ghc-network ghc-safe-exceptions ghc-utf8-string)) @@ -6883,6 +7115,7 @@ Music Player Daemon.") (base32 "178v4f7q9ndqmlhg2vhlk6ifm3ilajlrz8iw84vggzs7rp0fnlx0")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghc-lib-parser"))) (outputs '("out" "static" "doc")) ; documentation is 39M (native-inputs (list ghc-alex ghc-happy)) @@ -6906,6 +7139,7 @@ compiler versions.") (base32 "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) (build-system haskell-build-system) + (properties '((upstream-name . "libxml"))) (inputs (list libxml2)) (arguments @@ -6938,6 +7172,7 @@ compiler versions.") (delete-file-recursively "libyaml_src") #t)))) (build-system haskell-build-system) + (properties '((upstream-name . "libyaml"))) (arguments `(#:configure-flags `("--flags=system-libyaml") #:extra-directories ("libyaml+static"))) @@ -6963,6 +7198,7 @@ LibYAML C library.") (base32 "0j4f5471qfxkxy84ri87bcvp30ikh4m30imcggwn8m5v8igp218d")))) (build-system haskell-build-system) + (properties '((upstream-name . "lifted-async"))) (inputs (list ghc-async ghc-lifted-base @@ -6996,6 +7232,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (base32 "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) (build-system haskell-build-system) + (properties '((upstream-name . "lifted-base"))) (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. (inputs (list ghc-transformers-base ghc-monad-control ghc-transformers-compat @@ -7022,6 +7259,7 @@ Kaseorg.") (base32 "0ax6prmc7b53w0lz5ddc40wrjj9bm7wldpp57283gx9hdf8qrb35")))) (build-system haskell-build-system) + (properties '((upstream-name . "linear"))) (inputs (list ghc-adjunctions ghc-base-orphans @@ -7067,6 +7305,7 @@ vector spaces.") (base32 "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd")))) (build-system haskell-build-system) + (properties '((upstream-name . "ListLike"))) (inputs (list ghc-vector ghc-dlist @@ -7100,6 +7339,7 @@ can handle infinite lists.") (base32 "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf")))) (build-system haskell-build-system) + (properties '((upstream-name . "llvm-hs-pure"))) (inputs (list ghc-attoparsec ghc-fail ghc-unordered-containers)) (native-inputs @@ -7125,6 +7365,7 @@ llvm-hs-pure does not require LLVM to be available.") (base32 "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00")))) (build-system haskell-build-system) + (properties '((upstream-name . "llvm-hs"))) (inputs (list ghc-attoparsec ghc-exceptions ghc-utf8-string ghc-llvm-hs-pure llvm-9)) @@ -7159,6 +7400,7 @@ into Haskell.") (base32 "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) (build-system haskell-build-system) + (properties '((upstream-name . "logging-facade"))) (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://hackage.haskell.org/package/logging-facade") @@ -7183,6 +7425,7 @@ back-ends.") (base32 "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7")))) (build-system haskell-build-system) + (properties '((upstream-name . "logict"))) (inputs (list ghc-fail)) (native-inputs (list ghc-async ghc-tasty ghc-tasty-hunit)) @@ -7210,6 +7453,7 @@ online}.") (base32 "0nky4pqxd6828kg3js90ks6r3hxs5x48ibfz37pw2dr7y1nygq21")))) (build-system haskell-build-system) + (properties '((upstream-name . "lucid"))) (inputs (list ghc-blaze-builder ghc-hashable ghc-mmorph ghc-unordered-containers)) @@ -7246,6 +7490,7 @@ Same combinator can be used for attributes and elements (base32 "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) (build-system haskell-build-system) + (properties '((upstream-name . "lzma"))) (arguments '(#:tests? #f ; requires older versions of QuickCheck and tasty. #:cabal-revision @@ -7274,6 +7519,7 @@ monadic incremental interface is provided as well.") (base32 "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb")))) (build-system haskell-build-system) + (properties '((upstream-name . "lzma-conduit"))) (inputs (list ghc-conduit ghc-lzma ghc-resourcet)) (native-inputs @@ -7304,6 +7550,7 @@ compression algorithm used in the @code{.xz} file format.") (base32 "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j")))) (build-system haskell-build-system) + (properties '((upstream-name . "magic"))) (home-page "https://hackage.haskell.org/package/magic") (synopsis "Interface to C file/magic library") (description @@ -7327,6 +7574,7 @@ than its name.") (base32 "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38")))) (build-system haskell-build-system) + (properties '((upstream-name . "managed"))) (home-page "https://hackage.haskell.org/package/managed") (synopsis "Monad for managed values") (description @@ -7361,6 +7609,7 @@ orphan instances (base32 "0njzn56m8z6lm70xyixbylbnpjz1gk7x8vdsdvi3qld9m66gc3n7")))) (build-system haskell-build-system) + (properties '((upstream-name . "markdown-unlit"))) (inputs (list ghc-base-compat ghc-hspec @@ -7389,6 +7638,7 @@ same time is a literate Haskell program.") (base32 "18y1hlc8p6yyxa14zdbm84aaq58kksbrlfp3rj2bd4ilsb00mrf1")))) (build-system haskell-build-system) + (properties '((upstream-name . "math-functions"))) (arguments `(#:tests? #f)) ; FIXME: 1 test fails. (inputs (list ghc-data-default-class ghc-vector ghc-vector-th-unbox)) @@ -7420,6 +7670,7 @@ functions are often useful in statistical and numerical computing.") (base32 "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j")))) (build-system haskell-build-system) + (properties '((upstream-name . "megaparsec"))) (inputs (list ghc-case-insensitive ghc-parser-combinators ghc-scientific)) (native-inputs @@ -7444,6 +7695,7 @@ speed, flexibility, and quality of parse errors.") (base32 "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3")))) (build-system haskell-build-system) + (properties '((upstream-name . "memory"))) (inputs (list ghc-basement ghc-foundation)) (native-inputs @@ -7473,6 +7725,7 @@ set, memory copy, ..) and more") (base32 "0lxsarhyhhkp58wpbp7b08scmjxq7s46jfl9vhp2yfq973hz0kaq")))) (build-system haskell-build-system) + (properties '((upstream-name . "MemoTrie"))) (inputs (list ghc-newtype-generics)) (home-page "https://github.com/conal/MemoTrie") @@ -7495,6 +7748,7 @@ efficient memo functions using tries.") (base32 "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens"))) (home-page "https://github.com/monadfix/microlens") (synopsis "Provides a tiny lens Haskell library with no dependencies") @@ -7520,6 +7774,7 @@ stripped. As the result, this package has no dependencies.") (base32 "074mzpk7av6i0xf7xy42jpzgljlmyw805md1vz4sqy85m99f0ikr")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens-aeson"))) (inputs (list ghc-aeson ghc-attoparsec @@ -7551,6 +7806,7 @@ microlens.") (base32 "1r6x788br3f9rksj0dmk1nyh5mfvd9zzasclf1mi3rxhb7c0j926")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens-ghc"))) (inputs (list ghc-microlens)) (home-page "https://github.com/monadfix/microlens") (synopsis "Use @code{microlens} with GHC libraries like @code{array}") @@ -7577,6 +7833,7 @@ microlens} family; see the readme (base32 "0ijy7xyd5lbc3calhcrhy8czkf3fjcxrv68p7kd2a5b352rfi7fp")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens-mtl"))) (inputs (list ghc-microlens ghc-transformers-compat)) (home-page "https://github.com/monadfix/microlens") @@ -7604,6 +7861,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (base32 "0yf0z0glq2d6mpclzswc64h9w2cck4fd8l8ffm89pyb0a5n8m4c7")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens-platform"))) (inputs (list ghc-hashable ghc-microlens @@ -7647,6 +7905,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (base32 "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c")))) (build-system haskell-build-system) + (properties '((upstream-name . "microlens-th"))) (inputs (list ghc-microlens ghc-th-abstraction)) (native-inputs (list ghc-tagged)) (home-page @@ -7672,6 +7931,7 @@ used both from lens and microlens).") (base32 "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw")))) (build-system haskell-build-system) + (properties '((upstream-name . "MissingH"))) (arguments `(#:phases (modify-phases %standard-phases @@ -7711,6 +7971,7 @@ portable and easy to use.") (base32 "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q")))) (build-system haskell-build-system) + (properties '((upstream-name . "mmap"))) (home-page "https://hackage.haskell.org/package/mmap") (synopsis "Memory mapped files for Haskell") (description @@ -7735,6 +7996,7 @@ do on-demand loading.") (base32 "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6")))) (build-system haskell-build-system) + (properties '((upstream-name . "mmorph"))) (inputs (list ghc-transformers-compat)) (home-page "https://hackage.haskell.org/package/mmorph") @@ -7756,6 +8018,7 @@ manipulating monad transformer stacks.") (base32 "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) (build-system haskell-build-system) + (properties '((upstream-name . "mockery"))) (inputs (list ghc-temporary ghc-logging-facade ghc-base-compat)) (native-inputs @@ -7780,6 +8043,7 @@ manipulating monad transformer stacks.") (base32 "0g3if9km8ik80bcy130a826ig9wlk4bnf0qli3vmwdwr9nhaw2xf")))) (build-system haskell-build-system) + (properties '((upstream-name . "monad-control"))) (inputs (list ghc-transformers-base ghc-transformers-compat)) (home-page "https://github.com/basvandijk/monad-control") @@ -7804,6 +8068,7 @@ a subset of @code{MonadBase} into which generic control operations such as (base32 "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh")))) (build-system haskell-build-system) + (properties '((upstream-name . "monad-logger"))) (inputs (list ghc-transformers-compat ghc-stm-chans ghc-lifted-base @@ -7839,6 +8104,7 @@ code locations of messages.") (base32 "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky")))) (build-system haskell-build-system) + (properties '((upstream-name . "monad-loops"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/mokus0/monad-loops") (synopsis "Monadic loops for Haskell") @@ -7860,6 +8126,7 @@ operators for looping.") (base32 "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2")))) (build-system haskell-build-system) + (properties '((upstream-name . "monad-par"))) (arguments `(#:tests? #f ; TODO: ghc-test-framework-th does not build. #:cabal-revision @@ -7896,6 +8163,7 @@ that are much lighter weight than IO-threads.") (base32 "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2")))) (build-system haskell-build-system) + (properties '((upstream-name . "monad-par-extras"))) (inputs (list ghc-abstract-par ghc-cereal ghc-random)) (home-page "https://github.com/simonmar/monad-par") (synopsis "Combinators and extra features for Par monads for Haskell") @@ -7917,6 +8185,7 @@ and other added capabilities layered on top of the @code{Par} monad.") (base32 "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617")))) (build-system haskell-build-system) + (properties '((upstream-name . "MonadRandom"))) (inputs (list ghc-transformers-compat ghc-primitive ghc-fail ghc-random)) (home-page "https://github.com/byorgey/MonadRandom") @@ -7939,6 +8208,7 @@ which consume random values.") (base32 "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794")))) (build-system haskell-build-system) + (properties '((upstream-name . "monads-tf"))) (home-page "https://hackage.haskell.org/package/monads-tf") (synopsis "Monad classes, using type families") (description @@ -7962,6 +8232,7 @@ the @code{mtl-tf} package.") (base32 "1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq")))) (build-system haskell-build-system) + (properties '((upstream-name . "mono-traversable"))) (outputs '("out" "static" "doc")) (inputs (list ghc-unordered-containers ghc-hashable ghc-vector ghc-vector-algorithms ghc-split)) @@ -7989,6 +8260,7 @@ data structures as non-empty.") (base32 "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1")))) (build-system haskell-build-system) + (properties '((upstream-name . "monoid-extras"))) (inputs (list ghc-groups ghc-semigroupoids)) (home-page "https://hackage.haskell.org/package/monoid-extras") @@ -8014,6 +8286,7 @@ semi-direct products, \"deletable\" monoids, \"split\" monoids, and (base32 "1hnm31pqcffphyc463wf0vbik9fzm5lb2r4wjdc1y4dqzmjdzz37")))) (build-system haskell-build-system) + (properties '((upstream-name . "mountpoints"))) (home-page "https://hackage.haskell.org/package/mountpoints") (synopsis "Haskell library for listing mount points") @@ -8036,6 +8309,7 @@ currently mounted filesystems.") (base32 "17iszr5yb4f17g8mq6i74hsamii8z6m2qfsmgzs78mhiwa7kjm8r")))) (build-system haskell-build-system) + (properties '((upstream-name . "mtl-compat"))) (home-page "https://github.com/haskell-compat/mtl-compat") (synopsis @@ -8068,6 +8342,7 @@ the top of your file to get all of the ExceptT instances in scope.") (sha256 (base32 "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9")))) (build-system haskell-build-system) + (properties '((upstream-name . "murmur-hash"))) (home-page "https://github.com/nominolo/murmur-hash") (synopsis "MurmurHash2 implementation for Haskell") (description @@ -8092,6 +8367,7 @@ binding.") (base32 "0ny2mw4am24d6ykrm8rbcjnrq6p2cjmzjb4m6qfk54wfdxflvmim")))) (build-system haskell-build-system) + (properties '((upstream-name . "mwc-random"))) (inputs (list ghc-primitive ghc-vector ghc-math-functions)) (arguments @@ -8127,6 +8403,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (base32 "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) (build-system haskell-build-system) + (properties '((upstream-name . "nats"))) (arguments `(#:haddock? #f)) (inputs (list ghc-hashable)) @@ -8157,6 +8434,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (base32 "0gsyyaqyh5r9zc0rhwpj5spyd6i4w2vj61h4nihgmmh0yyqvf3z5")))) (build-system haskell-build-system) + (properties '((upstream-name . "ncurses"))) (arguments '(#:extra-directories ("ncurses") #:phases @@ -8197,6 +8475,7 @@ ncurses.") (base32 "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp")))) (build-system haskell-build-system) + (properties '((upstream-name . "network"))) ;; The regression tests depend on an unpublished module. (arguments `(#:tests? #f)) (native-inputs @@ -8221,6 +8500,7 @@ ncurses.") (base32 "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-bsd"))) (arguments `(#:cabal-revision ("4" "1gd9a8j7fwg0jz0s6il5fk9sl0hm19ja1w56ix51wa0qi2h5x56d"))) @@ -8246,6 +8526,7 @@ network database () API.") (base32 "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-byte-order"))) (native-inputs (list ghc-doctest)) (home-page "https://hackage.haskell.org/package/network-byte-order") @@ -8268,6 +8549,7 @@ byte order.") (base32 "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-info"))) (home-page "https://github.com/jystic/network-info") (synopsis "Access the local computer's basic network configuration") (description "This Haskell library provides simple read-only access to the @@ -8291,6 +8573,7 @@ IPv4, IPv6 and MAC addresses.") (base32 "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-multicast"))) (inputs (list ghc-network ghc-network-bsd)) (home-page @@ -8321,6 +8604,7 @@ sending UDP datagrams over multicast (class D) addresses.") (base32 "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap")))) (build-system haskell-build-system) + (properties '((upstream-name . "network-uri"))) (inputs (list ghc-th-compat)) (native-inputs @@ -8348,6 +8632,7 @@ sending UDP datagrams over multicast (class D) addresses.") (base32 "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa")))) (build-system haskell-build-system) + (properties '((upstream-name . "newtype-generics"))) (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://github.com/sjakobi/newtype-generics") @@ -8374,6 +8659,7 @@ and an alternative to newtype-th.") (base32 "0f01q916dzkl1i0v15qrw9cviycki5g3fgi6x8gs45iwbzssq52n")))) (build-system haskell-build-system) + (properties '((upstream-name . "non-negative"))) (inputs (list ghc-semigroups ghc-utility-ht ghc-quickcheck)) (home-page "https://hackage.haskell.org/package/non-negative") @@ -8398,6 +8684,7 @@ of Peano numbers).") (base32 "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb")))) (build-system haskell-build-system) + (properties '((upstream-name . "nonce"))) (arguments `(#:cabal-revision ("2" "09xvg4lpmb1hw153afhbjrdg9v3npfwpdfhpv5y8b0qvb4zi3n9q"))) @@ -8429,6 +8716,7 @@ package are usable on your design.") (base32 "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067")))) (build-system haskell-build-system) + (properties '((upstream-name . "numeric-extras"))) (home-page "https://github.com/ekmett/numeric-extras") (synopsis "Useful tools from the C standard library") (description "This library provides some useful tools from the C @@ -8450,6 +8738,7 @@ standard library.") (base32 "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) (build-system haskell-build-system) + (properties '((upstream-name . "ObjectName"))) (home-page "https://hackage.haskell.org/package/ObjectName") (synopsis "Helper library for Haskell OpenGL") (description "This tiny package contains the class ObjectName, which @@ -8472,6 +8761,7 @@ OpenAL.") (sha256 (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) + (properties '((upstream-name . "old-locale"))) (arguments `(#:cabal-revision ("2" "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"))) @@ -8497,6 +8787,7 @@ date and time formats.") (base32 "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) (build-system haskell-build-system) + (properties '((upstream-name . "old-time"))) (arguments `(#:cabal-revision ("2" "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"))) @@ -8524,6 +8815,7 @@ old @code{time} library. For new projects, the newer (base32 "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb")))) (build-system haskell-build-system) + (properties '((upstream-name . "Only"))) (arguments `(#:cabal-revision ("1" @@ -8556,6 +8848,7 @@ traditionally so named type-wrapper for attaching typeclass instances.") (base32 "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as")))) (build-system haskell-build-system) + (properties '((upstream-name . "OpenGL"))) (arguments `(#:cabal-revision ("1" "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741"))) @@ -8583,6 +8876,7 @@ version 1.3).") (base32 "0gmsmysqzpm13qnyq4vvqxm4dzw25nayfd9wi5x645pympm6jqbm")))) (build-system haskell-build-system) + (properties '((upstream-name . "OpenGLRaw"))) (arguments `(#:extra-directories ("glu"))) (inputs @@ -8613,6 +8907,7 @@ found at runtime, a userError is thrown.") (base32 "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i")))) (build-system haskell-build-system) + (properties '((upstream-name . "operational"))) (inputs (list ghc-random)) (home-page "http://wiki.haskell.org/Operational") @@ -8640,6 +8935,7 @@ DSLs, etc.") (base32 "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f")))) (build-system haskell-build-system) + (properties '((upstream-name . "optional-args"))) (home-page "https://hackage.haskell.org/package/optional-args") (synopsis "Optional function arguments") @@ -8662,6 +8958,7 @@ arguments.") (base32 "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) (build-system haskell-build-system) + (properties '((upstream-name . "options"))) (arguments `(#:phases (modify-phases %standard-phases @@ -8720,6 +9017,7 @@ easily work with command-line options.") (base32 "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2")))) (build-system haskell-build-system) + (properties '((upstream-name . "optparse-applicative"))) (arguments `(#:cabal-revision ("1" "0401ik87gm9gjpch6lmkczygp59na3f1j7bcs6mc2r929c2xgsqn"))) @@ -8767,6 +9065,7 @@ command line options in Haskell.") (sha256 (base32 "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w")))) (build-system haskell-build-system) + (properties '((upstream-name . "jira-wiki-markup"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/tarleb/jira-wiki-markup") @@ -8789,6 +9088,7 @@ to other formats.") (sha256 (base32 "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw")))) (build-system haskell-build-system) + (properties '((upstream-name . "emojis"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/jgm/emojis#readme") @@ -8822,6 +9122,7 @@ require aeson (sha256 (base32 "0kbxin1q8xj9sgdl185gncrdjwcfzndp8sl5qll8y93l60yq8dxi")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-conversions"))) (inputs (list ghc-base16-bytestring ghc-base64-bytestring ghc-errors)) (native-inputs @@ -8846,6 +9147,7 @@ require aeson (base32 "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-short"))) (inputs (list ghc-hashable)) (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit @@ -8879,6 +9181,7 @@ plus the length of the UTF-8 encoded payload.") (sha256 (base32 "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-zipper"))) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) (inputs @@ -8908,6 +9211,7 @@ Implementations using both of these examples are provided.") (sha256 (base32 "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp")))) (build-system haskell-build-system) + (properties '((upstream-name . "doclayout"))) (inputs (list ghc-safe ghc-emojis)) (native-inputs @@ -8934,6 +9238,7 @@ code. It was designed for use in @code{Pandoc}.") (base32 "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2")))) (build-system haskell-build-system) + (properties '((upstream-name . "pandoc"))) (arguments `(#:phases (modify-phases %standard-phases @@ -9153,6 +9458,7 @@ getDataFileName name = do (base32 "0z2j306jsiriwhib0201hsllwyck7qcvqci5c25frwsmknr3mls2")))) (build-system haskell-build-system) + (properties '((upstream-name . "pandoc-types"))) (arguments `(#:phases (modify-phases %standard-phases @@ -9206,6 +9512,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") (base32 "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) (build-system haskell-build-system) + (properties '((upstream-name . "parallel"))) (arguments `(#:cabal-revision ("3" "1lv3y3zrdfc09nsiqxg7mzcahgnqi6z9caspd4lvifhhfrqy2722"))) @@ -9251,6 +9558,7 @@ is also parametric in the input stream type.") (sha256 (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) (build-system haskell-build-system) + (properties '((upstream-name . "parsec-numbers"))) (home-page "https://hackage.haskell.org/package/parsec-numbers") (synopsis "Utilities for parsing numbers from strings") (description @@ -9272,6 +9580,7 @@ is also parametric in the input stream type.") (base32 "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3")))) (build-system haskell-build-system) + (properties '((upstream-name . "parser-combinators"))) (home-page "https://github.com/mrkkrp/parser-combinators") (synopsis "Commonly useful parser combinators") (description @@ -9294,6 +9603,7 @@ combinators.") (base32 "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p")))) (build-system haskell-build-system) + (properties '((upstream-name . "parsers"))) (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy ; -package attoparsec-0.13.0.1" (inputs @@ -9327,6 +9637,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (base32 "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4")))) (build-system haskell-build-system) + (properties '((upstream-name . "path"))) (arguments `(#:cabal-revision ("1" "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja"))) @@ -9362,6 +9673,7 @@ invariants.") (base32 "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n")))) (build-system haskell-build-system) + (properties '((upstream-name . "path-io"))) (arguments `(#:cabal-revision ("3" "0rsr9r2175lf7zcz2sns0mhxkvl21pm50sjidjq5v75nalrsw6rp"))) @@ -9399,6 +9711,7 @@ files/directories, and more.") (base32 "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghc-paths"))) (home-page "https://github.com/simonmar/ghc-paths") (synopsis "Knowledge of GHC's installation directories") @@ -9420,6 +9733,7 @@ files/directories, and more.") (base32 "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i")))) (build-system haskell-build-system) + (properties '((upstream-name . "patience"))) (home-page "https://hackage.haskell.org/package/patience") (synopsis "Patience diff and longest increasing subsequence") (description @@ -9445,6 +9759,7 @@ performance, nice output for humans, and simplicity of implementation.") (base32 "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg")))) (build-system haskell-build-system) + (properties '((upstream-name . "pattern-arrows"))) (home-page "https://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html") (synopsis "Arrows for Pretty Printing") @@ -9468,6 +9783,7 @@ rules.") (base32 "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn")))) (build-system haskell-build-system) + (properties '((upstream-name . "pcre-light"))) (arguments `(#:extra-directories ("pcre"))) (inputs @@ -9496,6 +9812,7 @@ syntax and semantics as Perl 5.") (base32 "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent"))) (inputs (list ghc-aeson ghc-attoparsec @@ -9539,6 +9856,7 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") (base32 "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-sqlite"))) (inputs (list ghc-persistent ghc-aeson @@ -9582,6 +9900,7 @@ system dependencies.") (base32 "0c9cs27j43azimj74s2m2cdks87682ibpy1xbyzvygipgmb8nj6w")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-template"))) (inputs (list ghc-persistent ghc-aeson @@ -9613,6 +9932,7 @@ functions for the ghc-persistent package.") (base32 "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-test"))) (inputs (list ghc-aeson ghc-blaze-html @@ -9654,6 +9974,7 @@ libraries.") (base32 "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg")))) (build-system haskell-build-system) + (properties '((upstream-name . "pgp-wordlist"))) (inputs (list ghc-vector)) (native-inputs @@ -9689,6 +10010,7 @@ For further information, see (base32 "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl")))) (build-system haskell-build-system) + (properties '((upstream-name . "pipes"))) (inputs (list ghc-exceptions ghc-mmorph ghc-void ghc-semigroups)) (native-inputs @@ -9727,6 +10049,7 @@ dependencies (base32 "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l")))) (build-system haskell-build-system) + (properties '((upstream-name . "pointedlist"))) (home-page "https://hackage.haskell.org/package/pointedlist") (synopsis @@ -9753,6 +10076,7 @@ other end when progressing past the actual edge.") (base32 "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w")))) (build-system haskell-build-system) + (properties '((upstream-name . "polyparse"))) (arguments `(#:cabal-revision ("2" "1n5q6w7x46cvcq7j1pg9jx9h72vcsc5di35rbkmwgjw6pq4w4gfl"))) @@ -9782,6 +10106,7 @@ Strings.") (base32 "1sz7hlnfd86hbwrgqxczmsjsl1ki0ryi9dgzscxlsgjkdgcdia2p")))) (build-system haskell-build-system) + (properties '((upstream-name . "pqueue"))) (native-inputs (list ghc-quickcheck)) (home-page "https://hackage.haskell.org/package/pqueue") @@ -9806,6 +10131,7 @@ based on a binomial heap.") (base32 "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9")))) (build-system haskell-build-system) + (properties '((upstream-name . "prelude-extras"))) (home-page "https://github.com/ekmett/prelude-extras") (synopsis "Higher order versions of Prelude classes") (description "This library provides higher order versions of @@ -9826,6 +10152,7 @@ reduce @code{UndecidableInstances}.") (base32 "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5")))) (build-system haskell-build-system) + (properties '((upstream-name . "prettyclass"))) (home-page "https://hackage.haskell.org/package/prettyclass") (synopsis "Pretty printing class similar to Show") (description "This package provides a pretty printing class similar @@ -9848,6 +10175,7 @@ types.") (sha256 (base32 "0i8b3wjjpdvp5b857j065jwyrpgcnzgk75imrj7i3yhl668acvjy")))) (build-system haskell-build-system) + (properties '((upstream-name . "prettyprinter"))) (native-inputs (list ghc-doctest ghc-pgp-wordlist @@ -9878,6 +10206,7 @@ clashes, @code{Text}-based, extensible.") (sha256 (base32 "1cqxbcmy9ykk4pssq5hp6h51g2h547zfz549awh0c1fni8q3jdw1")))) (build-system haskell-build-system) + (properties '((upstream-name . "prettyprinter-ansi-terminal"))) (inputs (list ghc-ansi-terminal ghc-prettyprinter)) (native-inputs (list ghc-doctest)) @@ -9902,6 +10231,7 @@ clashes, @code{Text}-based, extensible.") (base32 "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7")))) (build-system haskell-build-system) + (properties '((upstream-name . "pretty-hex"))) (home-page "https://github.com/GaloisInc/hexdump") (synopsis "Haskell library for hex dumps of ByteStrings") (description "This Haskell library generates pretty hex dumps of @@ -9921,6 +10251,7 @@ ByteStrings in the style of other common *nix hex dump tools.") (base32 "1lkgvbv00v1amvpqli6y4dzsbs25l4v3wlagvhwx8qxhw2390zrh")))) (build-system haskell-build-system) + (properties '((upstream-name . "pretty-show"))) (inputs (list ghc-haskell-lexer ghc-happy)) (home-page "https://wiki.github.com/yav/pretty-show") @@ -9948,6 +10279,7 @@ examination.") (sha256 (base32 "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw")))) (build-system haskell-build-system) + (properties '((upstream-name . "pretty-simple"))) (inputs (list ghc-aeson ghc-optparse-applicative @@ -9976,6 +10308,7 @@ Show instance.") (base32 "1facmq2wxhn5mbgd209zz5swyaw1q970fv3hd84klaxrhabqaxwi")))) (build-system haskell-build-system) + (properties '((upstream-name . "primitive"))) (arguments `(#:tests? #f)) ; TODO: Loops. ; (native-inputs ; `(("ghc-base-orphans" ,ghc-base-orphans) @@ -10006,6 +10339,7 @@ Show instance.") (sha256 (base32 "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2")))) (build-system haskell-build-system) + (properties '((upstream-name . "primitive-addr"))) (inputs (list ghc-primitive)) (home-page "https://github.com/haskell-primitive/primitive-addr") (synopsis "Addresses to unmanaged memory") @@ -10029,6 +10363,7 @@ of the @code{primitive} library before @code{primitive-0.7.0.0}.") (base32 "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9")))) (build-system haskell-build-system) + (properties '((upstream-name . "process-extras"))) (inputs (list ghc-data-default ghc-generic-deriving ghc-hunit ghc-listlike)) (home-page "https://github.com/seereason/process-extras") @@ -10056,6 +10391,7 @@ API.") (base32 "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5")))) (build-system haskell-build-system) + (properties '((upstream-name . "profunctors"))) (outputs '("out" "static" "doc")) (inputs (list ghc-base-orphans @@ -10084,6 +10420,7 @@ API.") (base32 "0ac43x36i6b595jhflif1qqhri1rrqw90ama5n7rsh0ffnzyb69d")))) (build-system haskell-build-system) + (properties '((upstream-name . "project-template"))) (inputs (list ghc-base64-bytestring ghc-conduit ghc-conduit-extra ghc-resourcet)) @@ -10117,6 +10454,7 @@ the ideal templating system.") (base32 "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))) (build-system haskell-build-system) + (properties '((upstream-name . "protolude"))) (inputs (list ghc-async ghc-hashable ghc-mtl-compat ghc-paths ghc-transformers-compat)) @@ -10139,6 +10477,7 @@ replace the standard one provided by GHC.") (base32 "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza")))) (build-system haskell-build-system) + (properties '((upstream-name . "PSQueue"))) (arguments '(#:cabal-revision ("2" "0n1yrv1x1dxbjn9hjr8lk4k5in9c75ixzldlmszayi26bvax7329"))) @@ -10167,6 +10506,7 @@ keys, in linear time.") (base32 "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6")))) (build-system haskell-build-system) + (properties '((upstream-name . "psqueues"))) (arguments '(#:tests? #f ; TODO: Needs quickcheck<2.14 #:cabal-revision @@ -10236,6 +10576,7 @@ Typical applications of Priority Search Queues include: (base32 "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj")))) (build-system haskell-build-system) + (properties '((upstream-name . "pwstore-fast"))) (inputs (list ghc-base64-bytestring ghc-cryptohash ghc-random ghc-byteable)) (home-page "https://github.com/PeterScott/pwstore") @@ -10264,6 +10605,7 @@ usable.") (sha256 (base32 "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4")))) (build-system haskell-build-system) + (properties '((upstream-name . "random"))) (arguments `(#:tests? #f #:cabal-revision @@ -10311,6 +10653,7 @@ library, including the ability to split random number generators.") (base32 "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f")))) (build-system haskell-build-system) + (properties '((upstream-name . "raw-strings-qq"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/23Skidoo/raw-strings-qq") (synopsis "Raw string literals for Haskell") @@ -10335,6 +10678,7 @@ DOS/Windows paths and markup languages (such as XML).") (base32 "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h")))) (build-system haskell-build-system) + (properties '((upstream-name . "readable"))) (home-page "https://github.com/mightybyte/readable") (synopsis "Type class for reading from Text and ByteString") (description "This package provides a @code{Readable} type class for @@ -10356,6 +10700,7 @@ includes efficient implementations for common data types.") (base32 "0sh1vha10n28c4jb97p99xglghqph8ppydqzbnb2h25a34057927")))) (build-system haskell-build-system) + (properties '((upstream-name . "rebase"))) (outputs '("out" "static" "doc")) (inputs (list ghc-bifunctors @@ -10415,6 +10760,7 @@ the community, with the missing features being added with pull-requests.") (base32 "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) (build-system haskell-build-system) + (properties '((upstream-name . "reducers"))) (arguments '(#:cabal-revision ("2" "1kd38n9h2hxl09khvkvkhnflgm6rbky1zkw3iazlpb8xk9zkk39s"))) @@ -10441,6 +10787,7 @@ containers and a general map/reduce framework for Haskell.") (base32 "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) (build-system haskell-build-system) + (properties '((upstream-name . "refact"))) (home-page "https://hackage.haskell.org/package/refact") (synopsis "Specify refactorings to perform with apply-refact") (description @@ -10464,6 +10811,7 @@ specify refactorings without depending on GHC.") (base32 "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz")))) (build-system haskell-build-system) + (properties '((upstream-name . "reflection"))) (inputs (list ghc-tagged)) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) @@ -10489,6 +10837,7 @@ configurations to coexist without resorting to mutable global variables or (base32 "02hxgy5ck3h5pwd5gzs4565qbql8457cjdbbc2yrk236qzc1qa8x")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex"))) (arguments `(#:phases (modify-phases %standard-phases @@ -10534,6 +10883,7 @@ copious examples.") (base32 "0di66pi2kq5rrsn0k6pwakzwa0bgi9jfb2csm72kp5gzqdws8s8p")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-applicative"))) (inputs (list ghc-filtrable)) (native-inputs (list ghc-smallcheck ghc-tasty ghc-tasty-hunit ghc-tasty-smallcheck)) @@ -10559,6 +10909,7 @@ regular expressions. Parsers can be built using Applicative interface.") (base32 "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-base"))) (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") @@ -10581,6 +10932,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (base32 "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-compat"))) (inputs (list ghc-regex-base ghc-regex-posix)) (home-page "https://sourceforge.net/projects/lazy-regex") @@ -10603,6 +10955,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (base32 "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-compat-tdfa"))) (inputs (list ghc-regex-base ghc-regex-tdfa)) (home-page "https://hub.darcs.net/shelarcy/regex-compat-tdfa") @@ -10626,6 +10979,7 @@ this problem.") (base32 "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-pcre"))) (arguments `(#:extra-directories ("pcre") #:cabal-revision @@ -10654,6 +11008,7 @@ expressions.") (base32 "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-pcre-builtin"))) (inputs (list ghc-regex-base)) (home-page "https://hackage.haskell.org/package/regex-pcre-builtin") @@ -10679,6 +11034,7 @@ providing the PCRE backend to accompany regex-base, with bundled code from (base32 "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-posix"))) (inputs (list ghc-regex-base)) (home-page "https://sourceforge.net/projects/lazy-regex") @@ -10701,6 +11057,7 @@ Haskell library @code{regex-base}.") (base32 "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi")))) (build-system haskell-build-system) + (properties '((upstream-name . "regex-tdfa"))) (arguments '(#:cabal-revision ("1" "02gwf740vs0jy3l6dgw72r8c04yggshia6w16n140ncpsici8c4r"))) @@ -10730,6 +11087,7 @@ inspired by libtre.") (base32 "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3")))) (build-system haskell-build-system) + (properties '((upstream-name . "repline"))) (inputs (list ghc-exceptions ghc-haskeline)) (home-page "https://github.com/sdiehl/repline") @@ -10753,6 +11111,7 @@ normal mtl transformers.") (base32 "0j50l96whwi65ir35nfhn24h6103zy1ilfjsqiax63ajzw169fkv")))) (build-system haskell-build-system) + (properties '((upstream-name . "rerebase"))) (outputs '("out" "static" "doc")) (inputs (list ghc-rebase)) @@ -10777,6 +11136,7 @@ the project's home page}.") (base32 "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1")))) (build-system haskell-build-system) + (properties '((upstream-name . "resolv"))) (arguments `(#:tests? #f ; TODO: tasty >=1.2.3 && <1.3 || >=1.3.1 && <1.4 #:cabal-revision @@ -10808,6 +11168,7 @@ Unix systems.") (base32 "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6")))) (build-system haskell-build-system) + (properties '((upstream-name . "resource-pool"))) (inputs (list ghc-hashable ghc-monad-control ghc-transformers-base ghc-vector)) (home-page "https://github.com/bos/pool") @@ -10830,6 +11191,7 @@ connections.") (base32 "0zrvnikw1a0r2j59k12fxikyrg0ki5a7xhqhjgfl9h6dqpz54h85")))) (build-system haskell-build-system) + (properties '((upstream-name . "resourcet"))) (inputs (list ghc-transformers-base ghc-monad-control @@ -10858,6 +11220,7 @@ code where you can safely allocate resources.") (base32 "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5")))) (build-system haskell-build-system) + (properties '((upstream-name . "retry"))) (inputs (list ghc-exceptions ghc-random)) (native-inputs @@ -10888,6 +11251,7 @@ the query instead of simply raising an exception.") (base32 "0nri7js5ymywh2gi3li25wrkl1nf712qhbzw5hn46fib83qsq73k")))) (build-system haskell-build-system) + (properties '((upstream-name . "rfc5051"))) (home-page "https://hackage.haskell.org/package/rfc5051") (synopsis "Simple unicode collation as per RFC5051") (description @@ -10912,6 +11276,7 @@ better for some purposes.") (base32 "013m4xgsmg8h1rba9krxppz49lc5wz26gksms5zibsjj0w59m58h")))) (build-system haskell-build-system) + (properties '((upstream-name . "rio"))) (inputs (list ghc-hashable ghc-microlens @@ -10950,6 +11315,7 @@ expose it from another module in the hierarchy. (base32 "10da5vls9l5i255bapms4b2r7dnwmxgsaa1cdll2lrmid5dikixr")))) (build-system haskell-build-system) + (properties '((upstream-name . "roman-numerals"))) (inputs (list ghc-base-unicode-symbols)) (home-page "https://github.com/roelvandijk/roman-numerals") (synopsis "Parsing and pretty printing of Roman numerals") @@ -10975,6 +11341,7 @@ the conversion functions.") (base32 "18pp6cn9np9jgs01x9mac6wk41k34g86fx5ibfarbapqr1138115")))) (build-system haskell-build-system) + (properties '((upstream-name . "safe"))) (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/ndmitchell/safe#readme") @@ -10998,6 +11365,7 @@ exceptions.") (base32 "15a80s87f603w8l7fnaba2cyqx62042vvcidpjzyga2685wpyqv9")))) (build-system haskell-build-system) + (properties '((upstream-name . "safe-exceptions"))) (native-inputs (list ghc-hspec ghc-void hspec-discover)) (home-page "https://github.com/fpco/safe-exceptions") @@ -11024,6 +11392,7 @@ handling wrong.") (base32 "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm")))) (build-system haskell-build-system) + (properties '((upstream-name . "safeio"))) (inputs (list ghc-conduit ghc-conduit-combinators ghc-exceptions ghc-resourcet)) @@ -11050,6 +11419,7 @@ avoid the problem of partial intermediate files.") (base32 "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) (build-system haskell-build-system) + (properties '((upstream-name . "SafeSemaphore"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") @@ -11073,6 +11443,7 @@ are not exception safe and can be broken by @code{killThread}.") (base32 "1ndgai8idlxyccvkz5zsgq06v58blc30i6hkky5b1sf5x6gs2h29")))) (build-system haskell-build-system) + (properties '((upstream-name . "sandi"))) (inputs (list ghc-stringsearch ghc-conduit @@ -11102,6 +11473,7 @@ are not exception safe and can be broken by @code{killThread}.") (base32 "1r5kffjfwpas45g74sip8glrj1m9nygrnxjm7xgw898rq9pnafgn")))) (build-system haskell-build-system) + (properties '((upstream-name . "say"))) (native-inputs (list ghc-hspec hspec-discover ghc-unliftio)) (home-page "https://github.com/fpco/say") @@ -11134,6 +11506,7 @@ as sending some messages to the terminal - that has the following properties: (base32 "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3")))) (build-system haskell-build-system) + (properties '((upstream-name . "scientific"))) (inputs (list ghc-integer-logarithms ghc-hashable ghc-primitive)) (native-inputs @@ -11180,6 +11553,7 @@ notation}.") (base32 "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) (build-system haskell-build-system) + (properties '((upstream-name . "SDL"))) (inputs (list sdl)) (home-page "https://hackage.haskell.org/package/SDL") @@ -11204,6 +11578,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (base32 "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q")))) (build-system haskell-build-system) + (properties '((upstream-name . "sdl2"))) (arguments '(#:tests? #f)) ; tests require graphical environment (inputs (list ghc-exceptions ghc-linear ghc-statevar ghc-vector sdl2)) @@ -11235,6 +11610,7 @@ programming.") (base32 "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) (build-system haskell-build-system) + (properties '((upstream-name . "sdl2-image"))) (inputs (list ghc-sdl2 sdl2-image)) (native-inputs @@ -11258,6 +11634,7 @@ programming.") (base32 "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) (build-system haskell-build-system) + (properties '((upstream-name . "sdl2-mixer"))) (inputs (list ghc-data-default-class ghc-lifted-base @@ -11288,6 +11665,7 @@ programming.") (base32 "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) (build-system haskell-build-system) + (properties '((upstream-name . "SDL-image"))) (arguments `(#:configure-flags (let* ((sdl-image (assoc-ref %build-inputs "sdl-image")) @@ -11317,6 +11695,7 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") (base32 "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) (build-system haskell-build-system) + (properties '((upstream-name . "SDL-mixer"))) (arguments `(#:configure-flags (let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer")) @@ -11346,6 +11725,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (base32 "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) (build-system haskell-build-system) + (properties '((upstream-name . "securemem"))) (inputs (list ghc-byteable ghc-memory)) (home-page "https://github.com/vincenthz/hs-securemem") (synopsis "Auto-scrubbing and const-time-eq memory chunk abstraction for @@ -11369,6 +11749,7 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") (base32 "11qs4imy3cq4cx9mm6g30r6qk3rngqrmz7lkl5379gs1yvgvs44q")))) (build-system haskell-build-system) + (properties '((upstream-name . "semialign"))) (inputs (list ghc-these ghc-base-compat @@ -11405,6 +11786,7 @@ class, forming lattice-like structure.") (base32 "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n")))) (build-system haskell-build-system) + (properties '((upstream-name . "semigroupoids"))) (outputs '("out" "static" "doc")) (inputs (list ghc-base-orphans @@ -11444,6 +11826,7 @@ just a @code{Semigroup} are added.") (base32 "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855")))) (build-system haskell-build-system) + (properties '((upstream-name . "semigroups"))) (inputs (list ghc-nats ghc-tagged ghc-unordered-containers ghc-hashable)) (home-page "https://github.com/ekmett/semigroups/") @@ -11480,6 +11863,7 @@ semigroup.") (sha256 (base32 "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr")))) (build-system haskell-build-system) + (properties '((upstream-name . "semirings"))) (inputs (list ghc-base-compat-batteries ghc-hashable ghc-unordered-containers)) (arguments @@ -11515,6 +11899,7 @@ by @code{0} annihilates R.") (base32 "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69")))) (build-system haskell-build-system) + (properties '((upstream-name . "serialise"))) (inputs (list ghc-cborg ghc-half @@ -11562,6 +11947,7 @@ convenient command-line utility for working with CBOR data.") (base32 "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73")))) (build-system haskell-build-system) + (properties '((upstream-name . "setenv"))) (home-page "https://hackage.haskell.org/package/setenv") (synopsis "Library for setting environment variables") (description "This package provides a Haskell library for setting @@ -11581,6 +11967,7 @@ environment variables.") (base32 "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir")))) (build-system haskell-build-system) + (properties '((upstream-name . "setlocale"))) (home-page "https://hackage.haskell.org/package/setlocale") (synopsis "Haskell bindings to setlocale") (description "This package provides Haskell bindings to the @@ -11601,6 +11988,7 @@ environment variables.") (base32 "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4")))) (build-system haskell-build-system) + (properties '((upstream-name . "shakespeare"))) (inputs (list ghc-aeson ghc-blaze-markup ghc-blaze-html @@ -11631,6 +12019,7 @@ interpolates variables according to the type being inserted.") (base32 "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday")))) (build-system haskell-build-system) + (properties '((upstream-name . "shelly"))) (inputs (list ghc-unix-compat ghc-system-filepath-bootstrap @@ -11667,6 +12056,7 @@ spirit to POSIX shells. Shelly is originally forked from the Shellish package. (base32 "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz")))) (build-system haskell-build-system) + (properties '((upstream-name . "silently"))) (arguments `(#:tests? #f)) ;; circular dependency with nanospec (home-page "https://github.com/hspec/silently") (synopsis "Prevent writing to stdout") @@ -11689,6 +12079,7 @@ writing to stdout and other handles.") (base32 "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) (build-system haskell-build-system) + (properties '((upstream-name . "simple-reflect"))) (home-page "https://twanvl.nl/blog/haskell/simple-reflection-of-expressions") (synopsis @@ -11715,6 +12106,7 @@ them.") (base32 "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn")))) (build-system haskell-build-system) + (properties '((upstream-name . "simple-sendfile"))) (inputs (list ghc-conduit ghc-conduit-extra ghc-network ghc-resourcet)) (native-inputs @@ -11738,6 +12130,7 @@ are the bottleneck of web servers.") (base32 "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp")))) (build-system haskell-build-system) + (properties '((upstream-name . "size-based"))) (inputs (list ghc-dictionary-sharing ghc-testing-type-modifiers ghc-template-haskell)) @@ -11770,6 +12163,7 @@ enumerations.") (base32 "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d")))) (build-system haskell-build-system) + (properties '((upstream-name . "skylighting-core"))) (inputs (list ghc-aeson ghc-ansi-terminal @@ -11829,6 +12223,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (base32 "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4")))) (build-system haskell-build-system) + (properties '((upstream-name . "smallcheck"))) (inputs (list ghc-logict)) (home-page @@ -11851,6 +12246,7 @@ automatically by SmallCheck.") (base32 "0wvaxy3dkv97wrncjv1rxrmjr4014hgxz82kixvcwqdhidalfi3k")))) (build-system haskell-build-system) + (properties '((upstream-name . "socks"))) (inputs (list ghc-cereal ghc-basement ghc-network)) (home-page "https://github.com/vincenthz/hs-socks") @@ -11872,6 +12268,7 @@ automatically by SmallCheck.") (base32 "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys")))) (build-system haskell-build-system) + (properties '((upstream-name . "sop-core"))) (home-page "https://hackage.haskell.org/package/sop-core") (synopsis "True Sums of Products") (description "This package provides an implementation of @@ -11896,6 +12293,7 @@ generics-sop}.") (base32 "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w")))) (build-system haskell-build-system) + (properties '((upstream-name . "special-values"))) (inputs (list ghc-scientific ghc-ieee754 ghc-nats)) (home-page @@ -11921,6 +12319,7 @@ used for example by QuickCheck, see quickcheck-special." ) (base32 "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7")))) (build-system haskell-build-system) + (properties '((upstream-name . "split"))) (arguments `(#:cabal-revision ("1" "06pmlvyrz4rr7rsrghpyrdypprphm9522rvnz4l3i8333n4pb304"))) @@ -11946,6 +12345,7 @@ mainstream languages.") (base32 "0das5n44dhlcv5i233iakx37d17kidqvhrvp6w9nd7hc015ry026")))) (build-system haskell-build-system) + (properties '((upstream-name . "splitmix"))) (native-inputs (list ghc-async ghc-base-compat-batteries @@ -11996,6 +12396,7 @@ internal state).") (base32 "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr")))) (build-system haskell-build-system) + (properties '((upstream-name . "spoon"))) (arguments `(#:cabal-revision ("1" @@ -12027,6 +12428,7 @@ Note that this suffers from the (base32 "098q4lk60najzpbfal4bg4sh7izxm840aa5h4ycaamjn77d3jjsy")))) (build-system haskell-build-system) + (properties '((upstream-name . "StateVar"))) (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") (description "This package provides state variables, which are references @@ -12047,6 +12449,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (base32 "0j9awbg47fzb58k5z2wgkp6a0042j7hqrl1g6lyflrbsfswdp5n4")))) (build-system haskell-build-system) + (properties '((upstream-name . "statistics"))) (inputs (list ghc-aeson ghc-async @@ -12107,6 +12510,7 @@ and regression and autocorrelation analysis. (base32 "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa")))) (build-system haskell-build-system) + (properties '((upstream-name . "stm-chans"))) (home-page "https://hackage.haskell.org/package/stm-chans") (synopsis "Additional types of channels for ghc-stm") (description "This Haskell package offers a collection of channel types, @@ -12127,6 +12531,7 @@ features.") (base32 "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8")))) (build-system haskell-build-system) + (properties '((upstream-name . "stm-conduit"))) (inputs (list ghc-stm-chans ghc-cereal @@ -12164,6 +12569,7 @@ source and a sink.") (sha256 (base32 "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb")))) (build-system haskell-build-system) + (properties '((upstream-name . "STMonadTrans"))) (arguments `(#:tests? #f)) ; TODO: Loops. (inputs (list ghc-fail)) ; (native-inputs @@ -12191,6 +12597,7 @@ for strict state threads.") (sha256 (base32 "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s")))) (build-system haskell-build-system) + (properties '((upstream-name . "storable-complex"))) (inputs (list ghc-base-orphans)) (home-page "https://github.com/cartazio/storable-complex") @@ -12215,6 +12622,7 @@ and Fortran complex data types.") (base32 "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf")))) (build-system haskell-build-system) + (properties '((upstream-name . "storable-record"))) (inputs (list ghc-semigroups ghc-utility-ht ghc-storablevector ghc-timeit)) (home-page "https://hackage.haskell.org/package/storable-record") @@ -12244,6 +12652,7 @@ alignment of the record elements.") (base32 "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw")))) (build-system haskell-build-system) + (properties '((upstream-name . "storable-tuple"))) (inputs (list ghc-storable-record ghc-utility-ht ghc-base-orphans)) (home-page "https://hackage.haskell.org/package/storable-tuple") @@ -12270,6 +12679,7 @@ together.") (base32 "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w")))) (build-system haskell-build-system) + (properties '((upstream-name . "storablevector"))) (inputs (list ghc-non-negative ghc-utility-ht @@ -12307,6 +12717,7 @@ a library that provides fusion with lazy lists.") (base32 "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) (build-system haskell-build-system) + (properties '((upstream-name . "streaming-commons"))) (inputs (list ghc-async ghc-blaze-builder ghc-network ghc-random ghc-zlib)) (native-inputs @@ -12330,6 +12741,7 @@ needed by various Haskell streaming data libraries, such as @code{conduit} and (sha256 (base32 "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz")))) (build-system haskell-build-system) + (properties '((upstream-name . "strict"))) (inputs (list ghc-hashable ghc-these ghc-assoc)) (home-page "https://hackage.haskell.org/package/strict") @@ -12355,6 +12767,7 @@ IO operations.") (base32 "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) (build-system haskell-build-system) + (properties '((upstream-name . "stringbuilder"))) (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests ; enabled (home-page "https://hackage.haskell.org/package/stringbuilder") @@ -12378,6 +12791,7 @@ literals.") (base32 "0wfxkw4x6j6jq9nd82k83g2k3hskpsvk1dp4cpkshvjr4wg9qny8")))) (build-system haskell-build-system) + (properties '((upstream-name . "string-qq"))) (native-inputs (list ghc-hunit)) (home-page "https://hackage.haskell.org/package/string-qq") @@ -12403,6 +12817,7 @@ and bytestrings.") (base32 "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9")))) (build-system haskell-build-system) + (properties '((upstream-name . "stringsearch"))) (arguments `(#:cabal-revision ("1" "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378"))) @@ -12427,6 +12842,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (base32 "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g")))) (build-system haskell-build-system) + (properties '((upstream-name . "svg-builder"))) (inputs (list ghc-blaze-builder ghc-hashable ghc-unordered-containers)) (arguments @@ -12454,6 +12870,7 @@ building Scalable Vector Graphics (SVG).") (base32 "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq")))) (build-system haskell-build-system) + (properties '((upstream-name . "syb"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page @@ -12481,6 +12898,7 @@ variety of traversals.") (base32 "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l")))) (build-system haskell-build-system) + (properties '((upstream-name . "system-fileio"))) (arguments `(#:phases (modify-phases %standard-phases @@ -12546,6 +12964,7 @@ which can't be decoded in the current locale encoding.") (base32 "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) (build-system haskell-build-system) + (properties '((upstream-name . "system-filepath"))) (arguments `(#:tests? #f ; TODO: Needs chell ==0.4.* #:cabal-revision @@ -12605,6 +13024,7 @@ increasing type safety.") (base32 "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb")))) (build-system haskell-build-system) + (properties '((upstream-name . "tabular"))) (inputs (list ghc-csv ghc-html)) (home-page "https://github.com/bgamari/tabular") @@ -12648,6 +13068,7 @@ B 3 || meh | well... || worst ever | ok (base32 "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m")))) (build-system haskell-build-system) + (properties '((upstream-name . "tagged"))) (arguments `(#:cabal-revision ("2" "0qi63c3z40i9qm44r571yjzcpb8d473vj2km4kq0fij0ljc7vii9"))) @@ -12673,6 +13094,7 @@ having to unsafely pass dummy arguments.") (base32 "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k")))) (build-system haskell-build-system) + (properties '((upstream-name . "tar"))) (arguments `(#:cabal-revision ("4" "03a33nj9k62f318qgmp5pgk7i99c8cyqy5f7m7p0bwc5ni39ysfq"))) @@ -12704,6 +13126,7 @@ an index.") (base32 "0bgn3hyf20g1gfnzy8f41s7nj54kfcyjk2izw99svrw8f3dphi80")))) (build-system haskell-build-system) + (properties '((upstream-name . "tar-conduit"))) (inputs (list ghc-conduit ghc-conduit-combinators ghc-safe-exceptions)) (native-inputs @@ -12730,6 +13153,7 @@ interface for extracting and creating tar files.") (base32 "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c")))) (build-system haskell-build-system) + (properties '((upstream-name . "temporary"))) (inputs (list ghc-exceptions ghc-random)) (native-inputs @@ -12758,6 +13182,7 @@ installed.") (base32 "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs")))) (build-system haskell-build-system) + (properties '((upstream-name . "temporary-rc"))) (inputs (list ghc-exceptions)) (home-page "https://www.github.com/feuerbach/temporary") @@ -12785,6 +13210,7 @@ This is a better maintained fork of the \"temporary\" package.") (base32 "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm")))) (build-system haskell-build-system) + (properties '((upstream-name . "terminal-size"))) (home-page "https://hackage.haskell.org/package/terminal-size") (synopsis "Get terminal window height and width") (description "Get terminal window height and width without ncurses @@ -12803,6 +13229,7 @@ dependency.") (base32 "1d9r3na7hmkgr0j63fs50ssll506l1wyqhw0dpap7jk0rdz8pv6n")))) (build-system haskell-build-system) + (properties '((upstream-name . "texmath"))) (inputs (list ghc-syb ghc-network-uri ghc-split ghc-xml ghc-pandoc-types)) (native-inputs @@ -12832,6 +13259,7 @@ it can parse and apply LaTeX macros.") (base32 "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-binary"))) (home-page "https://github.com/kawu/text-binary") (synopsis "Binary instances for text types") (description @@ -12856,6 +13284,7 @@ text package.") (base32 "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-manipulate"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page @@ -12890,6 +13319,7 @@ upgraded. Consider yourself warned!") (base32 "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2")))) (build-system haskell-build-system) + (properties '((upstream-name . "text-metrics"))) (inputs (list ghc-vector)) (native-inputs @@ -12918,6 +13348,7 @@ string metrics efficiently.") (sha256 (base32 "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f")))) (build-system haskell-build-system) + (properties '((upstream-name . "tf-random"))) (inputs (list ghc-primitive ghc-random)) (home-page "https://hackage.haskell.org/package/tf-random") @@ -12943,6 +13374,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (base32 "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-abstraction"))) (home-page "https://github.com/glguy/th-abstraction") (synopsis "Nicer interface for reified information about data types") (description @@ -12965,6 +13397,7 @@ Template Haskell.") (base32 "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-expand-syns"))) (arguments `(#:cabal-revision ("1" "0l30cmwm20lgjpvr3a5yxj6429s1hqahjsij8z2ap88754phd41l"))) @@ -12989,6 +13422,7 @@ Template Haskell.") (base32 "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-lift"))) (inputs (list ghc-th-abstraction)) (home-page "https://github.com/mboes/th-lift") @@ -13012,6 +13446,7 @@ datatypes.") (base32 "09nv1zsffvv6zfz1fjzcqrla3lc350qr4i4xf7wgvzp049sprrdy")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-lift-instances"))) (inputs (list ghc-th-lift ghc-vector ghc-quickcheck)) (home-page "https://github.com/bennofs/th-lift-instances/") @@ -13033,6 +13468,7 @@ instances. This package provides orphan instances for @code{containers}, (base32 "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-orphans"))) (arguments `(#:cabal-revision ("1" "0vfz9dl5g9xwp2zmwqc5gngyvjaqj3i0s97vbcslafcqhdqw3qaj"))) @@ -13069,6 +13505,7 @@ package, and that's where the version number started.") (base32 "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p")))) (build-system haskell-build-system) + (properties '((upstream-name . "these"))) (inputs (list ghc-hashable ghc-assoc)) (arguments @@ -13117,6 +13554,7 @@ variant of @code{These}. (base32 "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk")))) (build-system haskell-build-system) + (properties '((upstream-name . "threads"))) (native-inputs (list ghc-concurrent-extra ghc-hunit ghc-test-framework ghc-test-framework-hunit)) @@ -13152,6 +13590,7 @@ package is similar to the @code{threadmanager}, @code{async} and (base32 "19g4gc1q3zxbylmvrgk3dqjzychq2k02i7fwvs3vhbrg4ihhw9cx")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-reify-many"))) (inputs (list ghc-safe ghc-th-expand-syns)) (home-page "https://github.com/mgsloan/th-reify-many") @@ -13176,6 +13615,7 @@ function which generates instances.") (base32 "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii")))) (build-system haskell-build-system) + (properties '((upstream-name . "time-compat"))) (inputs (list ghc-base-orphans)) (native-inputs @@ -13209,6 +13649,7 @@ features as possible.") (base32 "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7")))) (build-system haskell-build-system) + (properties '((upstream-name . "time-locale-compat"))) (inputs (list ghc-old-locale)) (home-page "https://github.com/khibino/haskell-time-locale-compat") (synopsis "Compatibility of TimeLocale between old-locale and time-1.5") @@ -13229,6 +13670,7 @@ features as possible.") (base32 "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh")))) (build-system haskell-build-system) + (properties '((upstream-name . "time-manager"))) (inputs (list ghc-auto-update)) (home-page "https://github.com/yesodweb/wai") @@ -13252,6 +13694,7 @@ timer manager.") (base32 "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1")))) (build-system haskell-build-system) + (properties '((upstream-name . "timeit"))) (home-page "https://github.com/merijn/timeit") (synopsis "Time monadic computations with an IO base") (description "This package provides a simple wrapper to show the @@ -13273,6 +13716,7 @@ used CPU time of monadic computation with an IO base.") (base32 "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5")))) (build-system haskell-build-system) + (properties '((upstream-name . "timezone-series"))) (home-page "https://archives.haskell.org/projects.haskell.org/time-ng/") (synopsis "Enhanced timezone handling for Time") (description @@ -13296,6 +13740,7 @@ create timezone series, see the ghc-timezone-olson package.") (base32 "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg")))) (build-system haskell-build-system) + (properties '((upstream-name . "timezone-olson"))) (inputs (list ghc-timezone-series ghc-extensible-exceptions)) (home-page "https://archives.haskell.org/projects.haskell.org/time-ng/") @@ -13324,6 +13769,7 @@ objects from the timezone-series package.") (base32 "1yypb9zhsj9ks7bbw2sayqv3rn9y8z3w5p1xmsnwb4w99dqmvcx5")))) (build-system haskell-build-system) + (properties '((upstream-name . "tldr"))) (inputs (list ghc-ansi-terminal ghc-attoparsec @@ -13355,6 +13801,7 @@ man pages with practical examples.") (sha256 (base32 "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290")))) (build-system haskell-build-system) + (properties '((upstream-name . "torrent"))) (inputs (list ghc-bencode ghc-syb)) (home-page "https://hackage.haskell.org/package/torrent") @@ -13378,6 +13825,7 @@ BitTorrent files.") (base32 "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n")))) (build-system haskell-build-system) + (properties '((upstream-name . "transformers"))) (home-page "https://hackage.haskell.org/package/transformers") (synopsis "Concrete functor and monad transformers") @@ -13417,6 +13865,7 @@ other transformers.") (base32 "146g69yxmlrmvqnzwcw4frxfl3z04lda9zqwcqib34dnkrlghfrj")))) (build-system haskell-build-system) + (properties '((upstream-name . "transformers-base"))) (inputs (list ghc-transformers-compat)) (home-page @@ -13443,6 +13892,7 @@ compatibility to run on old versions of the platform.") (base32 "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky")))) (build-system haskell-build-system) + (properties '((upstream-name . "transformers-compat"))) (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") (description "This package includes backported versions of types that were @@ -13466,6 +13916,7 @@ but also need those types.") (base32 "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap")))) (build-system haskell-build-system) + (properties '((upstream-name . "tree-diff"))) (arguments `(#:cabal-revision ("1" "0brlnq5ddmambidll1dn4jnjac2i44a9hd5hwp2p0rbh1s8jfyhm"))) @@ -13510,6 +13961,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (base32 "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y")))) (build-system haskell-build-system) + (properties '((upstream-name . "trifecta"))) (inputs (list ghc-ansi-terminal ghc-blaze-builder @@ -13550,6 +14002,7 @@ with slicing and Clang-style colored diagnostics.") (base32 "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn")))) (build-system haskell-build-system) + (properties '((upstream-name . "tuple-th"))) (home-page "https://github.com/DanielSchuessler/tuple-th") (synopsis "Generate utility functions for tuples of statically known size for Haskell") @@ -13573,6 +14026,7 @@ statically known size.") (base32 "14lf43b5rxci6p9sy1gkb715m4b1s4rl65swn2qpdqv3h2yvpi4s")))) (build-system haskell-build-system) + (properties '((upstream-name . "turtle"))) (inputs (list ghc-ansi-wl-pprint ghc-async @@ -13631,6 +14085,7 @@ similar functionality.") (base32 "071mw4yv4xr5n82si33qbcqcxvcr7h56zlyd8gmsfrsdnacbq47k")))) (build-system haskell-build-system) + (properties '((upstream-name . "typed-process"))) (inputs (list ghc-async ghc-unliftio-core)) (native-inputs @@ -13658,6 +14113,7 @@ upon it.") (base32 "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy")))) (build-system haskell-build-system) + (properties '((upstream-name . "uglymemo"))) (home-page "https://hackage.haskell.org/package/uglymemo") (synopsis "Simple memoization function for Haskell") (description @@ -13678,6 +14134,7 @@ function.") (base32 "15fnk9x4fd2ryp31fjfrwm8k61m3a0qyb95m4065zc0yi0jyacp2")))) (build-system haskell-build-system) + (properties '((upstream-name . "unagi-chan"))) (inputs (list ghc-atomic-primops ghc-primitive)) (arguments @@ -13707,6 +14164,7 @@ instruction is not available.") (base32 "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar")))) (build-system haskell-build-system) + (properties '((upstream-name . "unbounded-delays"))) (home-page "https://github.com/basvandijk/unbounded-delays") (synopsis "Unbounded thread delays and timeouts") (description "The @code{threadDelay} and @code{timeout} functions from the @@ -13727,6 +14185,7 @@ unbounded @code{Integer} type.") version ".tar.gz")) (sha256 (base32 "07py2nffdgxpz8sryvqcghzb2kiiagpdf5ja1dia4z0rpwi79smh")))) (build-system haskell-build-system) + (properties '((upstream-name . "unexceptionalio"))) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) (home-page "https://github.com/singpolyma/unexceptionalio") @@ -13749,6 +14208,7 @@ handled safely, this is what you're left with.") (base32 "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f")))) (build-system haskell-build-system) + (properties '((upstream-name . "unicode-transforms"))) (native-inputs (list ghc-quickcheck ghc-getopt-generics ghc-split ghc-hspec)) (home-page "https://github.com/composewell/unicode-transforms") @@ -13770,6 +14230,7 @@ normalization in Haskell (normalization forms C, KC, D, and KD).") (base32 "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6")))) (build-system haskell-build-system) + (properties '((upstream-name . "union-find"))) (home-page "https://github.com/nominolo/union-find") (synopsis "Efficient union and equivalence testing of sets") (description @@ -13797,6 +14258,7 @@ constant-time: (base32 "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7")))) (build-system haskell-build-system) + (properties '((upstream-name . "uniplate"))) (inputs (list ghc-syb ghc-hashable ghc-unordered-containers)) (home-page "https://github.com/ndmitchell/uniplate") @@ -13821,6 +14283,7 @@ work, but is substantially simpler and faster.") (base32 "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8")))) (build-system haskell-build-system) + (properties '((upstream-name . "unix-compat"))) (home-page "https://github.com/jystic/unix-compat") (synopsis "Portable POSIX-compatibility layer") @@ -13845,6 +14308,7 @@ isn't available, portable implementations are used.") (base32 "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr")))) (build-system haskell-build-system) + (properties '((upstream-name . "unix-time"))) (arguments `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This ; is weird, that should be provided by GHC 7.10.2. @@ -13871,6 +14335,7 @@ for Unix time in Haskell.") (base32 "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my")))) (build-system haskell-build-system) + (properties '((upstream-name . "unliftio"))) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH (outputs '("out" "static" "doc")) (inputs @@ -13898,6 +14363,7 @@ working with it.") (base32 "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi")))) (build-system haskell-build-system) + (properties '((upstream-name . "unliftio-core"))) (arguments `(#:cabal-revision ("2" "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr"))) @@ -13924,6 +14390,7 @@ functions.") (base32 "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1")))) (build-system haskell-build-system) + (properties '((upstream-name . "unordered-containers"))) (inputs (list ghc-chasingbottoms ghc-hunit @@ -13966,6 +14433,7 @@ and high speed.") (base32 "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz")))) (build-system haskell-build-system) + (properties '((upstream-name . "unsafe"))) (home-page "https://hackage.haskell.org/package/unsafe") (synopsis "Unified interface to unsafe functions") (description "Safe Haskell introduced the notion of safe and unsafe @@ -13992,6 +14460,7 @@ a style ready for qualification, that is, you should import them by (base32 "0s0k26v5x6601rbpkjkl5vp3dkp9xwj1dlgy4xkl470i4sna1rzk")))) (build-system haskell-build-system) + (properties '((upstream-name . "uri-bytestring"))) (inputs (list ghc-attoparsec ghc-blaze-builder ghc-th-lift-instances)) (native-inputs (list ghc-hunit ghc-tasty @@ -14022,6 +14491,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") (base32 "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q")))) (build-system haskell-build-system) + (properties '((upstream-name . "utf8-light"))) (home-page "https://hackage.haskell.org/package/utf8-light") (synopsis "Lightweight unicode support for Haskell") @@ -14046,6 +14516,7 @@ including only one module.") (sha256 (base32 "16mh36ffva9rh6k37bi1046pgpj14h0cnmj1iir700v0lynxwj7f")))) (build-system haskell-build-system) + (properties '((upstream-name . "utf8-string"))) (native-inputs (list ghc-hunit)) (home-page "https://github.com/glguy/utf8-string/") (synopsis "Support for reading and writing UTF8 Strings") @@ -14067,6 +14538,7 @@ UTF8 without truncation.") (sha256 (base32 "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw")))) (build-system haskell-build-system) + (properties '((upstream-name . "utility-ht"))) (native-inputs (list ghc-quickcheck ghc-doctest-exitcode-stdio ghc-doctest-lib)) (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") @@ -14088,6 +14560,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (base32 "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq")))) (build-system haskell-build-system) + (properties '((upstream-name . "uuid"))) (inputs (list ghc-cryptohash-sha1 ghc-cryptohash-md5 ghc-entropy @@ -14116,6 +14589,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") (base32 "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d")))) (build-system haskell-build-system) + (properties '((upstream-name . "uuid-types"))) (arguments `(#:tests? #f)) ; TODO: Wrong byteorder version? (inputs (list ghc-hashable ghc-random)) (native-inputs (list ghc-byteorder ghc-quickcheck ghc-tasty @@ -14143,6 +14617,7 @@ functions.") (base32 "1dv7azpljdcf7irbnznnz31hq611bn1aj2m6ywghz3hgv835qqak")))) (build-system haskell-build-system) + (properties '((upstream-name . "validation"))) (inputs (list ghc-semigroups ghc-semigroupoids ghc-assoc ghc-bifunctors ghc-lens)) @@ -14184,6 +14659,7 @@ example of, \"An applicative functor that is not a monad.\"") (base32 "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x")))) (build-system haskell-build-system) + (properties '((upstream-name . "validity"))) (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://github.com/NorfairKing/validity") @@ -14209,6 +14685,7 @@ explicit by providing a function to check whether the invariants hold.") (base32 "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc")))) (build-system haskell-build-system) + (properties '((upstream-name . "vault"))) (inputs (list ghc-unordered-containers ghc-hashable ghc-semigroups)) (home-page @@ -14238,6 +14715,7 @@ representing a store for a single element.") (base32 "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector"))) ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests ;; disabled for now. (arguments @@ -14270,6 +14748,7 @@ optimisation framework.") (base32 "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector-algorithms"))) (inputs (list ghc-vector)) (native-inputs @@ -14294,6 +14773,7 @@ optimisation framework.") (base32 "0kgmlb4rf89b18d348cf2k06xfhdpamhmvq7iz5pab5014hknbmp")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector-binary-instances"))) (inputs (list ghc-vector)) (native-inputs @@ -14321,6 +14801,7 @@ boxed and storable vectors.") (base32 "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector-builder"))) (inputs (list ghc-vector ghc-semigroups ghc-base-prelude)) (native-inputs (list ghc-attoparsec ghc-tasty @@ -14354,6 +14835,7 @@ vector.") (base32 "0jbzm31d91kxn8m0h6iplj54h756q6f4zzdrnb2w7rzz5zskgqyl")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector-th-unbox"))) (inputs (list ghc-vector ghc-data-default)) (home-page "https://github.com/liyang/vector-th-unbox") @@ -14378,6 +14860,7 @@ and from some existing type with an Unbox instance.") (base32 "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk")))) (build-system haskell-build-system) + (properties '((upstream-name . "void"))) (inputs (list ghc-semigroups ghc-hashable)) (home-page "https://github.com/ekmett/void") @@ -14402,6 +14885,7 @@ given term should not exist.") (base32 "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki")))) (build-system haskell-build-system) + (properties '((upstream-name . "wave"))) (arguments '(#:phases (modify-phases %standard-phases @@ -14433,6 +14917,7 @@ files in Haskell.") (base32 "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) (build-system haskell-build-system) + (properties '((upstream-name . "wcwidth"))) (inputs (list ghc-setlocale ghc-utf8-string ghc-attoparsec)) (home-page "https://github.com/solidsnack/wcwidth/") @@ -14464,6 +14949,7 @@ widths to the Char type.") (base32 "13pbjr7fzqy3s9c1nd2jhfwzbpccmpfwdn7y46z9k2bfkch1jam9")))) (build-system haskell-build-system) + (properties '((upstream-name . "weigh"))) (inputs (list ghc-split ghc-temporary)) (home-page "https://github.com/fpco/weigh#readme") @@ -14487,6 +14973,7 @@ Haskell value or function.") (base32 "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85")))) (build-system haskell-build-system) + (properties '((upstream-name . "wizards"))) (inputs (list ghc-control-monad-free)) (arguments @@ -14527,6 +15014,7 @@ also be used for making GUI wizard interfaces.") (base32 "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) (build-system haskell-build-system) + (properties '((upstream-name . "wl-pprint"))) (home-page "https://hackage.haskell.org/package/wl-pprint") (synopsis "Wadler/Leijen pretty printer") (description @@ -14550,6 +15038,7 @@ instances of the @code{Pretty} class.") (base32 "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) (build-system haskell-build-system) + (properties '((upstream-name . "wl-pprint-annotated"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page @@ -14578,6 +15067,7 @@ modernized interface.") (base32 "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly")))) (build-system haskell-build-system) + (properties '((upstream-name . "wl-pprint-text"))) (inputs (list ghc-base-compat)) (home-page "https://hackage.haskell.org/package/wl-pprint-text") @@ -14598,6 +15088,7 @@ modernized interface.") (sha256 (base32 "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb")))) (build-system haskell-build-system) + (properties '((upstream-name . "word-wrap"))) (native-inputs (list ghc-hspec)) (arguments `(#:cabal-revision @@ -14623,6 +15114,7 @@ modernized interface.") (base32 "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16")))) (build-system haskell-build-system) + (properties '((upstream-name . "word8"))) (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://hackage.haskell.org/package/word8") @@ -14645,6 +15137,7 @@ modernized interface.") (base32 "1mbcrq89jz0dcibw66w0jdy4f4bfpx4zwjfs98rm3jjgdikwdzb4")))) (build-system haskell-build-system) + (properties '((upstream-name . "wordexp"))) (native-inputs (list ghc-c2hs)) (inputs (list ghc-semigroups)) @@ -14666,6 +15159,7 @@ word expansion like a posix-shell.") (sha256 (base32 "1ip207l97s8nw4daxp9s254agk8f0wibpf0prx0n695klqyn8bz1")))) (build-system haskell-build-system) + (properties '((upstream-name . "X11"))) (arguments `(#:extra-directories ("libx11" "libxrandr" "libxinerama" "libxscrnsaver"))) @@ -14697,6 +15191,7 @@ bindings are a direct translation of the C bindings.") (native-inputs (list pkg-config)) (build-system haskell-build-system) + (properties '((upstream-name . "X11-xft"))) (home-page "https://hackage.haskell.org/package/X11-xft") (synopsis "Bindings to Xft") (description @@ -14718,6 +15213,7 @@ parts.") (base32 "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4")))) (build-system haskell-build-system) + (properties '((upstream-name . "xdg-basedir"))) (home-page "https://github.com/willdonnelly/xdg-basedir") (synopsis "XDG Base Directory library for Haskell") (description "This package provides a library implementing the XDG Base Directory spec.") @@ -14738,6 +15234,7 @@ parts.") (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) + (properties '((upstream-name . "xml"))) (home-page "https://github.com/GaloisInc/xml") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") @@ -14756,6 +15253,7 @@ parts.") (base32 "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx")))) (build-system haskell-build-system) + (properties '((upstream-name . "xml-conduit"))) (inputs (list ghc-conduit ghc-conduit-extra @@ -14787,6 +15285,7 @@ the @code{conduit} package.") (base32 "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs")))) (build-system haskell-build-system) + (properties '((upstream-name . "xml-types"))) (home-page "https://john-millikin.com/software/haskell-xml/") (synopsis "Basic types for representing XML") (description "This package provides basic types for representing XML @@ -14805,6 +15304,7 @@ documents.") (sha256 (base32 "0jrhcjy7ww59dafg857f2g2df1fw2jmbwcs1q379ph0pc5rxj3lj")))) (build-system haskell-build-system) + (properties '((upstream-name . "xml-hamlet"))) (inputs (list ghc-shakespeare ghc-xml-conduit)) (native-inputs @@ -14827,6 +15327,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (base32 "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx")))) (build-system haskell-build-system) + (properties '((upstream-name . "yaml"))) (inputs (list ghc-conduit ghc-resourcet @@ -14866,6 +15367,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (base32 "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5")))) (build-system haskell-build-system) + (properties '((upstream-name . "zip-archive"))) (arguments `(#:phases (modify-phases %standard-phases @@ -14902,6 +15404,7 @@ modifying, and extracting files from zip archives in Haskell.") (base32 "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0")))) (build-system haskell-build-system) + (properties '((upstream-name . "zlib"))) (arguments `(#:extra-directories ("zlib") #:phases @@ -14940,6 +15443,7 @@ provides access to the full zlib feature set.") (base32 "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8")))) (build-system haskell-build-system) + (properties '((upstream-name . "zlib-bindings"))) (inputs (list ghc-zlib)) (native-inputs @@ -14966,6 +15470,7 @@ provides access to the full zlib feature set.") (base32 "0vghl48cxcqy72sqk2gpi7rvy5ya36j13vndaxi6kck6bqivbhm0")))) (build-system haskell-build-system) + (properties '((upstream-name . "zstd"))) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) @@ -14991,6 +15496,7 @@ compression ratios.") (sha256 (base32 "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs")))) (build-system haskell-build-system) + (properties '((upstream-name . "indexed-traversable"))) (inputs (list ghc-generic-deriving)) (arguments `(#:cabal-revision @@ -15034,6 +15540,7 @@ associated @code{TypeFamilies} instead of @code{FunctionalDependencies}.") (sha256 (base32 "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27")))) (build-system haskell-build-system) + (properties '((upstream-name . "type-equality"))) (arguments `(#:cabal-revision ("2" "1a3irpv5kyg3rywhmcp5fwg5irrdbdr0hrlw7asdk113nakrba7j"))) @@ -15066,6 +15573,7 @@ for compilers with @code{PolyKinds}.") (sha256 (base32 "1mg5hnr3f4zjh3ajy16jkxj630rnfa9iqnnmpjqd9gkjdxpssd5l")))) (build-system haskell-build-system) + (properties '((upstream-name . "selective"))) (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-expected-failure ghc-tasty-quickcheck)) @@ -15093,6 +15601,7 @@ on selective functors} for more details.") (sha256 (base32 "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm")))) (build-system haskell-build-system) + (properties '((upstream-name . "keys"))) (inputs (list ghc-comonad ghc-free @@ -15125,6 +15634,7 @@ dependencies.") (sha256 (base32 "07p92y62dibys3xa59rvx52xyyr39nghl73z7hzwnksa3ry3vfmq")))) (build-system haskell-build-system) + (properties '((upstream-name . "pointed"))) (inputs (list ghc-data-default-class ghc-comonad @@ -15155,6 +15665,7 @@ dependencies.") (sha256 (base32 "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv")))) (build-system haskell-build-system) + (properties '((upstream-name . "vector-instances"))) (inputs (list ghc-vector ghc-semigroupoids @@ -15184,6 +15695,7 @@ the @code{ghc-vector} package.") (sha256 (base32 "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b")))) (build-system haskell-build-system) + (properties '((upstream-name . "th-compat"))) (native-inputs (list ghc-base-compat ghc-hspec hspec-discover)) (home-page "https://github.com/haskell-compat/th-compat") @@ -15211,6 +15723,7 @@ range of @code{template-haskell} versions. On recent versions of (sha256 (base32 "0nznzji5haxl4ninm2a79dqf4c7fj6pc3z9gdc6wbf5h1pp14afr")))) (build-system haskell-build-system) + (properties '((upstream-name . "filepattern"))) (inputs (list ghc-extra ghc-semigroups)) (native-inputs (list ghc-quickcheck)) @@ -15254,6 +15767,7 @@ traverals using patterns. (sha256 (base32 "0r5sl7hhn0cxp0b1dskx1lshplc0yka7hcvs2nh10nrj07fjd3vj")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghc-lib-parser-ex"))) (inputs (list ghc-uniplate)) (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-extra)) @@ -15277,6 +15791,7 @@ traverals using patterns. (sha256 (base32 "1195iyf0s8zmibjmvd10bszyccp1a2g4wdysn7yk10d3j0q9xdxf")))) (build-system haskell-build-system) + (properties '((upstream-name . "lift-type"))) (home-page "https://github.com/parsonsmatt/lift-type") (synopsis "Lift a type from a Typeable constraint to a Template Haskell type") @@ -15300,6 +15815,7 @@ it.") (sha256 (base32 "0nbxkpd29ivdi6vcikbaasffkcz9m2vd4nhv29p6gmvckzmhj7zi")))) (build-system haskell-build-system) + (properties '((upstream-name . "unicode-collation"))) (inputs (list ghc-th-lift-instances)) (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit @@ -15328,6 +15844,7 @@ provided.") (sha256 (base32 "13hgbcbr7jbyfbxp8fsc43c2wq4fhlbxzqwh1plfkdi5n9bif1lv")))) (build-system haskell-build-system) + (properties '((upstream-name . "citeproc"))) (inputs (list ghc-safe ghc-case-insensitive @@ -15366,6 +15883,7 @@ entries. For more information about CSL, see @uref{https://citationstyles.org/} (sha256 (base32 "105szy7l4ji255fwv0kbfcy3i3a3a4197zgj6s9jb12kwbn6n0c7")))) (build-system haskell-build-system) + (properties '((upstream-name . "commonmark"))) (inputs (list ghc-unicode-transforms)) (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) @@ -15402,6 +15920,7 @@ varies linearly with input length.") (sha256 (base32 "0jm6w84p2a2gyaljvnlvjjwrwnir1lss3ps53d0bd8mkvhixxrqr")))) (build-system haskell-build-system) + (properties '((upstream-name . "commonmark-extensions"))) (inputs (list ghc-network-uri ghc-commonmark ghc-emojis)) (native-inputs @@ -15428,6 +15947,7 @@ footnotes, math, and more.") (sha256 (base32 "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp")))) (build-system haskell-build-system) + (properties '((upstream-name . "commonmark-pandoc"))) (inputs (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types)) (home-page "https://github.com/jgm/commonmark-hs") @@ -15451,6 +15971,7 @@ Pandoc types.") (sha256 (base32 "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68")))) (build-system haskell-build-system) + (properties '((upstream-name . "hslua-module-path"))) (inputs (list ghc-hslua)) (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) @@ -15475,6 +15996,7 @@ platform independent way.") (sha256 (base32 "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g")))) (build-system haskell-build-system) + (properties '((upstream-name . "template-haskell"))) (inputs (list ghc-boot-th)) (home-page "https://hackage.haskell.org/package/template-haskell") (synopsis "Support library for Template Haskell") @@ -15499,6 +16021,7 @@ information.") (sha256 (base32 "0aajx07n2rznyqxb0c4pn9j2cvkzw5brz9ki4grhhigbcri3jzmv")))) (build-system haskell-build-system) + (properties '((upstream-name . "genvalidity-hspec"))) (inputs (list ghc-quickcheck ghc-genvalidity @@ -15528,6 +16051,7 @@ information.") (sha256 (base32 "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli")))) (build-system haskell-build-system) + (properties '((upstream-name . "ghc-boot-th"))) (home-page "https://hackage.haskell.org/package/ghc-boot-th") (synopsis "Shared functionality between GHC and Template Haskell") @@ -15552,6 +16076,7 @@ upon by user code.") (sha256 (base32 "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3")))) (build-system haskell-build-system) + (properties '((upstream-name . "binary-orphans"))) (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tagged ghc-tasty ghc-tasty-quickcheck)) @@ -15579,6 +16104,7 @@ upon by user code.") (sha256 (base32 "1q8sxycv93sap6dgbw70scklnpjj5vav6qlvsxm5500jlvb3jnf0")))) (build-system haskell-build-system) + (properties '((upstream-name . "netlink"))) (inputs (list ghc-cereal ghc-monad-loops ghc-pretty-hex ghc-language-c ghc-regex-pcre)) @@ -15604,6 +16130,7 @@ of Netlink families.") (sha256 (base32 "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a")))) (build-system haskell-build-system) + (properties '((upstream-name . "doctest-driver-gen"))) (arguments `(#:tests? #f)) ; TODO: Fail to open shared library. (native-inputs (list ghc-doctest)) (home-page "https://github.com/Hexirp/doctest-driver-gen") @@ -15627,6 +16154,7 @@ lets you automatically generate driver file for Doctest's Cabal integration.") (sha256 (base32 "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8")))) (build-system haskell-build-system) + (properties '((upstream-name . "template-haskell-compat-v0208"))) (home-page "https://github.com/nikita-volkov/template-haskell-compat-v0208") (synopsis "Backwards compatibility layer for Template Haskell newer than 2.8") (description @@ -15648,6 +16176,7 @@ Haskell newer than 2.8.") (sha256 (base32 "051w428arxbix06a52dacqjpnkfx42zbazxsd3l9d857dsd0kl3g")))) (build-system haskell-build-system) + (properties '((upstream-name . "mysql"))) (arguments `(#:tests? #f)) ; TODO: Fails to connect to server. (inputs (list mysql zlib openssl)) @@ -15679,6 +16208,7 @@ built.") (sha256 (base32 "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs")))) (build-system haskell-build-system) + (properties '((upstream-name . "blaze-textual"))) (inputs (list ghc-blaze-builder ghc-old-locale ghc-vector)) (native-inputs @@ -15705,6 +16235,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (sha256 (base32 "1mhmszpq64h8kxr20iaj1laq46wr2gaqc8xxq1k821i7jfxfld6j")))) (build-system haskell-build-system) + (properties '((upstream-name . "mysql-simple"))) (arguments `(#:tests? #f)) ; TODO: Fails to connect to server. (inputs (list ghc-attoparsec @@ -15739,6 +16270,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (sha256 (base32 "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-qq"))) (inputs (list ghc-haskell-src-meta ghc-persistent)) (native-inputs @@ -15771,6 +16303,7 @@ Language} for @code{ghc-persistent}.") (sha256 (base32 "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-mysql"))) (arguments `(#:tests? #f)) ; TODO: Fails to import MaybeFieldDefsTest. (inputs (list ghc-persistent @@ -15820,6 +16353,7 @@ is officially supported.") (sha256 (base32 "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92")))) (build-system haskell-build-system) + (properties '((upstream-name . "hspec-expectations-lifted"))) (inputs (list ghc-hspec-expectations)) (home-page "https://hackage.haskell.org/package/hspec-expectations-lifted") (synopsis "Version of @code{ghc-hspec-expectations} generalized to @code{MonadIO}") @@ -15842,6 +16376,7 @@ to @code{MonadIO}.") (sha256 (base32 "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26")))) (build-system haskell-build-system) + (properties '((upstream-name . "string-conversions"))) (inputs (list ghc-utf8-string)) (native-inputs (list hspec-discover ghc-hspec ghc-quickcheck-instances @@ -15867,6 +16402,7 @@ string types into values of other string types.") (sha256 (base32 "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3")))) (build-system haskell-build-system) + (properties '((upstream-name . "postgresql-libpq"))) (arguments `(#:cabal-revision ("1" "1clivf13z15w954a0kcfkv8yc0d8kx61b68x2hk7a9236ck7l2m2"))) @@ -15894,6 +16430,7 @@ server and to receive the results of these queries.") (sha256 (base32 "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d")))) (build-system haskell-build-system) + (properties '((upstream-name . "postgresql-simple"))) (inputs (list ghc-time-compat ghc-aeson @@ -15940,6 +16477,7 @@ server and to receive the results of these queries.") (sha256 (base32 "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir")))) (build-system haskell-build-system) + (properties '((upstream-name . "persistent-postgresql"))) (arguments `(#:tests? #f)) ; TODO: Cannot import MaybeFieldDefsTest. (inputs (list ghc-persistent @@ -15990,6 +16528,7 @@ using the @code{ghc-postgresql-simple} package.") (sha256 (base32 "058jl7wjaxzvcayc9qzpikxvi9x42civ4sb02jh66rcvpndbfh5y")))) (build-system haskell-build-system) + (properties '((upstream-name . "filtrable"))) (arguments `(#:tests? #f)) ; TODO: Needs tasty >=1.3.1 && <1.4 (native-inputs (list ghc-smallcheck ghc-tasty ghc-tasty-smallcheck)) @@ -16012,6 +16551,7 @@ using the @code{ghc-postgresql-simple} package.") (sha256 (base32 "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh")))) (build-system haskell-build-system) + (properties '((upstream-name . "filelock"))) (native-inputs (list ghc-async ghc-async)) (home-page "https://github.com/takano-akio/filelock") @@ -16034,6 +16574,7 @@ using the @code{ghc-postgresql-simple} package.") (sha256 (base32 "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg")))) (build-system haskell-build-system) + (properties '((upstream-name . "HsYAML-aeson"))) (inputs (list ghc-hsyaml ghc-aeson ghc-scientific ghc-unordered-containers ghc-vector)) @@ -16069,6 +16610,7 @@ data into native Haskell data types.") (sha256 (base32 "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8")))) (build-system haskell-build-system) + (properties '((upstream-name . "lukko"))) (native-inputs (list ghc-async ghc-singleton-bool @@ -16110,6 +16652,7 @@ locking. (sha256 (base32 "0yslffafmqfkvhcw2arpc53hfmn1788z85ss9lxnbclr29lbvzgc")))) (build-system haskell-build-system) + (properties '((upstream-name . "dec"))) (home-page "https://github.com/phadej/vec") (synopsis "Decidable propositions") (description @@ -16136,6 +16679,7 @@ data Dec a (base32 "1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh")))) (build-system haskell-build-system) + (properties '((upstream-name . "Ansi2Html"))) (home-page "http://janzzstimmpfle.de/~jens/software/Ansi2Html/") (synopsis "Convert ANSI Terminal Sequences to nice HTML markup") (description @@ -16154,6 +16698,7 @@ pages.") (base32 "0rna8ir2cfp8gk0rd2q60an51jxc08lx4gl0liw8wwqgh1ijxv8b")))) (build-system haskell-build-system) + (properties '((upstream-name . "open-browser"))) (arguments (list #:phases @@ -16184,6 +16729,7 @@ pages.") (sha256 (base32 "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0")))) (build-system haskell-build-system) + (properties '((upstream-name . "singleton-bool"))) (inputs (list ghc-dec)) (arguments `(#:cabal-revision diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index 0fca9bd171..da4e2a205e 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -45,6 +45,7 @@ (sha256 (base32 "06f318hdah076vkviw1ryyg2p0gpbabsp8lbm5x03f2qv92n9j1n")))) (build-system haskell-build-system) + (properties '((upstream-name . "purescript"))) (inputs (list ghc-glob ghc-aeson @@ -141,6 +142,7 @@ expressive types, inspired by Haskell and compiling to JavaScript.") (sha256 (base32 "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g")))) (build-system haskell-build-system) + (properties '((upstream-name . "purescript-cst"))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e8bf3f6ac9..0dfc45a58e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -816,6 +816,7 @@ manager and a system tray.") "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) (patches (search-patches "xmonad-next-dynamic-linking.patch")))) (build-system haskell-build-system) + (properties '((upstream-name . "xmonad"))) (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments @@ -885,6 +886,7 @@ tiled on several screens.") (base32 "0gdphjn5ll5lkb2psdsb34563wsz6g0y2gg3z8cj4jy8lvbbv808")))) (build-system haskell-build-system) + (properties '((upstream-name . "xmobar"))) (native-inputs (list ghc-hspec hspec-discover)) (inputs @@ -958,6 +960,7 @@ particular, it displays commonly-chosen options before uncommon ones.") (sha256 (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) (build-system haskell-build-system) + (properties '((upstream-name . "xmonad-contrib"))) (propagated-inputs (list ghc-random ghc-x11 ghc-utf8-string ghc-x11-xft xmonad-next)) (native-inputs (list ghc-quickcheck ghc-hspec)) (home-page "https://xmonad.org") -- cgit 1.4.1 From 890a181ed1766b433b5bfe1a3419b50ffa6503cb Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 5 Jan 2023 08:59:52 +0100 Subject: gnu: Use HACKAGE-URI for packages from Hackage. Script-aided bulk change. --- gnu/packages/agda.scm | 4 +- gnu/packages/dhall.scm | 3 +- gnu/packages/finance.scm | 8 +- gnu/packages/haskell-apps.scm | 58 +- gnu/packages/haskell-check.scm | 179 +-- gnu/packages/haskell-crypto.scm | 108 +- gnu/packages/haskell-web.scm | 269 ++--- gnu/packages/haskell-xyz.scm | 2270 ++++++++++----------------------------- gnu/packages/purescript.scm | 10 +- gnu/packages/wm.scm | 15 +- 10 files changed, 707 insertions(+), 2217 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index b54ba11721..7128a3f108 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -41,9 +41,7 @@ (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/Agda/Agda-" - version ".tar.gz")) + (uri (hackage-uri "Agda" version)) (sha256 (base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5")))) (build-system haskell-build-system) diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index ce933da9a8..9e80abb08a 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -34,8 +34,7 @@ (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/dhall/dhall-" - version ".tar.gz")) + (uri (hackage-uri "dhall" version)) (sha256 (base32 "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab")))) (build-system haskell-build-system) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7f681b5b55..ea3b7c8577 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -221,10 +221,7 @@ line client and a client based on Qt.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hledger/hledger-" - version - ".tar.gz")) + (uri (hackage-uri "hledger" version)) (sha256 (base32 "07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss")))) @@ -1976,8 +1973,7 @@ generate a variety of reports from them, and provides a web interface.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hledger-web/hledger-web-" version ".tar.gz")) + (uri (hackage-uri "hledger-web" version)) (sha256 (base32 "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2")))) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 4e6a1d00cb..4e680e612b 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -65,9 +65,7 @@ (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/apply-refact/apply-refact-" - version ".tar.gz")) + (uri (hackage-uri "apply-refact" version)) (sha256 (base32 "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w")))) @@ -101,10 +99,7 @@ library. It is primarily used with HLint's @code{--refactor} flag.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cabal-install/cabal-install-" - version - ".tar.gz")) + (uri (hackage-uri "cabal-install" version)) (patches (search-patches "cabal-install-base16-bytestring1.0.patch" "cabal-install-ghc8.10.patch")) (sha256 @@ -150,9 +145,7 @@ installation of Haskell libraries and programs.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" name "/" - name "-" version ".tar.gz")) + (uri (hackage-uri "cpphs" version)) (sha256 (base32 "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz")))) @@ -181,8 +174,7 @@ unlit literate code files; and an option to turn off macro-expansion.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/darcs/" - "darcs-" version ".tar.gz")) + (uri (hackage-uri "darcs" version)) (sha256 (base32 "07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4")) @@ -287,8 +279,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/ghcid/" - "ghcid-" version ".tar.gz")) + (uri (hackage-uri "ghcid" version)) (sha256 (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq")))) (build-system haskell-build-system) @@ -316,8 +307,7 @@ to @code{cabal repl}).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "git-annex/git-annex-" version ".tar.gz")) + (uri (hackage-uri "git-annex" version)) (sha256 (base32 "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm")))) (build-system haskell-build-system) @@ -523,9 +513,7 @@ used to keep a folder in sync between computers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" name - "/" name "-" version ".tar.gz")) + (uri (hackage-uri "hlint" version)) (sha256 (base32 "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g")))) @@ -563,9 +551,7 @@ unwanted suggestions, and to add your own custom suggestions.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/hoogle/hoogle-" - version ".tar.gz")) + (hackage-uri "hoogle" version)) (sha256 (base32 "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7")))) @@ -615,10 +601,7 @@ or by approximate type signature.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hscolour/hscolour-" - version - ".tar.gz")) + (uri (hackage-uri "hscolour" version)) (sha256 (base32 "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) @@ -700,10 +683,7 @@ Wayland, and Linux console environments alike.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nixfmt/nixfmt-" - version - ".tar.gz")) + (uri (hackage-uri "nixfmt" version)) (sha256 (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) (build-system haskell-build-system) @@ -769,8 +749,7 @@ Haskell.") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/Raincat/" - "Raincat-" version ".tar.gz")) + (uri (hackage-uri "Raincat" version)) (sha256 (base32 "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c")))) @@ -812,9 +791,7 @@ is programmed in Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/scroll/scroll-" - version ".tar.gz")) + (uri (hackage-uri "scroll" version)) (sha256 (base32 "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj")))) @@ -858,9 +835,7 @@ too slow and you'll get wound up in the scroll and crushed.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" - version ".tar.gz")) + (uri (hackage-uri "ShellCheck" version)) (sha256 (base32 "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb")) (file-name (string-append name "-" version ".tar.gz")))) @@ -905,8 +880,7 @@ advanced user's otherwise working script to fail under future circumstances. (version "1.9") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/shelltestrunner-" - version "/shelltestrunner-" version ".tar.gz")) + (uri (hackage-uri "shelltestrunner" version)) (sha256 (base32 "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b")))) @@ -960,9 +934,7 @@ output, stderr, and exit status.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/stylish-haskell/" - "stylish-haskell-" version ".tar.gz")) + (hackage-uri "stylish-haskell" version)) (sha256 (base32 "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf")))) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0c5776047a..e00103d2fe 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -48,10 +48,7 @@ (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-ant-xml/tasty-ant-xml-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-ant-xml" version)) (sha256 (base32 "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8")))) @@ -76,10 +73,7 @@ framework.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-smallcheck/tasty-smallcheck-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-smallcheck" version)) (sha256 (base32 "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym")))) @@ -100,9 +94,7 @@ Haskell test framework.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-quickcheck/" - "tasty-quickcheck-" version ".tar.gz")) + (uri (hackage-uri "tasty-quickcheck" version)) (sha256 (base32 "0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49")))) @@ -129,10 +121,7 @@ Haskell test framework.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-golden/tasty-golden-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-golden" version)) (sha256 (base32 "1nskavqgfxx1cw7q6c0cmizlwj54rnlv93yhgssaa77gv1nbvwpn")))) @@ -163,10 +152,7 @@ contains the correct result for the test.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty/tasty-" - version - ".tar.gz")) + (uri (hackage-uri "tasty" version)) (sha256 (base32 "0574hbqzxzyv6vsk5kzbf04kz58y0iy8x9ydcj4b8fpncgmgy63g")))) @@ -195,8 +181,7 @@ and any other types of tests into a single test suite.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tasty-hedgehog/tasty-hedgehog-" version ".tar.gz")) + (uri (hackage-uri "tasty-hedgehog" version)) (sha256 (base32 "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb")))) @@ -221,10 +206,7 @@ framework}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-hspec/tasty-hspec-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-hspec" version)) (sha256 (base32 "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl")))) @@ -256,10 +238,7 @@ framework}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-hunit/tasty-hunit-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-hunit" version)) (sha256 (base32 "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp")))) @@ -279,8 +258,7 @@ test framework.") (version "0.0.3") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tasty-kat/tasty-kat-" version ".tar.gz")) + (uri (hackage-uri "tasty-kat" version)) (sha256 (base32 "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7")))) @@ -302,8 +280,7 @@ tasty.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tasty-lua/tasty-lua-" version ".tar.gz")) + (uri (hackage-uri "tasty-lua" version)) (sha256 (base32 "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53")))) @@ -326,9 +303,7 @@ from Lua.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-th/tasty-th-" - version ".tar.gz")) + (uri (hackage-uri "tasty-th" version)) (sha256 (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3")))) @@ -351,9 +326,7 @@ test-framework.") (version "1.1.18") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-rerun/" - "tasty-rerun-" version ".tar.gz")) + (uri (hackage-uri "tasty-rerun" version)) (sha256 (base32 "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s")))) @@ -377,9 +350,7 @@ been added since previous test run.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tasty-expected-failure/tasty-expected-failure-" - version ".tar.gz")) + (uri (hackage-uri "tasty-expected-failure" version)) (sha256 (base32 "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb")))) @@ -409,10 +380,7 @@ development.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "quickcheck-instances/quickcheck-instances-" - version ".tar.gz")) + (uri (hackage-uri "quickcheck-instances" version)) (sha256 (base32 "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h")))) @@ -451,9 +419,7 @@ provided by the Haskell Platform.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/quickcheck-unicode/" - "quickcheck-unicode-" version ".tar.gz")) + (uri (hackage-uri "quickcheck-unicode" version)) (sha256 (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k")))) @@ -474,10 +440,7 @@ testing Unicode-related software.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/quickcheck-io/quickcheck-io-" - version - ".tar.gz")) + (uri (hackage-uri "quickcheck-io" version)) (sha256 (base32 "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv")))) @@ -499,10 +462,7 @@ use HUnit assertions as QuickCheck properties.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/QuickCheck/QuickCheck-" - version - ".tar.gz")) + (uri (hackage-uri "QuickCheck" version)) (sha256 (base32 "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq")))) @@ -527,9 +487,7 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "quickcheck-assertions/" - "quickcheck-assertions-" version ".tar.gz")) + (uri (hackage-uri "quickcheck-assertions" version)) (sha256 (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv")))) (build-system haskell-build-system) @@ -553,8 +511,7 @@ HUnit.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/test-framework/" - "test-framework-" version ".tar.gz")) + (uri (hackage-uri "test-framework" version)) (sha256 (base32 "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm")))) @@ -593,9 +550,7 @@ reporting and test statistics output.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "test-framework-hunit/test-framework-hunit-" - version ".tar.gz")) + (uri (hackage-uri "test-framework-hunit" version)) (sha256 (base32 "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) @@ -619,9 +574,7 @@ reporting and test statistics output.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "test-framework-quickcheck2/" - "test-framework-quickcheck2-" version ".tar.gz")) + (uri (hackage-uri "test-framework-quickcheck2" version)) (sha256 (base32 "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9")))) @@ -647,9 +600,7 @@ package.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "test-framework-smallcheck/" - "test-framework-smallcheck-" version ".tar.gz")) + (uri (hackage-uri "test-framework-smallcheck" version)) (sha256 (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0")))) (build-system haskell-build-system) @@ -670,9 +621,7 @@ test-framework. New projects should use ghc-tasty-smallcheck instead.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "test-framework-th-" version "/" - "test-framework-th-" version ".tar.gz")) + (uri (hackage-uri "test-framework-th" version)) (sha256 (base32 "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b")))) @@ -704,8 +653,7 @@ using Template Haskell") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/HUnit/" - "HUnit-" version ".tar.gz")) + (uri (hackage-uri "HUnit" version)) (sha256 (base32 "1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh")))) @@ -729,9 +677,7 @@ JUnit tool for Java.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hspec-discover/hspec-discover-" - version ".tar.gz")) + (uri (hackage-uri "hspec-discover" version)) (sha256 (base32 "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa")))) @@ -752,8 +698,7 @@ runs Hspec tests.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hspec-core/" - "hspec-core-" version ".tar.gz")) + (uri (hackage-uri "hspec-core" version)) (sha256 (base32 "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1")))) @@ -783,8 +728,7 @@ be used to extend Hspec's functionality.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hspec-meta/" - "hspec-meta-" version ".tar.gz")) + (uri (hackage-uri "hspec-meta" version)) (sha256 (base32 "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si")))) @@ -812,8 +756,7 @@ used to test the in-development version of Hspec.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hspec/" - "hspec-" version ".tar.gz")) + (uri (hackage-uri "hspec" version)) (sha256 (base32 "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw")))) @@ -840,9 +783,7 @@ Haskell, inspired by the Ruby library RSpec.") (version "0.5.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hspec-contrib/hspec-contrib-" - version ".tar.gz")) + (uri (hackage-uri "hspec-contrib" version)) (sha256 (base32 "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc")))) @@ -865,9 +806,7 @@ Haskell, inspired by the Ruby library RSpec.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hspec-expectations/hspec-expectations-" - version ".tar.gz")) + (uri (hackage-uri "hspec-expectations" version)) (sha256 (base32 "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1")))) @@ -889,9 +828,7 @@ Haskell, inspired by the Ruby library RSpec.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "nanospec/nanospec-" - version ".tar.gz")) + (uri (hackage-uri "nanospec" version)) (sha256 (base32 "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g")))) @@ -913,9 +850,7 @@ minimal dependencies.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "crypto-cipher-tests-" version "/" - "crypto-cipher-tests-" version ".tar.gz")) + (uri (hackage-uri "crypto-cipher-tests" version)) (sha256 (base32 "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz")))) @@ -943,10 +878,7 @@ implementations of cryptographic ciphers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hedgehog/hedgehog-" - version - ".tar.gz")) + (uri (hackage-uri "hedgehog" version)) (sha256 (base32 "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6")))) @@ -985,9 +917,7 @@ To get started quickly, see the examples: (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cabal-doctest/cabal-doctest-" - version ".tar.gz")) + (uri (hackage-uri "cabal-doctest" version)) (sha256 (base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) @@ -1011,9 +941,7 @@ configuration. This library provides the common bits for writing custom (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "testing-type-modifiers/testing-type-modifiers-" - version ".tar.gz")) + (uri (hackage-uri "testing-type-modifiers" version)) (sha256 (base32 "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5")))) @@ -1035,8 +963,7 @@ testing frameworks.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "testing-feat/testing-feat-" version ".tar.gz")) + (uri (hackage-uri "testing-feat" version)) (sha256 (base32 "1v2qzzpf1s008g7q6q67glf7vbm1pkpq4rc3ii74f4g6vhfx610r")))) @@ -1061,9 +988,7 @@ random testing, and hybrids of the two.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/inspection-testing/" - "inspection-testing-" version ".tar.gz")) + (uri (hackage-uri "inspection-testing" version)) (sha256 (base32 "0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig")))) @@ -1102,10 +1027,7 @@ examples and more information.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/quickcheck-classes/quickcheck-classes-" - version - ".tar.gz")) + (uri (hackage-uri "quickcheck-classes" version)) (sha256 (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2")))) (build-system haskell-build-system) @@ -1147,10 +1069,7 @@ constraints more cleanly.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/quickcheck-classes-base/quickcheck-classes-base-" - version - ".tar.gz")) + (uri (hackage-uri "quickcheck-classes-base" version)) (sha256 (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch")))) (build-system haskell-build-system) @@ -1189,10 +1108,7 @@ these constraints more cleanly.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest-lib/doctest-lib-" - version - ".tar.gz")) + (uri (hackage-uri "doctest-lib" version)) (sha256 (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2")))) (build-system haskell-build-system) @@ -1210,10 +1126,7 @@ these constraints more cleanly.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest-exitcode-stdio/doctest-exitcode-stdio-" - version - ".tar.gz")) + (uri (hackage-uri "doctest-exitcode-stdio" version)) (sha256 (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x")))) (build-system haskell-build-system) @@ -1234,10 +1147,7 @@ environment.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cabal-doctest/cabal-doctest-" - version - ".tar.gz")) + (uri (hackage-uri "cabal-doctest" version)) (sha256 (base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) (build-system haskell-build-system) @@ -1258,10 +1168,7 @@ environment.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tasty-silver/tasty-silver-" - version - ".tar.gz")) + (uri (hackage-uri "tasty-silver" version)) (sha256 (base32 "0nvh2k8iqqkanmp7lpwd3asimyarzisly8wavbdahcxryn0j4xb7")))) (build-system haskell-build-system) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index fb907dce00..e06ff7058b 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -40,9 +40,7 @@ (version "0.3.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "asn1-types/asn1-types-" - version ".tar.gz")) + (uri (hackage-uri "asn1-types" version)) (sha256 (base32 "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq")))) @@ -63,9 +61,7 @@ format.") (version "0.9.6") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "asn1-encoding/asn1-encoding-" - version ".tar.gz")) + (uri (hackage-uri "asn1-encoding" version)) (sha256 (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r")))) @@ -88,9 +84,7 @@ supports for high level forms of ASN1 (BER, and DER).") (version "0.9.5") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "asn1-parse/asn1-parse-" - version ".tar.gz")) + (uri (hackage-uri "asn1-parse" version)) (sha256 (base32 "17pk8y3nwv9b9i5j15qlmwi7fmq9ab2z4kfpjk2rvcrh9lsf27wg")))) @@ -112,9 +106,7 @@ when ASN1 pattern matching is not convenient.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "crypto-api-" version "/" - "crypto-api-" version ".tar.gz")) + (uri (hackage-uri "crypto-api" version)) (sha256 (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9")))) @@ -142,9 +134,7 @@ algorithm (ex: padding) is within scope of this package.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "crypto-api-tests-" version "/" - "crypto-api-tests-" version ".tar.gz")) + (uri (hackage-uri "crypto-api-tests" version)) (sha256 (base32 "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl")))) @@ -172,9 +162,7 @@ for common cryptographic algorithms are included.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cryptohash/cryptohash-" - version ".tar.gz")) + (uri (hackage-uri "cryptohash" version)) (sha256 (base32 "1yr2iyb779znj79j3fq4ky8l1y8a600a2x1fx9p5pmpwq5zq93y2")))) @@ -205,9 +193,7 @@ that hides the C implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cryptohash-md5-" version "/" - "cryptohash-md5-" version ".tar.gz")) + (uri (hackage-uri "cryptohash-md5" version)) (sha256 (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v")))) @@ -227,9 +213,7 @@ that hides the C implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cryptohash-sha1-" version "/" - "cryptohash-sha1-" version ".tar.gz")) + (uri (hackage-uri "cryptohash-sha1" version)) (sha256 (base32 "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w")))) @@ -259,9 +243,7 @@ the C implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cryptohash-sha256-" version "/" - "cryptohash-sha256-" version ".tar.gz")) + (uri (hackage-uri "cryptohash-sha256" version)) (sha256 (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk")))) @@ -291,9 +273,7 @@ the C implementation.") (version "0.29") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cryptonite/cryptonite-" - version ".tar.gz")) + (uri (hackage-uri "cryptonite" version)) (sha256 (base32 "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq")))) @@ -323,10 +303,7 @@ generators, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/digest/digest-" - version - ".tar.gz")) + (uri (hackage-uri "digest" version)) (sha256 (base32 "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm")))) @@ -353,9 +330,7 @@ are implemented as FFI bindings to efficient code from zlib.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "entropy-" version "/" - "entropy-" version ".tar.gz")) + (uri (hackage-uri "entropy" version)) (sha256 (base32 "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd")))) (build-system haskell-build-system) @@ -372,8 +347,7 @@ to obtain cryptographically strong entropy.") (version "0.2.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pem/pem-" version ".tar.gz")) + (uri (hackage-uri "pem" version)) (sha256 (base32 "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p")))) @@ -398,9 +372,7 @@ Mail} (PEM) format.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pureMD5-" version "/" - "pureMD5-" version ".tar.gz")) + (uri (hackage-uri "pureMD5" version)) (sha256 (base32 "0qwkvxwi9wh6knn69rg2hvc8ngmv1if77kmpcnp0xqr0l30fwavq")))) @@ -423,8 +395,7 @@ interface.") (version "1.6.4.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "SHA/SHA-" version ".tar.gz")) + (uri (hackage-uri "SHA" version)) (sha256 (base32 "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb")))) @@ -450,8 +421,7 @@ libraries, like OpenSSL.") (version "1.7.5") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "x509/x509-" version ".tar.gz")) + (uri (hackage-uri "x509" version)) (sha256 (base32 "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i")))) @@ -479,9 +449,7 @@ libraries, like OpenSSL.") (version "1.6.7") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "x509-store/x509-store-" - version ".tar.gz")) + (uri (hackage-uri "x509-store" version)) (sha256 (base32 "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp")))) @@ -505,9 +473,7 @@ collections, certificates, revocation lists, and exception lists.") (version "1.6.11") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "x509-validation/x509-validation-" - version ".tar.gz")) + (uri (hackage-uri "x509-validation" version)) (sha256 (base32 "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr")))) @@ -539,9 +505,7 @@ list validation.") (version "1.6.6") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "x509-system/x509-system-" - version ".tar.gz")) + (uri (hackage-uri "x509-system" version)) (sha256 (base32 "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20")))) @@ -563,9 +527,7 @@ for X.509 certificates.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "crypto-cipher-types-" version "/" - "crypto-cipher-types-" version ".tar.gz")) + (uri (hackage-uri "crypto-cipher-types" version)) (sha256 (base32 "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0")))) @@ -585,9 +547,7 @@ for symmetric ciphers.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cipher-aes-" version "/" - "cipher-aes-" version ".tar.gz")) + (uri (hackage-uri "cipher-aes" version)) (sha256 (base32 "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk")))) @@ -623,9 +583,7 @@ AES-NI available, or you'll need to use a different implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "crypto-random-" version "/" - "crypto-random-" version ".tar.gz")) + (uri (hackage-uri "crypto-random" version)) (sha256 (base32 "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp")))) @@ -645,9 +603,7 @@ abstraction for CPRNGs.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cprng-aes-" version "/" - "cprng-aes-" version ".tar.gz")) + (uri (hackage-uri "cprng-aes" version)) (sha256 (base32 "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4")))) @@ -690,9 +646,7 @@ percent. (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ed25519/ed25519-" - version ".tar.gz")) + (uri (hackage-uri "ed25519" version)) (sha256 (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq")))) @@ -720,8 +674,7 @@ guidelines.") (version "1.5.5") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tls/tls-" version ".tar.gz")) + (uri (hackage-uri "tls" version)) (sha256 (base32 "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a")))) @@ -762,8 +715,7 @@ extensions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "HsOpenSSL/HsOpenSSL-" version ".tar.gz")) + (uri (hackage-uri "HsOpenSSL" version)) (sha256 (base32 "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5")))) @@ -792,9 +744,7 @@ implementation of SSL.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "openssl-streams/openssl-streams-" - version ".tar.gz")) + (uri (hackage-uri "openssl-streams" version)) (sha256 (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm")))) @@ -817,9 +767,7 @@ networking using OpenSSL (by way of HsOpenSSL).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cryptonite-conduit/cryptonite-conduit-" - version ".tar.gz")) + (uri (hackage-uri "cryptonite-conduit" version)) (sha256 (base32 "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh")))) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9d98fed34d..3194bcdf05 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -49,8 +49,7 @@ (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/tagsoup/" - "tagsoup-" version ".tar.gz")) + (uri (hackage-uri "tagsoup" version)) (sha256 (base32 "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms")))) @@ -77,10 +76,7 @@ for screen-scraping.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cookie/cookie-" - version - ".tar.gz")) + (uri (hackage-uri "cookie" version)) (sha256 (base32 "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh")))) @@ -106,8 +102,7 @@ for screen-scraping.") (version "1.3.8") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/curl/curl-" - version ".tar.gz")) + (uri (hackage-uri "curl" version)) (sha256 (base32 "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh")))) @@ -129,8 +124,7 @@ This package provides a Haskell binding to libcurl.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/httpd-shed/" - "httpd-shed-" version ".tar.gz")) + (uri (hackage-uri "httpd-shed" version)) (sha256 (base32 "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr")))) @@ -153,8 +147,7 @@ requests, and the library is intended for implementing Ajax APIs.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/http-types/" - "http-types-" version ".tar.gz")) + (uri (hackage-uri "http-types" version)) (sha256 (base32 "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf")))) @@ -179,8 +172,7 @@ both client and server code).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/HTTP/" - "HTTP-" version ".tar.gz")) + (uri (hackage-uri "HTTP" version)) (sha256 (base32 "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn")))) @@ -231,9 +223,7 @@ responses coming back.") (version "0.7.11") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-client/http-client-" - version ".tar.gz")) + (uri (hackage-uri "http-client" version)) (sha256 (base32 "12j7vkpkm2djws6ny7vm2324c7916d0iaf1mbvf4mfjxzy2w7imv")))) @@ -274,9 +264,7 @@ for more user-friendly packages.") (version "0.3.6.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-client-tls/http-client-tls-" - version ".tar.gz")) + (uri (hackage-uri "http-client-tls" version)) (sha256 (base32 "03f8p9gxdzl6slyw1r6vpv2dqhsyjvbaawbjv75kaq0vlj3gz7xi")))) @@ -337,9 +325,7 @@ servers on localhost or only allow connections to a specific server.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-date-" version "/" - "http-date-" version ".tar.gz")) + (uri (hackage-uri "http-date" version)) (sha256 (base32 "1lzlrj2flcnz3k5kfhf11nk5n8m6kcya0lkwrsnzxgfr3an27y9j")))) @@ -362,9 +348,7 @@ Date in Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http2-" version "/" - "http2-" version ".tar.gz")) + (uri (hackage-uri "http2" version)) (sha256 (base32 "13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1")))) @@ -406,9 +390,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-conduit-" version "/" "http-conduit-" - version ".tar.gz")) + (uri (hackage-uri "http-conduit" version)) (sha256 (base32 "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng")))) @@ -466,9 +448,7 @@ which allow you to avoid direct usage of conduits.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/http-reverse-proxy/" - "http-reverse-proxy-" version ".tar.gz")) + (uri (hackage-uri "http-reverse-proxy" version)) (sha256 (base32 "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v")))) @@ -507,10 +487,7 @@ approach performs full request/response parsing via WAI and http-conduit.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wai/wai-" - version - ".tar.gz")) + (uri (hackage-uri "wai" version)) (sha256 (base32 "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m")))) @@ -539,10 +516,7 @@ communication between web applications and web servers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wai-logger/wai-logger-" - version - ".tar.gz")) + (uri (hackage-uri "wai-logger" version)) (sha256 (base32 "0hbm7if28p6qa36cgpyq6i569275si53z9gsl2g1z8x09z3xiyz2")))) @@ -573,10 +547,7 @@ communication between web applications and web servers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wai-extra/wai-extra-" - version - ".tar.gz")) + (uri (hackage-uri "wai-extra" version)) (sha256 (base32 "1avf7bjcsbs8l6klp5kkd0cd2dc5n0j0a2yf8813pnwfn5b7qyd4")))) @@ -616,9 +587,7 @@ functionality.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "wai-conduit-" version "/" - "wai-conduit-" version ".tar.gz")) + (uri (hackage-uri "wai-conduit" version)) (sha256 (base32 "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417")))) @@ -639,10 +608,7 @@ Haskell's Web Application Interface (WAI).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "bsb-http-chunked/bsb-http-chunked-" - version ".tar.gz")) + (uri (hackage-uri "bsb-http-chunked" version)) (sha256 (base32 "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql")))) @@ -678,9 +644,7 @@ transfers.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "warp-" version "/" "warp-" version - ".tar.gz")) + (uri (hackage-uri "warp" version)) (sha256 (base32 "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0")))) (build-system haskell-build-system) @@ -728,10 +692,7 @@ based WAI (Web Application Interface in Haskell).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "tls-session-manager/tls-session-manager-" - version ".tar.gz")) + (uri (hackage-uri "tls-session-manager" version)) (sha256 (base32 "134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s")))) @@ -752,9 +713,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "warp-tls-" version "/" - "warp-tls-" version ".tar.gz")) + (uri (hackage-uri "warp-tls" version)) (sha256 (base32 "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m")))) @@ -783,10 +742,7 @@ a WAI handler, via the native Haskell TLS implementation.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/websockets/websockets-" - version - ".tar.gz")) + (uri (hackage-uri "websockets" version)) (sha256 (base32 "1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44")))) @@ -834,10 +790,7 @@ See also: (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/wai-websockets/wai-websockets-" - version - ".tar.gz")) + (uri (hackage-uri "wai-websockets" version)) (sha256 (base32 "0b2xmdsrsqpssyib53wbr6r8hf75789ndyyanv37sv99iyqcwz4i")))) @@ -862,9 +815,7 @@ See also: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xss-sanitize/xss-sanitize-" - version ".tar.gz")) + (uri (hackage-uri "xss-sanitize" version)) (sha256 (base32 "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) @@ -888,10 +839,7 @@ attacks.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/css-text/css-text-" - version - ".tar.gz")) + (uri (hackage-uri "css-text" version)) (sha256 (base32 "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) @@ -911,9 +859,7 @@ Haskell.") (version "0.1.0.9") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mime-types/mime-types-" - version ".tar.gz")) + (uri (hackage-uri "mime-types" version)) (sha256 (base32 "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha")))) @@ -932,10 +878,7 @@ Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/html/html-" - version - ".tar.gz")) + (uri (hackage-uri "html" version)) (sha256 (base32 "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c")))) @@ -956,9 +899,7 @@ documents.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/html-conduit/" - "html-conduit-" version ".tar.gz")) + (uri (hackage-uri "html-conduit" version)) (sha256 (base32 "09bwrdam3y47kqllgg6w098ghqb8jb10dp4wxirsvx5ddpx9zpi6")))) @@ -991,9 +932,7 @@ entity decoding bugfixes applied.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "blaze-html/blaze-html-" - version ".tar.gz")) + (uri (hackage-uri "blaze-html" version)) (sha256 (base32 "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30")))) @@ -1020,10 +959,7 @@ entity decoding bugfixes applied.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/aeson/aeson-" - version - ".tar.gz")) + (uri (hackage-uri "aeson" version)) (sha256 (base32 "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83")))) @@ -1077,9 +1013,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (version "0.8.9") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/aeson-pretty/aeson-pretty-" - version ".tar.gz")) + (uri (hackage-uri "aeson-pretty" version)) (sha256 (base32 "021az9az6xik9c9s3rnar5fr1lgy2h3igibf5ixnc7ps3m2lzg2x")))) @@ -1111,8 +1045,7 @@ essentially the opposite of pretty-printing.") (version "0.8.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aeson-qq/aeson-qq-" version ".tar.gz")) + (uri (hackage-uri "aeson-qq" version)) (sha256 (base32 "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh")))) @@ -1142,10 +1075,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/aeson-better-errors/aeson-better-errors-" - version - ".tar.gz")) + (uri (hackage-uri "aeson-better-errors" version)) (sha256 (base32 "09vkyrhwak3bmpfsqcd2az8hfqqkxyhg468hv5avgisy0nzh3w38")))) @@ -1176,10 +1106,7 @@ good error messages when parsing fails. See also (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/multipart/multipart-" - version - ".tar.gz")) + (uri (hackage-uri "multipart" version)) (sha256 (base32 "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn")))) @@ -1202,9 +1129,7 @@ good error messages when parsing fails. See also (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/uri-encode/uri-encode-" - version ".tar.gz")) + (uri (hackage-uri "uri-encode" version)) (sha256 (base32 "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767")))) @@ -1224,9 +1149,7 @@ good error messages when parsing fails. See also (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "path-pieces-" version "/" - "path-pieces-" version ".tar.gz")) + (uri (hackage-uri "path-pieces" version)) (sha256 (base32 "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8")))) @@ -1246,9 +1169,7 @@ Haskell data types to and from route pieces.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "skein-" version "/" - "skein-" version ".tar.gz")) + (uri (hackage-uri "skein" version)) (sha256 (base32 "1jdqdk0rz2wnvw735clnj8jh0a9rkrbqjg7vk3w6wczdql6cm0pq")))) @@ -1273,9 +1194,7 @@ This Haskell package uses bindings to the optimized C implementation of Skein.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "clientsession-" version "/" - "clientsession-" version ".tar.gz")) + (uri (hackage-uri "clientsession" version)) (sha256 (base32 "0s6h4ykj16mpf7nlw2iqn2ji0p8g1fn5ni0s7yqaili6vv2as5ar")))) @@ -1307,9 +1226,7 @@ avoid any issues with characters.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yesod-core-" version "/" - "yesod-core-" version ".tar.gz")) + (uri (hackage-uri "yesod-core" version)) (sha256 (base32 "0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7")))) @@ -1377,9 +1294,7 @@ functions, widgets, etc.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yesod-persistent-" version "/" - "yesod-persistent-" version ".tar.gz")) + (uri (hackage-uri "yesod-persistent" version)) (sha256 (base32 "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4")))) @@ -1408,10 +1323,7 @@ from Yesod.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/yesod-form/yesod-form-" - version - ".tar.gz")) + (uri (hackage-uri "yesod-form" version)) (sha256 (base32 "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi")))) @@ -1451,9 +1363,7 @@ providing richtext field using Nic editor.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/yesod/yesod-" - version ".tar.gz")) + (uri (hackage-uri "yesod" version)) (sha256 (base32 "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f")))) @@ -1491,9 +1401,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hxt-charproperties/hxt-charproperties-" - version ".tar.gz")) + (uri (hackage-uri "hxt-charproperties" version)) (sha256 (base32 "0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8")))) @@ -1514,10 +1422,7 @@ supported Unicode version is 7.0.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hxt-unicode/hxt-unicode-" - version - ".tar.gz")) + (uri (hackage-uri "hxt-unicode" version)) (sha256 (base32 "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v")))) @@ -1543,9 +1448,7 @@ ignored.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hxt-regex-xmlschema/hxt-regex-xmlschema-" - version ".tar.gz")) + (uri (hackage-uri "hxt-regex-xmlschema" version)) (sha256 (base32 "0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr")))) @@ -1568,10 +1471,7 @@ derivations of regular expressions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hxt/hxt-" - version - ".tar.gz")) + (uri (hackage-uri "hxt" version)) (sha256 (base32 "1n9snbdl46x23ka7bbsls1vsn0plpmfmbpbl0msjfm92fkk2yq7g")))) @@ -1616,8 +1516,7 @@ from them. Some primitives have both a functional and an arrow interface.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-common/http-common-" version ".tar.gz")) + (uri (hackage-uri "http-common" version)) (sha256 (base32 "1xpbnfac0fqa5r670ggwm4kq3cmz9jpaw9bx40j9w9qiw6xi4i28")))) @@ -1646,8 +1545,7 @@ pipes-http re-export this package's types and functions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-streams/http-streams-" version ".tar.gz")) + (uri (hackage-uri "http-streams" version)) (sha256 (base32 "03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa")))) @@ -1683,8 +1581,7 @@ deal with the result.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "snap-core/snap-core-" version ".tar.gz")) + (uri (hackage-uri "snap-core" version)) (sha256 (base32 "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs")))) @@ -1735,8 +1632,7 @@ contains the core definitions and types for the Snap framework.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "snap-server/snap-server-" version ".tar.gz")) + (uri (hackage-uri "snap-server" version)) (sha256 (base32 "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j")))) @@ -1788,9 +1684,7 @@ protocol.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/js-jquery/js-jquery-" - version ".tar.gz")) + (hackage-uri "js-jquery" version)) (sha256 (base32 "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70")))) @@ -1815,9 +1709,7 @@ users (e.g. Debian).") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/js-flot/js-flot-" - version ".tar.gz")) + (hackage-uri "js-flot" version)) (sha256 (base32 "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv")))) @@ -1842,9 +1734,7 @@ requirements of downstream users (e.g. Debian).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/happstack-server/happstack-server-" - version ".tar.gz")) + (uri (hackage-uri "happstack-server" version)) (sha256 (base32 "0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n")))) @@ -1887,9 +1777,7 @@ cookies, serving files, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/sendfile/sendfile-" - version ".tar.gz")) + (uri (hackage-uri "sendfile" version)) (sha256 (base32 "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0")))) @@ -1910,9 +1798,7 @@ cookies, serving files, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/scalpel-core/" - "scalpel-core-" version ".tar.gz")) + (uri (hackage-uri "scalpel-core" version)) (sha256 (base32 "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf")))) @@ -1943,9 +1829,7 @@ non-Haskell dependencies.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/scalpel/" - "scalpel-" version ".tar.gz")) + (uri (hackage-uri "scalpel" version)) (sha256 (base32 "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch")))) @@ -1974,10 +1858,7 @@ declarative and monadic interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/sourcemap/sourcemap-" - version - ".tar.gz")) + (uri (hackage-uri "sourcemap" version)) (sha256 (base32 "0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a")))) @@ -2007,10 +1888,7 @@ proposed by Google and Mozilla here (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/language-javascript/language-javascript-" - version - ".tar.gz")) + (uri (hackage-uri "language-javascript" version)) (sha256 (base32 "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i")))) @@ -2035,10 +1913,7 @@ as frontend to hjsmin.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/bower-json/bower-json-" - version - ".tar.gz")) + (uri (hackage-uri "bower-json" version)) (sha256 (base32 "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs")))) @@ -2063,8 +1938,7 @@ Bower's package manifest file, bower.json.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/DAV/DAV-" - version ".tar.gz")) + (uri (hackage-uri "DAV" version)) (sha256 (base32 "1isvi4fahq70lzxfz23as7qzkc01g7kba568l6flrgd0j1984fsy")))) (build-system haskell-build-system) @@ -2099,8 +1973,7 @@ Authoring and Versioning (WebDAV) extensions to HTTP as well an executable, (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yesod-test/yesod-test-" version ".tar.gz")) + (uri (hackage-uri "yesod-test" version)) (sha256 (base32 "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8")))) @@ -2145,9 +2018,7 @@ HTML responses using CSS selectors.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "wai-app-static/wai-app-static-" - version ".tar.gz")) + (uri (hackage-uri "wai-app-static" version)) (sha256 (base32 "138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8")))) @@ -2189,8 +2060,7 @@ helper functions and datatypes for use outside of WAI.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hjsmin/hjsmin-" version ".tar.gz")) + (uri (hackage-uri "hjsmin" version)) (sha256 (base32 "1r2p5rjdjr25j3w4s57q5hxw2c3ymw12x7ms18yvglnq2ivr9fc1")))) @@ -2221,8 +2091,7 @@ syntactic elements, without changing the semantics.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yesod-static/yesod-static-" version ".tar.gz")) + (uri (hackage-uri "yesod-static" version)) (sha256 (base32 "18f5hm9ncvkzl8bkn39cg841z0k5iqs5w45afsyk9y6k98pjd54p")))) @@ -2264,9 +2133,7 @@ for the Yesod Web Framework.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "wai-handler-launch/wai-handler-launch-" - version ".tar.gz")) + (uri (hackage-uri "wai-handler-launch" version)) (sha256 (base32 "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m")))) @@ -2289,8 +2156,7 @@ server no longer receives pings, it shuts down.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "wai-cors/wai-cors-" version ".tar.gz")) + (uri (hackage-uri "wai-cors" version)) (sha256 (base32 "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5")))) @@ -2333,10 +2199,7 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network-run/network-run-" - version - ".tar.gz")) + (uri (hackage-uri "network-run" version)) (sha256 (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl")))) (build-system haskell-build-system) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e626c1f326..aa8be12a88 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -91,9 +91,7 @@ (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "abstract-deque-" version "/" - "abstract-deque-" version ".tar.gz")) + (uri (hackage-uri "abstract-deque" version)) (sha256 (base32 "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9")))) @@ -129,9 +127,7 @@ This package also includes a simple reference implementation based on (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "abstract-par-" version "/" - "abstract-par-" version ".tar.gz")) + (uri (hackage-uri "abstract-par" version)) (sha256 (base32 "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4")))) @@ -153,8 +149,7 @@ module for more details.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "active/active-" version ".tar.gz")) + (uri (hackage-uri "active" version)) (sha256 (base32 "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74")))) @@ -181,10 +176,7 @@ diagrams framework}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/adjunctions/adjunctions-" - version - ".tar.gz")) + (uri (hackage-uri "adjunctions" version)) (sha256 (base32 "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) @@ -219,9 +211,7 @@ for Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aeson-compat-" version "/" - "aeson-compat-" version ".tar.gz")) + (uri (hackage-uri "aeson-compat" version)) (sha256 (base32 "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w")))) @@ -257,8 +247,7 @@ ghc-aeson.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aeson-diff/aeson-diff-" version ".tar.gz")) + (uri (hackage-uri "aeson-diff" version)) (sha256 (base32 "18bm4qyjjwgrr6dxc4y0vai0z6qgrh2lcqb4jrr4xqs4cxrlwr92")))) @@ -297,10 +286,7 @@ systems.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/alex/alex-" - version - ".tar.gz")) + (uri (hackage-uri "alex" version)) (sha256 (base32 "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali")))) @@ -334,10 +320,7 @@ tool lex or flex for C/C++.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/alsa-core/alsa-core-" - version - ".tar.gz")) + (uri (hackage-uri "alsa-core" version)) (sha256 (base32 "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b")))) @@ -363,9 +346,7 @@ needed by both alsa-seq and alsa-pcm.") (origin (method url-fetch) (uri - (string-append - "mirror://hackage/package/alsa-mixer/alsa-mixer-" - version ".tar.gz")) + (hackage-uri "alsa-mixer" version)) (sha256 (base32 "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb")))) @@ -386,10 +367,7 @@ needed by both alsa-seq and alsa-pcm.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/annotated-wl-pprint" - "/annotated-wl-pprint-" version - ".tar.gz")) + (uri (hackage-uri "annotated-wl-pprint" version)) (sha256 (base32 "061xfz6qany3wf95csl8dcik2pz22cn8iv1qchhm16isw5zjs9hc")))) @@ -412,10 +390,7 @@ a variety of ways.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" - version - ".tar.gz")) + (uri (hackage-uri "ansi-terminal" version)) (sha256 (base32 "14rp62c7y79n9dmmi7m0l9n3mcq6dh331b4yyyrivm5da6g1nqf6")))) @@ -437,9 +412,7 @@ cursor, and changing the title.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "ansi-wl-pprint/ansi-wl-pprint-" - version ".tar.gz")) + (uri (hackage-uri "ansi-wl-pprint" version)) (sha256 (base32 "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7")))) @@ -464,10 +437,7 @@ colored output using the ansi-terminal package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/appar/appar-" - version - ".tar.gz")) + (uri (hackage-uri "appar" version)) (sha256 (base32 "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4")))) @@ -487,10 +457,7 @@ style.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/assoc/assoc-" - version - ".tar.gz")) + (uri (hackage-uri "assoc" version)) (sha256 (base32 "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q")))) @@ -515,10 +482,7 @@ similar operations (e.g. @code{Either}, @code{These}).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/async/async-" - version - ".tar.gz")) + (uri (hackage-uri "async" version)) (sha256 (base32 "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8")))) @@ -543,8 +507,7 @@ will eventually deliver a value of type @code{a}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/atomic-primops" - "/atomic-primops-" version ".tar.gz")) + (uri (hackage-uri "atomic-primops" version)) (sha256 (base32 "0gidqyk913vhcz3q4vnpadx3vkkrwb66rqhsxvdba8g2p5z63a12")))) @@ -596,10 +559,7 @@ permissions while atomically writing to a file.") (source (origin (inherit (package-source ghc-atomic-write)) - (uri (string-append - "https://hackage.haskell.org/package/atomic-write/atomic-write-" - version - ".tar.gz")) + (uri (hackage-uri "atomic-write" version)) (sha256 (base32 "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm")))))) @@ -611,10 +571,7 @@ permissions while atomically writing to a file.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/attoparsec/attoparsec-" - version - ".tar.gz")) + (uri (hackage-uri "attoparsec" version)) (sha256 (base32 "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11")))) @@ -662,9 +619,7 @@ complicated text/binary file formats.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "attoparsec-iso8601-" version "/" - "attoparsec-iso8601-" version ".tar.gz")) + (uri (hackage-uri "attoparsec-iso8601" version)) (sha256 (base32 "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582")))) @@ -687,10 +642,7 @@ from aeson.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/auto-update/auto-update-" - version - ".tar.gz")) + (uri (hackage-uri "auto-update" version)) (sha256 (base32 "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l")))) @@ -711,8 +663,7 @@ periodic, on-demand actions in Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aws-" version "/aws-" version ".tar.gz")) + (uri (hackage-uri "aws" version)) (sha256 (base32 "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r")))) (build-system haskell-build-system) @@ -781,9 +732,7 @@ Web Services.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base16-bytestring/" - "base16-bytestring-" version ".tar.gz")) + (uri (hackage-uri "base16-bytestring" version)) (sha256 (base32 "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0")))) @@ -806,10 +755,7 @@ data quickly and efficiently, using the ByteString type.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base64-bytestring/base64-bytestring-" - version - ".tar.gz")) + (uri (hackage-uri "base64-bytestring" version)) (sha256 (base32 "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391")))) (build-system haskell-build-system) @@ -828,10 +774,7 @@ Haskell @code{ByteString}s.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base-compat/base-compat-" - version - ".tar.gz")) + (uri (hackage-uri "base-compat" version)) (sha256 (base32 "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk")))) @@ -854,9 +797,7 @@ pragmas in your code.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "base-compat-batteries/base-compat-batteries-" - version ".tar.gz")) + (uri (hackage-uri "base-compat-batteries" version)) (sha256 (base32 "08rh9nlm9ir28fm42xim06ga8qwdqdcvkbb5ckz99bwnmajndq1i")))) @@ -883,8 +824,7 @@ than @code{base-compat}, which has no dependencies.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "basement/basement-" version ".tar.gz")) + (uri (hackage-uri "basement" version)) (sha256 (base32 "12zsnxkgv86im2prslk6ddhy0zwpawwjc1h4ff63kpxp2xdl7i2k")))) @@ -905,10 +845,7 @@ packages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base-orphans/base-orphans-" - version - ".tar.gz")) + (uri (hackage-uri "base-orphans" version)) (sha256 (base32 "1lw1jhrrsdq7x9wr2bwkxq9mscidcad0n30kh9gfk8kgifl5xh9k")))) @@ -929,9 +866,7 @@ available in later versions of base to a wider (older) range of compilers.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "base-prelude-" version "/" - "base-prelude-" version ".tar.gz")) + (uri (hackage-uri "base-prelude" version)) (sha256 (base32 "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs")))) @@ -964,10 +899,7 @@ the bounds of \"base\" as well.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base-unicode-symbols/base-unicode-symbols-" - version - ".tar.gz")) + (uri (hackage-uri "base-unicode-symbols" version)) (sha256 (base32 "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23")))) @@ -993,9 +925,7 @@ stand for certain ASCII character sequences, i.e. → instead of @code{->}, (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/basic-prelude/" - "basic-prelude-" version ".tar.gz")) + (uri (hackage-uri "basic-prelude" version)) (sha256 (base32 "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h")))) @@ -1030,9 +960,7 @@ wishing to create a new prelude should use CorePrelude.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bencode/bencode-" - version ".tar.gz")) + (uri (hackage-uri "bencode" version)) (sha256 (base32 "0znv0y3b3zm5jvhlvj5f5s7y93db67j9yd59w1bnrw2pqv30gqaq")))) (build-system haskell-build-system) @@ -1056,10 +984,7 @@ storing and transmitting loosely structured data.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bifunctors/bifunctors-" - version - ".tar.gz")) + (uri (hackage-uri "bifunctors" version)) (sha256 (base32 "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb")))) @@ -1086,8 +1011,7 @@ storing and transmitting loosely structured data.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/bindings-DSL/" - "bindings-DSL-" version ".tar.gz")) + (uri (hackage-uri "bindings-DSL" version)) (sha256 (base32 "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3")))) @@ -1112,8 +1036,7 @@ functions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "bitarray/bitarray-" version ".tar.gz")) + (uri (hackage-uri "bitarray" version)) (sha256 (base32 "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj")))) @@ -1134,10 +1057,7 @@ functions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/blaze-builder/blaze-builder-" - version - ".tar.gz")) + (uri (hackage-uri "blaze-builder" version)) (sha256 (base32 "0rxg6vjr0ji6g1nngrqpl4k1q9w66fwkhld9cqm5yfhx0a69kp1c")))) @@ -1168,9 +1088,7 @@ interoperate with code that uses the new implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "blaze-markup/blaze-markup-" - version ".tar.gz")) + (uri (hackage-uri "blaze-markup" version)) (sha256 (base32 "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23")))) @@ -1202,8 +1120,7 @@ library for Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "bloomfilter/bloomfilter-" version ".tar.gz")) + (uri (hackage-uri "bloomfilter" version)) (sha256 (base32 "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")))) @@ -1226,8 +1143,7 @@ interface.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/boxes/boxes-" - version ".tar.gz")) + (uri (hackage-uri "boxes" version)) (sha256 (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) (build-system haskell-build-system) @@ -1247,8 +1163,7 @@ using a simple box model.") (version "0.1.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "byteable/byteable-" version ".tar.gz")) + (uri (hackage-uri "byteable" version)) (sha256 (base32 "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4")))) @@ -1269,10 +1184,7 @@ wrapping a bytestring with stronger and more meaniful name.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/byteorder/byteorder-" - version - ".tar.gz")) + (uri (hackage-uri "byteorder" version)) (sha256 (base32 "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x")))) @@ -1295,9 +1207,7 @@ system.") (origin (method url-fetch) (uri - (string-append "https://hackage.haskell.org/package/bytes-" - version "/bytes-" - version ".tar.gz")) + (hackage-uri "bytes" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 @@ -1325,9 +1235,7 @@ serialization code.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bytestring-builder" - "/bytestring-builder-" version ".tar.gz")) + (uri (hackage-uri "bytestring-builder" version)) (sha256 (base32 "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7")))) @@ -1348,9 +1256,7 @@ Compatibility package for older packages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bytestring-handle/bytestring-handle-" - version ".tar.gz")) + (uri (hackage-uri "bytestring-handle" version)) (sha256 (base32 "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) @@ -1374,9 +1280,7 @@ Compatibility package for older packages.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "bytestring-lexing/bytestring-lexing-" - version ".tar.gz")) + (uri (hackage-uri "bytestring-lexing" version)) (sha256 (base32 "1p7i2haix4m11an3djaq65cnd293hzwqy4cd2i8jxzcl248pk6iy")))) @@ -1398,8 +1302,7 @@ from strict or lazy bytestrings.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/bzlib-conduit/" - "bzlib-conduit-" version ".tar.gz")) + (uri (hackage-uri "bzlib-conduit" version)) (sha256 (base32 "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b")))) @@ -1424,10 +1327,7 @@ streaming compression and decompression.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/c2hs/c2hs-" - version - ".tar.gz")) + (uri (hackage-uri "c2hs" version)) (sha256 (base32 "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir")))) @@ -1482,8 +1382,7 @@ imported with the correct Haskell types.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/cairo/" - "cairo-" version ".tar.gz")) + (uri (hackage-uri "cairo" version)) (sha256 (base32 "1hpkyhrlg1d24s34kq6d379z8l8fvznm98wpq37haqjma4nl25hk")))) @@ -1508,9 +1407,7 @@ documents, amongst others.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "call-stack/call-stack-" - version ".tar.gz")) + (uri (hackage-uri "call-stack" version)) (sha256 (base32 "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq")))) @@ -1540,10 +1437,7 @@ call stacks with different versions of the compiler.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/case-insensitive/case-insensitive-" - version - ".tar.gz")) + (uri (hackage-uri "case-insensitive" version)) (sha256 (base32 "01p40hfjyldfds5jg6vlvvn3ihs4ki63xn6fh8yzngaz1izc2v99")))) @@ -1571,10 +1465,7 @@ the resulting type will be insensitive to cases.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cassava/cassava-" - version - ".tar.gz")) + (uri (hackage-uri "cassava" version)) (sha256 (base32 "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk")))) @@ -1653,11 +1544,7 @@ very simple example of encoding CSV data: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cassava-megaparsec/" - "cassava-megaparsec-" - version - ".tar.gz")) + (uri (hackage-uri "cassava-megaparsec" version)) (sha256 (base32 "0pg9z38jmrylbj683b6pf7psipp7lrdq6mn1hbj8v2gj5lh8yf8n")))) @@ -1681,10 +1568,7 @@ provides for better error messages at the expense of some speed.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cborg/cborg-" - version - ".tar.gz")) + (uri (hackage-uri "cborg" version)) (sha256 (base32 "08da498bpbnl5c919m45mjm7sr78nn6qs7xyl0smfgd06wwm65xf")))) @@ -1729,10 +1613,7 @@ command-line utility for working with CBOR data.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/cborg-json/cborg-json-" - version - ".tar.gz")) + (uri (hackage-uri "cborg-json" version)) (sha256 (base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b")))) (build-system haskell-build-system) @@ -1761,10 +1642,7 @@ defined in the CBOR specification, RFC 7049.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cereal/cereal-" - version - ".tar.gz")) + (uri (hackage-uri "cereal" version)) (sha256 (base32 "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id")))) @@ -1787,9 +1665,7 @@ parser isolation, and labeled blocks for better error messages.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cereal-conduit/cereal-conduit-" - version ".tar.gz")) + (uri (hackage-uri "cereal-conduit" version)) (sha256 (base32 "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r")))) @@ -1813,10 +1689,7 @@ parser isolation, and labeled blocks for better error messages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cgi/cgi-" - version - ".tar.gz")) + (uri (hackage-uri "cgi" version)) (sha256 (base32 "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a")))) @@ -1840,10 +1713,7 @@ parser isolation, and labeled blocks for better error messages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/charset/charset-" - version - ".tar.gz")) + (uri (hackage-uri "charset" version)) (sha256 (base32 "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks")))) @@ -1864,8 +1734,7 @@ Haskell, based on complemented PATRICIA tries.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/Chart/" - "Chart-" version ".tar.gz")) + (uri (hackage-uri "Chart" version)) (sha256 (base32 "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry")))) @@ -1895,8 +1764,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/Chart-cairo/" - "Chart-cairo-" version ".tar.gz")) + (uri (hackage-uri "Chart-cairo" version)) (sha256 (base32 "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f")))) @@ -1927,8 +1795,7 @@ backend for the Charts library.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/ChasingBottoms/" - "ChasingBottoms-" version ".tar.gz")) + (uri (hackage-uri "ChasingBottoms" version)) (sha256 (base32 "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3")))) @@ -1956,10 +1823,7 @@ Partial and Infinite Values\"}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cheapskate/cheapskate-" - version - ".tar.gz")) + (uri (hackage-uri "cheapskate" version)) (sha256 (base32 "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd")))) @@ -1984,9 +1848,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/chell/chell-" - version ".tar.gz")) + (uri (hackage-uri "chell" version)) (sha256 (base32 "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg")))) @@ -2014,9 +1876,7 @@ testing strategies.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/chell-quickcheck/" - "chell-quickcheck-" version ".tar.gz")) + (uri (hackage-uri "chell-quickcheck" version)) (sha256 (base32 "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03")))) @@ -2077,9 +1937,7 @@ testing strategies.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "chunked-data-" version "/" - "chunked-data-" version ".tar.gz")) + (uri (hackage-uri "chunked-data" version)) (sha256 (base32 "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) @@ -2100,10 +1958,7 @@ classy-prelude.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "clock/" - "clock-" version ".tar.gz")) + (uri (hackage-uri "clock" version)) (sha256 (base32 "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b")))) (build-system haskell-build-system) @@ -2134,8 +1989,7 @@ timer functions of different operating systems via a unified API.") (method url-fetch) ;; XXX As of version 0.6, this package bundles libcmark 0.28.0. ;; See cbits/cmark_version.h. - (uri (string-append "https://hackage.haskell.org/package/" - "cmark/cmark-" version ".tar.gz")) + (uri (hackage-uri "cmark" version)) (sha256 (base32 "1p41z6z8dqxk62287lvhhg4ayy9laai9ljh4azsnzb029v6mbv0d")))) @@ -2159,9 +2013,7 @@ sources, and does not require prior installation of the C library.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cmark-gfm/cmark-gfm-" - version ".tar.gz")) + (uri (hackage-uri "cmark-gfm" version)) (sha256 (base32 "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f")))) @@ -2186,9 +2038,7 @@ of the C library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cmdargs/cmdargs-" - version ".tar.gz")) + (uri (hackage-uri "cmdargs" version)) (sha256 (base32 "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) @@ -2209,9 +2059,7 @@ of the C library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/code-page/code-page-" - version ".tar.gz")) + (uri (hackage-uri "code-page" version)) (sha256 (base32 "1aiavczjk6f2kc1cdwjc1mwkr4d9shiz3xwmfbzsdn0yqqchxydj")))) @@ -2231,9 +2079,7 @@ nothing.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/colour/colour-" - version ".tar.gz")) + (uri (hackage-uri "colour" version)) (sha256 (base32 "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc")))) @@ -2258,10 +2104,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/comonad/comonad-" - version - ".tar.gz")) + (uri (hackage-uri "comonad" version)) (sha256 (base32 "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g")))) @@ -2281,9 +2124,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") (version "1.0.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/concatenative/concatenative-" - version ".tar.gz")) + (uri (hackage-uri "concatenative" version)) (sha256 (base32 "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd")))) @@ -2305,9 +2146,7 @@ postfix notation. For more information on stack based languages, see (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "concurrent-extra/concurrent-extra-" - version ".tar.gz")) + (uri (hackage-uri "concurrent-extra" version)) (sha256 (base32 "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4")))) @@ -2354,10 +2193,7 @@ Python.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/concurrent-output/concurrent-output-" - version - ".tar.gz")) + (uri (hackage-uri "concurrent-output" version)) (sha256 (base32 "081wpag1d5znr0ynrjvkc14xl816m88vz9hgfm3g3sp6ak7s3y47")))) @@ -2384,8 +2220,7 @@ concurrent threads. Can be used for progress displays etc.") (version "1.3.1.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit/conduit-" version ".tar.gz")) + (uri (hackage-uri "conduit" version)) (sha256 (base32 "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) @@ -2423,9 +2258,7 @@ space as enumerator/iteratee and pipes.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-algorithms/conduit-algorithms-" - version ".tar.gz")) + (uri (hackage-uri "conduit-algorithms" version)) (sha256 (base32 "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i")))) @@ -2464,9 +2297,7 @@ level asynchronous processing and some other utilities.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-combinators-" version "/" - "conduit-combinators-" version ".tar.gz")) + (uri (hackage-uri "conduit-combinators" version)) (sha256 (base32 "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp")))) @@ -2501,9 +2332,7 @@ as well as a convenient Conduit module.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-extra/conduit-extra-" - version ".tar.gz")) + (uri (hackage-uri "conduit-extra" version)) (sha256 (base32 "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a")))) @@ -2544,8 +2373,7 @@ dependencies. The basic idea is that this package should only depend on (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-zstd/conduit-zstd-" version ".tar.gz")) + (uri (hackage-uri "conduit-zstd" version)) (sha256 (base32 "0f0ir4zs3skw33c8mfppxhfsyqh1c2cnc4gkf8bvv3bdiikdj1yl")))) @@ -2571,8 +2399,7 @@ interface}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "config-ini/config-ini-" version ".tar.gz")) + (uri (hackage-uri "config-ini" version)) (sha256 (base32 "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf")))) (build-system haskell-build-system) @@ -2606,9 +2433,7 @@ human-readable error messages when things go wrong.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "configurator/configurator-" - version ".tar.gz")) + (uri (hackage-uri "configurator" version)) (sha256 (base32 "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf")))) @@ -2644,9 +2469,7 @@ and daemons. The features include: (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "connection/connection-" - version ".tar.gz")) + (uri (hackage-uri "connection" version)) (sha256 (base32 "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax")))) @@ -2677,9 +2500,7 @@ the choice of SSL/TLS, and SOCKS.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/constraints/constraints-" - version ".tar.gz")) + (uri (hackage-uri "constraints" version)) (sha256 (base32 "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj")))) @@ -2705,10 +2526,7 @@ a vocabulary for working with them.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/contravariant/contravariant-" - version - ".tar.gz")) + (uri (hackage-uri "contravariant" version)) (sha256 (base32 "1ynz89vfn7czxpa203zmdqknkvpylzzl9rlkpasx1anph1jxcbq6")))) @@ -2729,9 +2547,7 @@ a vocabulary for working with them.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "contravariant-extras-" version "/" - "contravariant-extras-" version ".tar.gz")) + (uri (hackage-uri "contravariant-extras" version)) (sha256 (base32 "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9")))) @@ -2752,11 +2568,7 @@ a vocabulary for working with them.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/" - "package/control-monad-free/control-monad-free-" - version - ".tar.gz")) + (uri (hackage-uri "control-monad-free" version)) (sha256 (base32 "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33")))) @@ -2783,8 +2595,7 @@ Free Monads, MPC'08} (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/convertible/" - "convertible-" version ".tar.gz")) + (uri (hackage-uri "convertible" version)) (sha256 (base32 "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9")))) @@ -2809,10 +2620,7 @@ function performs the conversion you desire.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/csv/csv-" - version - ".tar.gz")) + (uri (hackage-uri "csv" version)) (sha256 (base32 "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c")))) @@ -2842,9 +2650,7 @@ lingua franca for spreadsheets, and for certain web services.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-accessor/data-accessor-" - version ".tar.gz")) + (uri (hackage-uri "data-accessor" version)) (sha256 (base32 "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x")))) (build-system haskell-build-system) @@ -2863,9 +2669,7 @@ manipulating fields of records.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/data-accessor-transformers/" - "data-accessor-transformers-" version ".tar.gz")) + (uri (hackage-uri "data-accessor-transformers" version)) (sha256 (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) (build-system haskell-build-system) @@ -2884,8 +2688,7 @@ Accessor to access state in transformers State monad.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/data-clist/" - "data-clist-" version ".tar.gz")) + (uri (hackage-uri "data-clist" version)) (sha256 (base32 "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m")))) (build-system haskell-build-system) @@ -2911,10 +2714,7 @@ observed.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-default/data-default-" - version - ".tar.gz")) + (uri (hackage-uri "data-default" version)) (sha256 (base32 "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh")))) (build-system haskell-build-system) @@ -2939,9 +2739,7 @@ packages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-default-class/" - "data-default-class-" version ".tar.gz")) + (uri (hackage-uri "data-default-class" version)) (sha256 (base32 "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag")))) (build-system haskell-build-system) @@ -2959,10 +2757,7 @@ packages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-base/" - "data-default-instances-base-" version ".tar.gz")) + (uri (hackage-uri "data-default-instances-base" version)) (sha256 (base32 "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4")))) (build-system haskell-build-system) @@ -2983,10 +2778,7 @@ package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-containers/" - "data-default-instances-containers-" version ".tar.gz")) + (uri (hackage-uri "data-default-instances-containers" version)) (sha256 (base32 "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5")))) (build-system haskell-build-system) @@ -3006,10 +2798,7 @@ package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-dlist/" - "data-default-instances-dlist-" version ".tar.gz")) + (uri (hackage-uri "data-default-instances-dlist" version)) (sha256 (base32 "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x")))) (build-system haskell-build-system) @@ -3029,10 +2818,7 @@ package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-old-locale/" - "data-default-instances-old-locale-" version ".tar.gz")) + (uri (hackage-uri "data-default-instances-old-locale" version)) (sha256 (base32 "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0")))) (build-system haskell-build-system) @@ -3053,9 +2839,7 @@ package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-fix/" - "data-fix-" version ".tar.gz")) + (uri (hackage-uri "data-fix" version)) (sha256 (base32 "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs")))) (build-system haskell-build-system) @@ -3077,8 +2861,7 @@ Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/data-hash" - "/data-hash-" version ".tar.gz")) + (uri (hackage-uri "data-hash" version)) (sha256 (base32 "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi")))) (build-system haskell-build-system) @@ -3100,9 +2883,7 @@ It includes hashing functions for all basic Haskell98 types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-ordlist/data-ordlist-" - version ".tar.gz")) + (uri (hackage-uri "data-ordlist" version)) (sha256 (base32 "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g")))) @@ -3122,9 +2903,7 @@ It includes hashing functions for all basic Haskell98 types.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/dbus/dbus-" - version ".tar.gz")) + (hackage-uri "dbus" version)) (sha256 (base32 "0iyfnkxcnm1vl379ry88fqxgn2y8q6ilsvpic6ciassnyv5pcbrv")))) @@ -3171,10 +2950,7 @@ interfaces common to foreign bindings.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/Decimal/Decimal-" - version - ".tar.gz")) + (uri (hackage-uri "Decimal" version)) (sha256 (base32 "19w7i9f0lbiyzwa0v3bm95233vi7f1688f0xms6cnjsf88h04ym3")))) @@ -3197,9 +2973,7 @@ value.") (version "0.2.0.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "deepseq-generics/deepseq-generics-" - version ".tar.gz")) + (uri (hackage-uri "deepseq-generics" version)) (sha256 (base32 "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) @@ -3225,9 +2999,7 @@ providing an @code{rnf} implementation.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "dense-linear-algebra/dense-linear-algebra-" - version ".tar.gz")) + (uri (hackage-uri "dense-linear-algebra" version)) (sha256 (base32 "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp")))) @@ -3255,10 +3027,7 @@ related modules split from the statistics library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/descriptive/descriptive-" - version - ".tar.gz")) + (uri (hackage-uri "descriptive" version)) (sha256 (base32 "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237")))) @@ -3284,8 +3053,7 @@ and parsers with useful semantics.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "diagrams-core/diagrams-core-" version ".tar.gz")) + (uri (hackage-uri "diagrams-core" version)) (sha256 (base32 "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn")))) @@ -3315,8 +3083,7 @@ declarative drawing.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "diagrams-lib/diagrams-lib-" version ".tar.gz")) + (uri (hackage-uri "diagrams-lib" version)) (sha256 (base32 "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy")))) @@ -3368,9 +3135,7 @@ primitives and operations for creating diagrams.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "diagrams-solve/diagrams-solve-" - version ".tar.gz")) + (uri (hackage-uri "diagrams-solve" version)) (sha256 (base32 "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17")))) @@ -3398,8 +3163,7 @@ and cyclic tridiagonal linear systems.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "diagrams-svg/diagrams-svg-" version ".tar.gz")) + (uri (hackage-uri "diagrams-svg" version)) (sha256 (base32 "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8")))) @@ -3435,9 +3199,7 @@ language (EDSL) to Scalable Vector Graphics (SVG) files.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "dictionary-sharing/dictionary-sharing-" - version ".tar.gz")) + (uri (hackage-uri "dictionary-sharing" version)) (sha256 (base32 "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc")))) @@ -3458,8 +3220,7 @@ members are shared.") (version "0.4.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "Diff/Diff-" version ".tar.gz")) + (uri (hackage-uri "Diff" version)) (sha256 (base32 "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j")))) @@ -3482,9 +3243,7 @@ and utilities for pretty printing.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "disk-free-space/disk-free-space-" - version ".tar.gz")) + (uri (hackage-uri "disk-free-space" version)) (sha256 (base32 "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi")))) @@ -3503,10 +3262,7 @@ disk space usage.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/distributive/distributive-" - version - ".tar.gz")) + (uri (hackage-uri "distributive" version)) (sha256 (base32 "14bb66qyfn43bj688igfvnfjw7iycjf4n2k38sm8rxbqw2916dfp")))) @@ -3530,10 +3286,7 @@ Dual to @code{Traversable}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dlist/dlist-" - version - ".tar.gz")) + (uri (hackage-uri "dlist" version)) (sha256 (base32 "0581a60xw4gw7pmqlmg5w2hr4hm9yjgx4c2z6v63y5xv51rn6g8p")))) (build-system haskell-build-system) @@ -3555,9 +3308,7 @@ Writer monad), where list append quickly becomes too expensive.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctemplates/doctemplates-" - version ".tar.gz")) + (uri (hackage-uri "doctemplates" version)) (sha256 (base32 "048h8ka849h1f0xxwkasjbrrwq03rfz2m7aqg5xc5286kp02w9ns")))) @@ -3588,10 +3339,7 @@ Writer monad), where list append quickly becomes too expensive.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest/doctest-" - version - ".tar.gz")) + (uri (hackage-uri "doctest" version)) (sha256 (base32 "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz")))) @@ -3623,10 +3371,7 @@ It is modeled after doctest for Python, see (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dotgen/dotgen-" - version - ".tar.gz")) + (uri (hackage-uri "dotgen" version)) (sha256 (base32 "1jcn5m9342jrdq7jln2v9msf9978ngrx0pq9rrjh8izhvbvph76s")))) @@ -3648,9 +3393,7 @@ monadic interface for building graphs.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "double-conversion/double-conversion-" - version ".tar.gz")) + (uri (hackage-uri "double-conversion" version)) (sha256 (base32 "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) @@ -3673,8 +3416,7 @@ between double precision floating point and text.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "dual-tree/dual-tree-" version ".tar.gz")) + (uri (hackage-uri "dual-tree" version)) (sha256 (base32 "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg")))) @@ -3705,10 +3447,7 @@ diagrams framework}, but potentially has other applications as well.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/easy-file/easy-file-" - version - ".tar.gz")) + (uri (hackage-uri "easy-file" version)) (sha256 (base32 "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) @@ -3727,9 +3466,7 @@ diagrams framework}, but potentially has other applications as well.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/easyplot/easyplot-" - version ".tar.gz")) + (uri (hackage-uri "easyplot" version)) (sha256 (base32 "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk")))) (build-system haskell-build-system) @@ -3752,9 +3489,7 @@ Haskell, using gnuplot for rendering.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/echo/echo-" - version ".tar.gz")) + (uri (hackage-uri "echo" version)) (sha256 (base32 "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9")))) @@ -3779,8 +3514,7 @@ MinTTY and other consoles.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/edit-distance" - "/edit-distance-" version ".tar.gz")) + (uri (hackage-uri "edit-distance" version)) (sha256 (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) (build-system haskell-build-system) @@ -3807,9 +3541,7 @@ Damerau-Levenshtein algorithms.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "edit-distance-vector/edit-distance-vector-" - version ".tar.gz")) + (uri (hackage-uri "edit-distance-vector" version)) (sha256 (base32 "07qgc8dyi9kkzkd3xcd78wdlljy0xwhz65b4r2qg2piidpcdvpxp")))) @@ -3840,9 +3572,7 @@ but is otherwise agnostic to: (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "either-" version "/" - "either-" version ".tar.gz")) + (uri (hackage-uri "either" version)) (sha256 (base32 "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2")))) @@ -3876,11 +3606,7 @@ but is otherwise agnostic to: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "email-validate/email-validate-" - version - ".tar.gz")) + (uri (hackage-uri "email-validate" version)) (sha256 (base32 "0n67wss6k8lhwfkybkhsa04bbdfdv541sacbxlylkx2hqpj5r5gh")))) @@ -3902,9 +3628,7 @@ address string against RFC 5322.") (version "1.0.3") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "enclosed-exceptions/enclosed-exceptions-" - version ".tar.gz")) + (uri (hackage-uri "enclosed-exceptions" version)) (sha256 (base32 "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg")))) @@ -3933,8 +3657,7 @@ asynchronous exceptions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/equivalence" - "/equivalence-" version ".tar.gz")) + (uri (hackage-uri "equivalence" version)) (sha256 (base32 "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp")))) (build-system haskell-build-system) @@ -3959,9 +3682,7 @@ monad transformer (instead of the IO monad).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "erf-" version "/" - "erf-" version ".tar.gz")) + (uri (hackage-uri "erf" version)) (sha256 (base32 "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14")))) @@ -3981,9 +3702,7 @@ Double.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "errorcall-eq-instance/errorcall-eq-instance-" - version ".tar.gz")) + (uri (hackage-uri "errorcall-eq-instance" version)) (sha256 (base32 "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm")))) @@ -4007,9 +3726,7 @@ This package provides an orphan instance.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "errors-" version "/" - "errors-" version ".tar.gz")) + (uri (hackage-uri "errors" version)) (sha256 (base32 "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) @@ -4031,8 +3748,7 @@ directly uses the type system, rather than out-of-band exceptions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "esqueleto/esqueleto-" version ".tar.gz")) + (uri (hackage-uri "esqueleto" version)) (sha256 (base32 "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz")))) @@ -4079,9 +3795,7 @@ generated SQL and optimize it for your backend.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "ghc-exactprint/ghc-exactprint-" version ".tar.gz")) + (uri (hackage-uri "ghc-exactprint" version)) (sha256 (base32 "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw")))) @@ -4107,10 +3821,7 @@ excluding @file{.lhs} files.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/exceptions/exceptions-" - version - ".tar.gz")) + (uri (hackage-uri "exceptions" version)) (sha256 (base32 "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd")))) @@ -4136,9 +3847,7 @@ for Haskell.") (version "0.0.3.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "executable-path/executable-path-" - version ".tar.gz")) + (uri (hackage-uri "executable-path" version)) (sha256 (base32 "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww")))) @@ -4160,9 +3869,7 @@ as invoked.\" This library tries to provide the missing path.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "extensible-exceptions/extensible-exceptions-" - version ".tar.gz")) + (uri (hackage-uri "extensible-exceptions" version)) (sha256 (base32 "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc")))) (build-system haskell-build-system) @@ -4181,10 +3888,7 @@ versions of GHC (i.e., < 6.10).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/extra/extra-" - version - ".tar.gz")) + (uri (hackage-uri "extra" version)) (sha256 (base32 "17fzmxwrv0w7inhq7kia36prc2nsx845r9v56sihqvr17fk2cvpn")))) @@ -4208,8 +3912,7 @@ this package makes them available back to GHC 7.2.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/fail/fail-" - version ".tar.gz")) + (uri (hackage-uri "fail" version)) (sha256 (base32 "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d")))) (build-system haskell-build-system) @@ -4234,10 +3937,7 @@ when used with GHC versions which already provide the (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fast-logger/fast-logger-" - version - ".tar.gz")) + (uri (hackage-uri "fast-logger" version)) (sha256 (base32 "1mbnah6n8lig494523czcd95dfn01f438qai9pf20wpa2gdbz4x6")))) @@ -4259,8 +3959,7 @@ when used with GHC versions which already provide the (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "feed/feed-" version ".tar.gz")) + (uri (hackage-uri "feed" version)) (sha256 (base32 "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk")))) @@ -4298,10 +3997,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fgl/fgl-" - version - ".tar.gz")) + (uri (hackage-uri "fgl" version)) (sha256 (base32 "04k5grp5d381wkc7sxgcl0sd3z3nlm6l6mmh103vhzh6p49vhs99")))) @@ -4335,9 +4031,7 @@ encourages inductive, recursive definitions of graph algorithms.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fgl-arbitrary/fgl-arbitrary-" - version ".tar.gz")) + (uri (hackage-uri "fgl-arbitrary" version)) (sha256 (base32 "1mykbd1r43gpsn10ys8q3nr0i4wnhn6wq23hcici18mxxji11wkc")))) @@ -4361,8 +4055,7 @@ for generating graph-like data structures.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/file-embed/" - "file-embed-" version ".tar.gz")) + (uri (hackage-uri "file-embed" version)) (sha256 (base32 "1pavxj642phrkq67620g10wqykjfhmm9yj2rm8pja83sadfvhrph")))) @@ -4382,8 +4075,7 @@ embedded in your Haskell code.") (version "0.3.6.3") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "filemanip/filemanip-" version ".tar.gz")) + (uri (hackage-uri "filemanip" version)) (sha256 (base32 "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) @@ -4406,9 +4098,7 @@ file contents, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/filepath-bytestring/" - "filepath-bytestring-" version ".tar.gz")) + (uri (hackage-uri "filepath-bytestring" version)) (sha256 (base32 "0qrrvbjpjsk75ghqrdqzwqg7wjgm3rr9kk7p04ax98ilv90pm0ip")))) @@ -4430,9 +4120,7 @@ file contents, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/FindBin/FindBin-" - version ".tar.gz")) + (uri (hackage-uri "FindBin" version)) (sha256 (base32 "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717")))) @@ -4454,9 +4142,7 @@ an executable.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fingertree/fingertree-" - version ".tar.gz")) + (uri (hackage-uri "fingertree" version)) (sha256 (base32 "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm")))) @@ -4481,9 +4167,7 @@ simple general-purpose data structure\".") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "finite-typelits/" - "finite-typelits-" version ".tar.gz")) + (uri (hackage-uri "finite-typelits" version)) (sha256 (base32 "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj")))) (build-system haskell-build-system) @@ -4502,8 +4186,7 @@ and indexed by type-level naturals.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/fixed/fixed-" - version ".tar.gz")) + (uri (hackage-uri "fixed" version)) (sha256 (base32 "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j")))) @@ -4524,9 +4207,7 @@ arithmetic.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/fmlist/fmlist-" - version ".tar.gz")) + (hackage-uri "fmlist" version)) (sha256 (base32 "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d")))) @@ -4548,9 +4229,7 @@ completely unverified though.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "foldl-" version "/" - "foldl-" version ".tar.gz")) + (uri (hackage-uri "foldl" version)) (sha256 (base32 "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag")))) @@ -4583,8 +4262,7 @@ and are often as efficient as hand-written folds.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "foundation/foundation-" version ".tar.gz")) + (uri (hackage-uri "foundation" version)) (sha256 (base32 "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d")))) @@ -4629,10 +4307,7 @@ Foundation has the following goals: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/free/free-" - version - ".tar.gz")) + (uri (hackage-uri "free" version)) (sha256 (base32 "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j")))) @@ -4667,9 +4342,7 @@ definition of @code{Monad}.") (version "0.3.0.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fsnotify/" - "fsnotify-" version ".tar.gz")) + (uri (hackage-uri "fsnotify" version)) (sha256 (base32 "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) @@ -4698,10 +4371,7 @@ specific Windows, Mac, and Linux file system event notification.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/generic-deriving/generic-deriving-" - version - ".tar.gz")) + (uri (hackage-uri "generic-deriving" version)) (sha256 (base32 "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7")))) @@ -4766,9 +4436,7 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/generic-random/" - "generic-random-" version ".tar.gz")) + (uri (hackage-uri "generic-random" version)) (sha256 (base32 "12rvb1dzrfjc46n9vdcw3yv773iih8vwhrac3hpzq70yp2z77jdw")))) (arguments '()))) @@ -4780,9 +4448,7 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "generics-sop-" version "/" - "generics-sop-" version ".tar.gz")) + (uri (hackage-uri "generics-sop" version)) (sha256 (base32 "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1")))) @@ -4806,9 +4472,7 @@ each constructor are represented using an n-ary product.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package" - "/geniplate-mirror" - "/geniplate-mirror-" version ".tar.gz")) + (uri (hackage-uri "geniplate-mirror" version)) (sha256 (base32 "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb")))) (build-system haskell-build-system) @@ -4828,10 +4492,7 @@ geniplate} package, written by Lennart Augustsson.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/genvalidity/genvalidity-" - version - ".tar.gz")) + (uri (hackage-uri "genvalidity" version)) (sha256 (base32 "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j")))) @@ -4857,11 +4518,7 @@ with the @code{Validity} typeclass.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "genvalidity-property/genvalidity-property-" - version - ".tar.gz")) + (uri (hackage-uri "genvalidity-property" version)) (sha256 (base32 "0cvzc4z4771vpycwfgcj0yswyglzl6cl1h2wrfhs224nrcmk5a7z")))) @@ -4891,9 +4548,7 @@ properties for functions operating on them.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "getopt-generics/getopt-generics-" - version ".tar.gz")) + (uri (hackage-uri "getopt-generics" version)) (sha256 (base32 "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr")))) @@ -4916,8 +4571,7 @@ interfaces with ease.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/gitrev/gitrev-" - version ".tar.gz")) + (uri (hackage-uri "gitrev" version)) (sha256 (base32 "0cl3lfm6k1h8fxp2vxa6ihfp4v8igkz9h35iwyq2frzm4kdn96d8")))) (build-system haskell-build-system) @@ -4939,9 +4593,7 @@ info for more informative bug reports.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "Glob-" version "/" - "Glob-" version ".tar.gz")) + (uri (hackage-uri "Glob" version)) (sha256 (base32 "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a")))) @@ -4965,10 +4617,7 @@ matching patterns against file paths.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/GLURaw/GLURaw-" - version - ".tar.gz")) + (uri (hackage-uri "GLURaw" version)) (sha256 (base32 "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) @@ -4990,10 +4639,7 @@ basis for a nicer interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/GLUT/GLUT-" - version - ".tar.gz")) + (uri (hackage-uri "GLUT" version)) (sha256 (base32 "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn")))) @@ -5015,9 +4661,7 @@ programs.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/gnuplot/gnuplot-" - version ".tar.gz")) + (uri (hackage-uri "gnuplot" version)) (sha256 (base32 "1rfq94lnsyjr8y9p5r56jpllv3p8rvh9xxzjji016b6r5adi8cnb")))) (build-system haskell-build-system) @@ -5050,8 +4694,7 @@ programs.") (version "2999.20.1.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "graphviz/graphviz-" version ".tar.gz")) + (uri (hackage-uri "graphviz" version)) (sha256 (base32 "0l0zxgb938hh09qirggbaskq79mgj3s081cnr42y5vm1rp1jir2s")))) @@ -5094,8 +4737,7 @@ and edge labels with positional information, etc. (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "groups/groups-" version ".tar.gz")) + (uri (hackage-uri "groups" version)) (sha256 (base32 "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf")))) @@ -5114,9 +4756,7 @@ monoid with invertibility.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "gtk2hs-buildtools/gtk2hs-buildtools-" - version ".tar.gz")) + (uri (hackage-uri "gtk2hs-buildtools" version)) (sha256 (base32 "102x753jbc90lfm9s0ng5kvm0risqwpar331xwsd752as0bms142")))) @@ -5144,9 +4784,7 @@ tools are not needed to actually run Gtk2Hs programs.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hackage-security/hackage-security-" - version ".tar.gz")) + (uri (hackage-uri "hackage-security" version)) (sha256 (base32 "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli")))) @@ -5193,10 +4831,7 @@ Tor project}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock/haddock-" - version - ".tar.gz")) + (uri (hackage-uri "haddock" version)) (sha256 (base32 "1ha4hrnidwkmwalqwd1ixa2933as5n4sj1lvz0cx89a3png7r930")))) @@ -5229,10 +4864,7 @@ Tor project}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock-api/haddock-api-" - version - ".tar.gz")) + (uri (hackage-uri "haddock-api" version)) (sha256 (base32 "1jj2csi85nlywsyvnbwhclfdz27j2kyfbhrl9cm7av0243br9vg1")))) @@ -5255,10 +4887,7 @@ documentation-generation tool for Haskell libraries.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock-library/haddock-library-" - version - ".tar.gz")) + (uri (hackage-uri "haddock-library" version)) (sha256 (base32 "15ak06q8yp11xz1hwr0sg2jqi3r78p1n89ik05hicqvxl3awf1pq")))) @@ -5322,9 +4951,7 @@ the ‘haddock’ package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/half/half-" - version ".tar.gz")) + (uri (hackage-uri "half" version)) (sha256 (base32 "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2")))) @@ -5346,10 +4973,7 @@ computation library for Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/happy/happy-" - version - ".tar.gz")) + (uri (hackage-uri "happy" version)) (sha256 (base32 "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v")))) @@ -5379,10 +5003,7 @@ Happy works in a similar way to the yacc tool for C.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hashable/hashable-" - version - ".tar.gz")) + (uri (hackage-uri "hashable" version)) (sha256 (base32 "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2")))) @@ -5421,10 +5042,7 @@ combine hash values.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hashable-time/hashable-time-" - version - ".tar.gz")) + (uri (hackage-uri "hashable-time" version)) (sha256 (base32 "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh")))) @@ -5449,9 +5067,7 @@ combine hash values.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hashtables/hashtables-" - version ".tar.gz")) + (uri (hackage-uri "hashtables" version)) (sha256 (base32 "0vgggm7bqq55zmqj6qji89bfj3k1rdkikkfhyg81vsqf0f3bzhqa")))) (build-system haskell-build-system) @@ -5480,10 +5096,7 @@ a set of wrappers to use the hash tables in the IO monad.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskeline/haskeline-" - version - ".tar.gz")) + (uri (hackage-uri "haskeline" version)) (sha256 (base32 "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb")))) @@ -5512,9 +5125,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" - version ".tar.gz")) + (uri (hackage-uri "haskell-lexer" version)) (sha256 (base32 "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii")))) (build-system haskell-build-system) @@ -5532,10 +5143,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-src/haskell-src-" - version - ".tar.gz")) + (uri (hackage-uri "haskell-src" version)) (sha256 (base32 "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746")))) @@ -5564,10 +5172,7 @@ package are to parse or generate Haskell 98 code.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-src-exts/haskell-src-exts-" - version - ".tar.gz")) + (uri (hackage-uri "haskell-src-exts" version)) (sha256 (base32 "01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7")))) @@ -5594,9 +5199,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "haskell-src-exts-util/haskell-src-exts-util-" - version ".tar.gz")) + (uri (hackage-uri "haskell-src-exts-util" version)) (sha256 (base32 "0fvqi72m74p7q5sbpy8m2chm8a1lgy10mfrcxcz8wrh59vngj0n8")))) @@ -5618,9 +5221,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (version "0.8.7") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "haskell-src-meta/haskell-src-meta-" - version ".tar.gz")) + (uri (hackage-uri "haskell-src-meta" version)) (sha256 (base32 "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in")))) @@ -5644,10 +5245,7 @@ template-haskell abstract syntax.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hasktags/hasktags-" - version - ".tar.gz")) + (uri (hackage-uri "hasktags" version)) (sha256 (base32 "09p79w16fgpqi6bwq162769xdrnyb7wnmz56k00nz6dj1a0bbbdd")))) @@ -5674,9 +5272,7 @@ Vim.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hex-" version "/" - "hex-" version ".tar.gz")) + (uri (hackage-uri "hex" version)) (sha256 (base32 "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va")))) @@ -5694,9 +5290,7 @@ hexadecimal string representation.") (version "0.6.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "highlighting-kate/highlighting-kate-" - version ".tar.gz")) + (uri (hackage-uri "highlighting-kate" version)) (sha256 (base32 "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) @@ -5724,10 +5318,7 @@ descriptions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hindent/hindent-" - version - ".tar.gz")) + (uri (hackage-uri "hindent" version)) (sha256 (base32 "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7")))) @@ -5781,9 +5372,7 @@ library and an executable.") (version "0.4.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hinotify/" - "hinotify-" version ".tar.gz")) + (uri (hackage-uri "hinotify" version)) (sha256 (base32 "06pqfikfa61i45g92b65br83kplwmizqkm42yp8d0ddgmq0b21qk")))) @@ -5805,10 +5394,7 @@ accessed or modified.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hledger-lib/hledger-lib-" - version - ".tar.gz")) + (uri (hackage-uri "hledger-lib" version)) (sha256 (base32 "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y")))) @@ -5865,9 +5451,7 @@ Accounting.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hmatrix/hmatrix-" - version ".tar.gz")) + (uri (hackage-uri "hmatrix" version)) (sha256 (base32 "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg")))) (build-system haskell-build-system) @@ -5899,9 +5483,7 @@ numerical computations based on BLAS and LAPACK.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hmatrix-gsl/hmatrix-gsl-" - version ".tar.gz")) + (uri (hackage-uri "hmatrix-gsl" version)) (sha256 (base32 "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm")))) (build-system haskell-build-system) @@ -5926,9 +5508,7 @@ using GSL.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/hmatrix-gsl-stats/hmatrix-gsl-stats-" - version ".tar.gz")) + (hackage-uri "hmatrix-gsl-stats" version)) (sha256 (base32 "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q")))) (build-system haskell-build-system) @@ -5950,9 +5530,7 @@ interface for statistics based on hmatrix and GSL.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/hmatrix-special/hmatrix-special-" - version ".tar.gz")) + (hackage-uri "hmatrix-special" version)) (sha256 (base32 "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz")))) (build-system haskell-build-system) @@ -5972,8 +5550,7 @@ functions for Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hostname/" - "hostname-" version ".tar.gz")) + (uri (hackage-uri "hostname" version)) (sha256 (base32 "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv")))) @@ -5991,8 +5568,7 @@ determine the hostname.") (version "0.2.12") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hourglass/hourglass-" version ".tar.gz")) + (uri (hackage-uri "hourglass" version)) (sha256 (base32 "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) @@ -6019,8 +5595,7 @@ representations of current time.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hpack/" - "hpack-" version ".tar.gz")) + (uri (hackage-uri "hpack" version)) (sha256 (base32 "0gmm6jgi1sgyilphww6apq1x04grqznm7xhyb7g1rj5j7my40ws2")))) @@ -6065,11 +5640,7 @@ are described in a file named @code{package.yaml}. Both @code{cabal2nix} and (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/" - "package/hspec-megaparsec/hspec-megaparsec-" - version - ".tar.gz")) + (uri (hackage-uri "hspec-megaparsec" version)) (sha256 (base32 "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn")))) @@ -6093,9 +5664,7 @@ with Hspec.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hs-bibutils/hs-bibutils-" - version ".tar.gz")) + (uri (hackage-uri "hs-bibutils" version)) (sha256 (base32 "1wnpy1v5rbii2iwlcc9psnww8pkirv9zl21s64cmbi6q7dv15g3n")))) @@ -6117,9 +5686,7 @@ MODS-format XML intermediate.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslogger-" version "/" "hslogger-" - version ".tar.gz")) + (uri (hackage-uri "hslogger" version)) (sha256 (base32 "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz")))) (build-system haskell-build-system) @@ -6145,8 +5712,7 @@ handler built in.") (version "1.3.0.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua/hslua-" version ".tar.gz")) + (uri (hackage-uri "hslua" version)) (sha256 (base32 "0p39xm0mmxzs5x6aim11qkb7npn0d9h7li2kwfhry0dijd1vm18i")))) @@ -6179,9 +5745,7 @@ described in @url{https://www.lua.org/}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua-module-system/hslua-module-system-" - version ".tar.gz")) + (uri (hackage-uri "hslua-module-system" version)) (sha256 (base32 "0hk2splyasbplnggknjhlb423axc5b32xq8aq8zal4vvwlqhzvf1")))) @@ -6207,9 +5771,7 @@ already been loaded before the loader can be added.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua-module-text/hslua-module-text-" - version ".tar.gz")) + (uri (hackage-uri "hslua-module-text" version)) (sha256 (base32 "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl")))) @@ -6234,8 +5796,7 @@ for Haskell. The functions provided by this module are @code{upper}, (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "HsYAML/HsYAML-" version ".tar.gz")) + (uri (hackage-uri "HsYAML" version)) (sha256 (base32 "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0")))) @@ -6286,9 +5847,7 @@ for user-defined custom schemas). (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-api-data-" version "/" - "http-api-data-" version ".tar.gz")) + (uri (hackage-uri "http-api-data" version)) (sha256 (base32 "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl")))) @@ -6324,9 +5883,7 @@ Haskell data types to and from HTTP API data.") (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ieee754/" - "ieee754-" version ".tar.gz")) + (uri (hackage-uri "ieee754" version)) (sha256 (base32 "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f")))) @@ -6346,8 +5903,7 @@ for general types.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "IfElse/IfElse-" version ".tar.gz")) + (uri (hackage-uri "IfElse" version)) (sha256 (base32 "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) @@ -6366,9 +5922,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (version "0.5.0.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/indents/indents-" - version ".tar.gz")) + (uri (hackage-uri "indents" version)) (sha256 (base32 "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51")))) @@ -6395,8 +5949,7 @@ lines continued at an indented level below.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "infer-license/infer-license-" version ".tar.gz")) + (uri (hackage-uri "infer-license" version)) (sha256 (base32 "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj")))) @@ -6419,8 +5972,7 @@ license from a given license file.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "ini/ini-" version ".tar.gz")) + (uri (hackage-uri "ini" version)) (sha256 (base32 "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l")))) (build-system haskell-build-system) @@ -6443,8 +5995,7 @@ read and write configuration files in the simple INI format.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/inline-c/" - "inline-c-" version ".tar.gz")) + (uri (hackage-uri "inline-c" version)) (sha256 (base32 "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i")))) @@ -6472,8 +6023,7 @@ minimal overhead. No FFI required.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/inline-c-cpp/" - "inline-c-cpp-" version ".tar.gz")) + (uri (hackage-uri "inline-c-cpp" version)) (sha256 (base32 "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0")))) @@ -6497,9 +6047,7 @@ minimal overhead. No FFI required.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "integer-logarithms/integer-logarithms-" - version ".tar.gz")) + (uri (hackage-uri "integer-logarithms" version)) (sha256 (base32 "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv")))) @@ -6539,8 +6087,7 @@ in migrated modules.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/interpolate/" - "interpolate-" version ".tar.gz")) + (uri (hackage-uri "interpolate" version)) (sha256 (base32 "03jrkj9c62w0c2awym8mhpsgpd0jffl50cqwfrm7bbdfhd8dsxi7")))) @@ -6564,8 +6111,7 @@ Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/IntervalMap/" - "IntervalMap-" version ".tar.gz")) + (uri (hackage-uri "IntervalMap" version)) (sha256 (base32 "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld")))) @@ -6588,8 +6134,7 @@ example code on the home page for a quick introduction.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "intervals/intervals-" version ".tar.gz")) + (uri (hackage-uri "intervals" version)) (sha256 (base32 "1qibvgys8lw61x9na3iy3dcglyj9qyhcbfc00glnagl7cbk1shlv")))) @@ -6612,9 +6157,7 @@ which represets a closed, convex set of floating point values.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/invariant/invariant-" - version ".tar.gz")) + (uri (hackage-uri "invariant" version)) (sha256 (base32 "1jlp0gbfjsx7k08275djh8m3v4rpg8llw5gdkg9s9qfx0lc0mymr")))) @@ -6647,8 +6190,7 @@ functors). For more information, see Edward Kmett's article (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "io-streams/io-streams-" version ".tar.gz")) + (uri (hackage-uri "io-streams" version)) (sha256 (base32 "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny")))) @@ -6681,9 +6223,7 @@ primitives for I/O using streams.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "io-streams-haproxy/io-streams-haproxy-" - version ".tar.gz")) + (uri (hackage-uri "io-streams-haproxy" version)) (sha256 (base32 "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp")))) @@ -6712,10 +6252,7 @@ through a forwarding proxy that is configured to speak this protocol.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/iproute/iproute-" - version - ".tar.gz")) + (uri (hackage-uri "iproute" version)) (sha256 (base32 "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90")))) @@ -6739,8 +6276,7 @@ removed. Both IPv4 and IPv6 are supported.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "ipynb/ipynb-" version ".tar.gz")) + (uri (hackage-uri "ipynb" version)) (sha256 (base32 "0qky4l5aaiq7ypwbxh0mr7s572290fi596f18dg68qpyzc49a9kx")))) @@ -6765,8 +6301,7 @@ instances for conversion to and from JSON .ipynb files.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/iwlib/iwlib-" - version ".tar.gz")) + (uri (hackage-uri "iwlib" version)) (sha256 (base32 "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz")))) (build-system haskell-build-system) @@ -6790,8 +6325,7 @@ supported systems.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/json/" - "json-" version ".tar.gz")) + (uri (hackage-uri "json" version)) (sha256 (base32 "1fjnd2r4gl2hfqx158db3cn3rsyin4ch7rf9scb2hcy90cy6l10c")))) @@ -6815,9 +6349,7 @@ Notation, JSON} is a lightweight data-interchange format.") (version "3.3.6") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "JuicyPixels/JuicyPixels-" - version ".tar.gz")) + (uri (hackage-uri "JuicyPixels" version)) (sha256 (base32 "1f8giivsqxma19ax78dr7j4gir12iyfqn2mlsd27zzl8dn7dy6w1")))) @@ -6840,10 +6372,7 @@ TIFF and GIF formats.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/kan-extensions/kan-extensions-" - version - ".tar.gz")) + (uri (hackage-uri "kan-extensions" version)) (sha256 (base32 "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml")))) @@ -6872,8 +6401,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "language-c/language-c-" version ".tar.gz")) + (uri (hackage-uri "language-c" version)) (sha256 (base32 "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk")))) @@ -6897,8 +6425,7 @@ and a large set of GNU extensions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "language-glsl/language-glsl-" version ".tar.gz")) + (uri (hackage-uri "language-glsl" version)) (sha256 (base32 "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1")))) @@ -6922,9 +6449,7 @@ representation, parsing, and pretty-printing of GLSL 1.50 code.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "language-haskell-extract-" version "/" - "language-haskell-extract-" version ".tar.gz")) + (uri (hackage-uri "language-haskell-extract" version)) (patches (search-patches "ghc-language-haskell-extract-ghc-8.10.patch")) (sha256 (base32 @@ -6962,8 +6487,7 @@ with @code{wc} (for a web service).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lens/lens-" - version ".tar.gz")) + (uri (hackage-uri "lens" version)) (sha256 (base32 "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j")))) @@ -7022,10 +6546,7 @@ indexed variants.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lens-family-core/lens-family-core-" - version - ".tar.gz")) + (uri (hackage-uri "lens-family-core" version)) (sha256 (base32 "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r")))) @@ -7059,8 +6580,7 @@ lenses and traversals for those who require Haskell 98.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "libffi/libffi-" version ".tar.gz")) + (uri (hackage-uri "libffi" version)) (sha256 (base32 "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28")))) @@ -7082,10 +6602,7 @@ to be called from Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/libmpd/libmpd-" - version - ".tar.gz")) + (uri (hackage-uri "libmpd" version)) (sha256 (base32 "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh")))) @@ -7109,8 +6626,7 @@ Music Player Daemon.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "ghc-lib-parser/ghc-lib-parser-" version ".tar.gz")) + (uri (hackage-uri "ghc-lib-parser" version)) (sha256 (base32 "178v4f7q9ndqmlhg2vhlk6ifm3ilajlrz8iw84vggzs7rp0fnlx0")))) @@ -7133,8 +6649,7 @@ compiler versions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/libxml/" - "libxml-" version ".tar.gz")) + (uri (hackage-uri "libxml" version)) (sha256 (base32 "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) @@ -7160,8 +6675,7 @@ compiler versions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "libyaml/libyaml-" version ".tar.gz")) + (uri (hackage-uri "libyaml" version)) (sha256 (base32 "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg")) @@ -7191,9 +6705,7 @@ LibYAML C library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lifted-async/lifted-async-" - version ".tar.gz")) + (uri (hackage-uri "lifted-async" version)) (sha256 (base32 "0j4f5471qfxkxy84ri87bcvp30ikh4m30imcggwn8m5v8igp218d")))) @@ -7224,10 +6736,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lifted-base/lifted-base-" - version - ".tar.gz")) + (uri (hackage-uri "lifted-base" version)) (sha256 (base32 "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) @@ -7253,8 +6762,7 @@ Kaseorg.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/linear/" - "linear-" version ".tar.gz")) + (uri (hackage-uri "linear" version)) (sha256 (base32 "0ax6prmc7b53w0lz5ddc40wrjj9bm7wldpp57283gx9hdf8qrb35")))) @@ -7298,9 +6806,7 @@ vector spaces.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/ListLike/ListLike-" - version ".tar.gz")) + (hackage-uri "ListLike" version)) (sha256 (base32 "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd")))) @@ -7333,8 +6839,7 @@ can handle infinite lists.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/llvm-hs-pure/" - "llvm-hs-pure-" version ".tar.gz")) + (uri (hackage-uri "llvm-hs-pure" version)) (sha256 (base32 "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf")))) @@ -7359,8 +6864,7 @@ llvm-hs-pure does not require LLVM to be available.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/llvm-hs/llvm-hs-" - version ".tar.gz")) + (uri (hackage-uri "llvm-hs" version)) (sha256 (base32 "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00")))) @@ -7393,9 +6897,7 @@ into Haskell.") (version "0.3.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "logging-facade/logging-facade-" - version ".tar.gz")) + (uri (hackage-uri "logging-facade" version)) (sha256 (base32 "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) @@ -7417,10 +6919,7 @@ back-ends.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/logict/logict-" - version - ".tar.gz")) + (uri (hackage-uri "logict" version)) (sha256 (base32 "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7")))) @@ -7445,10 +6944,7 @@ online}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lucid/lucid-" - version - ".tar.gz")) + (uri (hackage-uri "lucid" version)) (sha256 (base32 "0nky4pqxd6828kg3js90ks6r3hxs5x48ibfz37pw2dr7y1nygq21")))) @@ -7484,8 +6980,7 @@ Same combinator can be used for attributes and elements (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lzma/" - "lzma-" version ".tar.gz")) + (uri (hackage-uri "lzma" version)) (sha256 (base32 "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) @@ -7513,8 +7008,7 @@ monadic incremental interface is provided as well.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lzma-conduit/" - "lzma-conduit-" version ".tar.gz")) + (uri (hackage-uri "lzma-conduit" version)) (sha256 (base32 "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb")))) @@ -7543,9 +7037,7 @@ compression algorithm used in the @code{.xz} file format.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/magic/magic-" - version ".tar.gz")) + (uri (hackage-uri "magic" version)) (sha256 (base32 "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j")))) @@ -7566,10 +7058,7 @@ than its name.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/managed/managed-" - version - ".tar.gz")) + (uri (hackage-uri "managed" version)) (sha256 (base32 "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38")))) @@ -7602,9 +7091,7 @@ orphan instances (version "0.5.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/markdown-unlit/" - "markdown-unlit-" version ".tar.gz")) + (uri (hackage-uri "markdown-unlit" version)) (sha256 (base32 "0njzn56m8z6lm70xyixbylbnpjz1gk7x8vdsdvi3qld9m66gc3n7")))) @@ -7631,9 +7118,7 @@ same time is a literate Haskell program.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "math-functions-" version "/" - "math-functions-" version ".tar.gz")) + (uri (hackage-uri "math-functions" version)) (sha256 (base32 "18y1hlc8p6yyxa14zdbm84aaq58kksbrlfp3rj2bd4ilsb00mrf1")))) @@ -7663,9 +7148,7 @@ functions are often useful in statistical and numerical computing.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "megaparsec/megaparsec-" - version ".tar.gz")) + (uri (hackage-uri "megaparsec" version)) (sha256 (base32 "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j")))) @@ -7689,8 +7172,7 @@ speed, flexibility, and quality of parse errors.") (version "0.15.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "memory/memory-" version ".tar.gz")) + (uri (hackage-uri "memory" version)) (sha256 (base32 "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3")))) @@ -7717,10 +7199,7 @@ set, memory copy, ..) and more") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/MemoTrie/MemoTrie-" - version - ".tar.gz")) + (uri (hackage-uri "MemoTrie" version)) (sha256 (base32 "0lxsarhyhhkp58wpbp7b08scmjxq7s46jfl9vhp2yfq973hz0kaq")))) @@ -7741,9 +7220,7 @@ efficient memo functions using tries.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "microlens-" version "/" - "microlens-" version ".tar.gz")) + (uri (hackage-uri "microlens" version)) (sha256 (base32 "10q7gl9yavcln58sxdxzih7ff0ixxq5hpd87icvxw97yqf1p6hmm")))) @@ -7767,9 +7244,7 @@ stripped. As the result, this package has no dependencies.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "microlens-aeson/microlens-aeson-" - version ".tar.gz")) + (uri (hackage-uri "microlens-aeson" version)) (sha256 (base32 "074mzpk7av6i0xf7xy42jpzgljlmyw805md1vz4sqy85m99f0ikr")))) @@ -7798,10 +7273,7 @@ microlens.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/microlens-ghc/microlens-ghc-" - version - ".tar.gz")) + (uri (hackage-uri "microlens-ghc" version)) (sha256 (base32 "1r6x788br3f9rksj0dmk1nyh5mfvd9zzasclf1mi3rxhb7c0j926")))) @@ -7825,10 +7297,7 @@ microlens} family; see the readme (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/microlens-mtl/microlens-mtl-" - version - ".tar.gz")) + (uri (hackage-uri "microlens-mtl" version)) (sha256 (base32 "0ijy7xyd5lbc3calhcrhy8czkf3fjcxrv68p7kd2a5b352rfi7fp")))) @@ -7854,9 +7323,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "microlens-platform/microlens-platform-" version ".tar.gz")) + (uri (hackage-uri "microlens-platform" version)) (sha256 (base32 "0yf0z0glq2d6mpclzswc64h9w2cck4fd8l8ffm89pyb0a5n8m4c7")))) @@ -7898,9 +7365,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "microlens-th-" version "/" - "microlens-th-" version ".tar.gz")) + (uri (hackage-uri "microlens-th" version)) (sha256 (base32 "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c")))) @@ -7925,8 +7390,7 @@ used both from lens and microlens).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/MissingH/" - "MissingH-" version ".tar.gz")) + (uri (hackage-uri "MissingH" version)) (sha256 (base32 "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw")))) @@ -7965,8 +7429,7 @@ portable and easy to use.") (version "0.5.9") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mmap/mmap-" version ".tar.gz")) + (uri (hackage-uri "mmap" version)) (sha256 (base32 "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q")))) @@ -7988,10 +7451,7 @@ do on-demand loading.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mmorph/mmorph-" - version - ".tar.gz")) + (uri (hackage-uri "mmorph" version)) (sha256 (base32 "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6")))) @@ -8012,8 +7472,7 @@ manipulating monad transformer stacks.") (version "0.3.5") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mockery/mockery-" version ".tar.gz")) + (uri (hackage-uri "mockery" version)) (sha256 (base32 "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) @@ -8036,9 +7495,7 @@ manipulating monad transformer stacks.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/monad-control" - "/monad-control-" version ".tar.gz")) + (uri (hackage-uri "monad-control" version)) (sha256 (base32 "0g3if9km8ik80bcy130a826ig9wlk4bnf0qli3vmwdwr9nhaw2xf")))) @@ -8061,9 +7518,7 @@ a subset of @code{MonadBase} into which generic control operations such as (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-logger-" version "/" - "monad-logger-" version ".tar.gz")) + (uri (hackage-uri "monad-logger" version)) (sha256 (base32 "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh")))) @@ -8097,9 +7552,7 @@ code locations of messages.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-loops-" version "/" - "monad-loops-" version ".tar.gz")) + (uri (hackage-uri "monad-loops" version)) (sha256 (base32 "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky")))) @@ -8119,9 +7572,7 @@ operators for looping.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-par-" version "/" - "monad-par-" version ".tar.gz")) + (uri (hackage-uri "monad-par" version)) (sha256 (base32 "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2")))) @@ -8156,9 +7607,7 @@ that are much lighter weight than IO-threads.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-par-extras-" version "/" - "monad-par-extras-" version ".tar.gz")) + (uri (hackage-uri "monad-par-extras" version)) (sha256 (base32 "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2")))) @@ -8178,9 +7627,7 @@ and other added capabilities layered on top of the @code{Par} monad.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "MonadRandom-" version "/" - "MonadRandom-" version ".tar.gz")) + (uri (hackage-uri "MonadRandom" version)) (sha256 (base32 "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617")))) @@ -8201,9 +7648,7 @@ which consume random values.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/monads-tf/monads-tf-" - version ".tar.gz")) + (uri (hackage-uri "monads-tf" version)) (sha256 (base32 "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794")))) @@ -8225,9 +7670,7 @@ the @code{mtl-tf} package.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mono-traversable-" version "/" - "mono-traversable-" version ".tar.gz")) + (uri (hackage-uri "mono-traversable" version)) (sha256 (base32 "1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq")))) @@ -8254,8 +7697,7 @@ data structures as non-empty.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monoid-extras/monoid-extras-" version ".tar.gz")) + (uri (hackage-uri "monoid-extras" version)) (sha256 (base32 "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1")))) @@ -8278,10 +7720,7 @@ semi-direct products, \"deletable\" monoids, \"split\" monoids, and (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mountpoints/mountpoints-" - version - ".tar.gz")) + (uri (hackage-uri "mountpoints" version)) (sha256 (base32 "1hnm31pqcffphyc463wf0vbik9fzm5lb2r4wjdc1y4dqzmjdzz37")))) @@ -8301,10 +7740,7 @@ currently mounted filesystems.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/mtl-compat/mtl-compat-" - version - ".tar.gz")) + (uri (hackage-uri "mtl-compat" version)) (sha256 (base32 "17iszr5yb4f17g8mq6i74hsamii8z6m2qfsmgzs78mhiwa7kjm8r")))) @@ -8337,8 +7773,7 @@ the top of your file to get all of the ExceptT instances in scope.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/murmur-hash" - "/murmur-hash-" version ".tar.gz")) + (uri (hackage-uri "murmur-hash" version)) (sha256 (base32 "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9")))) (build-system haskell-build-system) @@ -8360,9 +7795,7 @@ binding.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mwc-random-" version "/" - "mwc-random-" version ".tar.gz")) + (uri (hackage-uri "mwc-random" version)) (sha256 (base32 "0ny2mw4am24d6ykrm8rbcjnrq6p2cjmzjb4m6qfk54wfdxflvmim")))) @@ -8395,10 +7828,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nats/nats-" - version - ".tar.gz")) + (uri (hackage-uri "nats" version)) (sha256 (base32 "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) @@ -8427,9 +7857,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ncurses/ncurses-" - version ".tar.gz")) + (uri (hackage-uri "ncurses" version)) (sha256 (base32 "0gsyyaqyh5r9zc0rhwpj5spyd6i4w2vj61h4nihgmmh0yyqvf3z5")))) @@ -8467,10 +7895,7 @@ ncurses.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network/network-" - version - ".tar.gz")) + (uri (hackage-uri "network" version)) (sha256 (base32 "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp")))) @@ -8494,8 +7919,7 @@ ncurses.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "network-bsd/network-bsd-" version ".tar.gz")) + (uri (hackage-uri "network-bsd" version)) (sha256 (base32 "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr")))) @@ -8519,9 +7943,7 @@ network database () API.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "network-byte-order/network-byte-order-" - version ".tar.gz")) + (uri (hackage-uri "network-byte-order" version)) (sha256 (base32 "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j")))) @@ -8542,9 +7964,7 @@ byte order.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "network-info-" version "/" - "network-info-" version ".tar.gz")) + (uri (hackage-uri "network-info" version)) (sha256 (base32 "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) @@ -8565,10 +7985,7 @@ IPv4, IPv6 and MAC addresses.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network-multicast/network-multicast-" - version - ".tar.gz")) + (uri (hackage-uri "network-multicast" version)) (sha256 (base32 "0whvi0pbwjy6dbwfdf9rv1j3yr3lcmfp3q7a8pwq63g537l4l2l3")))) @@ -8596,10 +8013,7 @@ sending UDP datagrams over multicast (class D) addresses.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network-uri/network-uri-" - version - ".tar.gz")) + (uri (hackage-uri "network-uri" version)) (sha256 (base32 "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap")))) @@ -8625,9 +8039,7 @@ sending UDP datagrams over multicast (class D) addresses.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "newtype-generics/newtype-generics-" - version ".tar.gz")) + (uri (hackage-uri "newtype-generics" version)) (sha256 (base32 "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa")))) @@ -8652,9 +8064,7 @@ and an alternative to newtype-th.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/non-negative/non-negative-" - version ".tar.gz")) + (hackage-uri "non-negative" version)) (sha256 (base32 "0f01q916dzkl1i0v15qrw9cviycki5g3fgi6x8gs45iwbzssq52n")))) @@ -8677,9 +8087,7 @@ of Peano numbers).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nonce/" - "nonce-" version ".tar.gz")) + (uri (hackage-uri "nonce" version)) (sha256 (base32 "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb")))) @@ -8709,9 +8117,7 @@ package are usable on your design.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "numeric-extras/numeric-extras-" - version ".tar.gz")) + (uri (hackage-uri "numeric-extras" version)) (sha256 (base32 "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067")))) @@ -8730,10 +8136,7 @@ standard library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ObjectName/ObjectName-" - version - ".tar.gz")) + (uri (hackage-uri "ObjectName" version)) (sha256 (base32 "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) @@ -8754,10 +8157,7 @@ OpenAL.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/old-locale/old-locale-" - version - ".tar.gz")) + (uri (hackage-uri "old-locale" version)) (sha256 (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) @@ -8779,10 +8179,7 @@ date and time formats.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/old-time/old-time-" - version - ".tar.gz")) + (uri (hackage-uri "old-time" version)) (sha256 (base32 "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) @@ -8807,10 +8204,7 @@ old @code{time} library. For new projects, the newer (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/Only/Only-" - version - ".tar.gz")) + (uri (hackage-uri "Only" version)) (sha256 (base32 "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb")))) @@ -8840,10 +8234,7 @@ traditionally so named type-wrapper for attaching typeclass instances.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/OpenGL/OpenGL-" - version - ".tar.gz")) + (uri (hackage-uri "OpenGL" version)) (sha256 (base32 "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as")))) @@ -8868,10 +8259,7 @@ version 1.3).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-" - version - ".tar.gz")) + (uri (hackage-uri "OpenGLRaw" version)) (sha256 (base32 "0gmsmysqzpm13qnyq4vvqxm4dzw25nayfd9wi5x645pympm6jqbm")))) @@ -8901,8 +8289,7 @@ found at runtime, a userError is thrown.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/operational/" - "operational-" version ".tar.gz")) + (uri (hackage-uri "operational" version)) (sha256 (base32 "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i")))) @@ -8927,10 +8314,7 @@ DSLs, etc.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/optional-args/optional-args-" - version - ".tar.gz")) + (uri (hackage-uri "optional-args" version)) (sha256 (base32 "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f")))) @@ -8951,9 +8335,7 @@ arguments.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/options/options-" - version ".tar.gz")) + (uri (hackage-uri "options" version)) (sha256 (base32 "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) @@ -9010,9 +8392,7 @@ easily work with command-line options.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/optparse-applicative" - "/optparse-applicative-" version ".tar.gz")) + (uri (hackage-uri "optparse-applicative" version)) (sha256 (base32 "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2")))) @@ -9059,9 +8439,7 @@ command line options in Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/jira-wiki-markup/" - "jira-wiki-markup-" version ".tar.gz")) + (uri (hackage-uri "jira-wiki-markup" version)) (sha256 (base32 "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w")))) (build-system haskell-build-system) @@ -9082,9 +8460,7 @@ to other formats.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/emojis/" - "emojis-" version ".tar.gz")) + (uri (hackage-uri "emojis" version)) (sha256 (base32 "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw")))) (build-system haskell-build-system) @@ -9116,9 +8492,7 @@ require aeson (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text-conversions/" - "text-conversions-" version ".tar.gz")) + (uri (hackage-uri "text-conversions" version)) (sha256 (base32 "0kbxin1q8xj9sgdl185gncrdjwcfzndp8sl5qll8y93l60yq8dxi")))) (build-system haskell-build-system) @@ -9139,10 +8513,7 @@ require aeson (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text-short/text-short-" - version - ".tar.gz")) + (uri (hackage-uri "text-short" version)) (sha256 (base32 "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz")))) @@ -9176,8 +8547,7 @@ plus the length of the UTF-8 encoded payload.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/text-zipper/" - "text-zipper-" version ".tar.gz")) + (uri (hackage-uri "text-zipper" version)) (sha256 (base32 "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys")))) (build-system haskell-build-system) @@ -9205,9 +8575,7 @@ Implementations using both of these examples are provided.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doclayout/" - "doclayout-" version ".tar.gz")) + (uri (hackage-uri "doclayout" version)) (sha256 (base32 "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp")))) (build-system haskell-build-system) @@ -9232,8 +8600,7 @@ code. It was designed for use in @code{Pandoc}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" - version ".tar.gz")) + (uri (hackage-uri "pandoc" version)) (sha256 (base32 "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2")))) @@ -9451,9 +8818,7 @@ getDataFileName name = do (version "1.22.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-types/pandoc-types-" - version ".tar.gz")) + (uri (hackage-uri "pandoc-types" version)) (sha256 (base32 "0z2j306jsiriwhib0201hsllwyck7qcvqci5c25frwsmknr3mls2")))) @@ -9504,10 +8869,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parallel/parallel-" - version - ".tar.gz")) + (uri (hackage-uri "parallel" version)) (sha256 (base32 "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) @@ -9553,8 +8915,7 @@ is also parametric in the input stream type.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "parsec-numbers/parsec-numbers-" version ".tar.gz")) + (uri (hackage-uri "parsec-numbers" version)) (sha256 (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) (build-system haskell-build-system) @@ -9573,9 +8934,7 @@ is also parametric in the input stream type.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "parser-combinators/parser-combinators-" - version ".tar.gz")) + (uri (hackage-uri "parser-combinators" version)) (sha256 (base32 "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3")))) @@ -9595,10 +8954,7 @@ combinators.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parsers/parsers-" - version - ".tar.gz")) + (uri (hackage-uri "parsers" version)) (sha256 (base32 "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p")))) @@ -9629,10 +8985,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/path/path-" - version - ".tar.gz")) + (uri (hackage-uri "path" version)) (sha256 (base32 "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4")))) @@ -9665,10 +9018,7 @@ invariants.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/path-io/path-io-" - version - ".tar.gz")) + (uri (hackage-uri "path-io" version)) (sha256 (base32 "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n")))) @@ -9703,10 +9053,7 @@ files/directories, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ghc-paths/ghc-paths-" - version - ".tar.gz")) + (uri (hackage-uri "ghc-paths" version)) (sha256 (base32 "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf")))) @@ -9726,9 +9073,7 @@ files/directories, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/patience/patience-" - version ".tar.gz")) + (uri (hackage-uri "patience" version)) (sha256 (base32 "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i")))) @@ -9751,10 +9096,7 @@ performance, nice output for humans, and simplicity of implementation.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/pattern-arrows/pattern-arrows-" - version - ".tar.gz")) + (uri (hackage-uri "pattern-arrows" version)) (sha256 (base32 "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg")))) @@ -9775,10 +9117,7 @@ rules.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pcre-light/pcre-light-" - version - ".tar.gz")) + (uri (hackage-uri "pcre-light" version)) (sha256 (base32 "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn")))) @@ -9805,9 +9144,7 @@ syntax and semantics as Perl 5.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent/" - "persistent-" version ".tar.gz")) + (uri (hackage-uri "persistent" version)) (sha256 (base32 "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k")))) @@ -9849,9 +9186,7 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-sqlite/" - "persistent-sqlite-" version ".tar.gz")) + (uri (hackage-uri "persistent-sqlite" version)) (sha256 (base32 "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338")))) @@ -9893,9 +9228,7 @@ system dependencies.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-template/" - "persistent-template-" version ".tar.gz")) + (uri (hackage-uri "persistent-template" version)) (sha256 (base32 "0c9cs27j43azimj74s2m2cdks87682ibpy1xbyzvygipgmb8nj6w")))) @@ -9925,9 +9258,7 @@ functions for the ghc-persistent package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-test/" - "persistent-test-" version ".tar.gz")) + (uri (hackage-uri "persistent-test" version)) (sha256 (base32 "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs")))) @@ -9966,10 +9297,7 @@ libraries.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/pgp-wordlist/pgp-wordlist-" - version - ".tar.gz")) + (uri (hackage-uri "pgp-wordlist" version)) (sha256 (base32 "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg")))) @@ -10003,9 +9331,7 @@ For further information, see (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pipes/" - "pipes-" version ".tar.gz")) + (uri (hackage-uri "pipes" version)) (sha256 (base32 "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl")))) @@ -10042,9 +9368,7 @@ dependencies (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pointedlist/" - "pointedlist-" version ".tar.gz")) + (uri (hackage-uri "pointedlist" version)) (sha256 (base32 "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l")))) @@ -10068,10 +9392,7 @@ other end when progressing past the actual edge.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/polyparse/polyparse-" - version - ".tar.gz")) + (uri (hackage-uri "polyparse" version)) (sha256 (base32 "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w")))) @@ -10100,8 +9421,7 @@ Strings.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pqueue/pqueue-" version ".tar.gz")) + (uri (hackage-uri "pqueue" version)) (sha256 (base32 "1sz7hlnfd86hbwrgqxczmsjsl1ki0ryi9dgzscxlsgjkdgcdia2p")))) @@ -10123,10 +9443,7 @@ based on a binomial heap.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/prelude-extras/prelude-extras-" - version - ".tar.gz")) + (uri (hackage-uri "prelude-extras" version)) (sha256 (base32 "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9")))) @@ -10146,8 +9463,7 @@ reduce @code{UndecidableInstances}.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "prettyclass/prettyclass-" version ".tar.gz")) + (uri (hackage-uri "prettyclass" version)) (sha256 (base32 "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5")))) @@ -10168,10 +9484,7 @@ types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/prettyprinter/prettyprinter-" - version - ".tar.gz")) + (uri (hackage-uri "prettyprinter" version)) (sha256 (base32 "0i8b3wjjpdvp5b857j065jwyrpgcnzgk75imrj7i3yhl668acvjy")))) (build-system haskell-build-system) @@ -10200,9 +9513,7 @@ clashes, @code{Text}-based, extensible.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/prettyprinter-ansi-terminal/" - "prettyprinter-ansi-terminal-" version ".tar.gz")) + (uri (hackage-uri "prettyprinter-ansi-terminal" version)) (sha256 (base32 "1cqxbcmy9ykk4pssq5hp6h51g2h547zfz549awh0c1fni8q3jdw1")))) (build-system haskell-build-system) @@ -10224,9 +9535,7 @@ clashes, @code{Text}-based, extensible.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pretty-hex-" version "/" - "pretty-hex-" version ".tar.gz")) + (uri (hackage-uri "pretty-hex" version)) (sha256 (base32 "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7")))) @@ -10245,8 +9554,7 @@ ByteStrings in the style of other common *nix hex dump tools.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pretty-show/" - "pretty-show-" version ".tar.gz")) + (uri (hackage-uri "pretty-show" version)) (sha256 (base32 "1lkgvbv00v1amvpqli6y4dzsbs25l4v3wlagvhwx8qxhw2390zrh")))) @@ -10273,9 +9581,7 @@ examination.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pretty-simple/" - "pretty-simple-" version ".tar.gz")) + (uri (hackage-uri "pretty-simple" version)) (sha256 (base32 "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw")))) (build-system haskell-build-system) @@ -10300,10 +9606,7 @@ Show instance.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/primitive/primitive-" - version - ".tar.gz")) + (uri (hackage-uri "primitive" version)) (sha256 (base32 "1facmq2wxhn5mbgd209zz5swyaw1q970fv3hd84klaxrhabqaxwi")))) @@ -10332,10 +9635,7 @@ Show instance.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/primitive-addr/primitive-addr-" - version - ".tar.gz")) + (uri (hackage-uri "primitive-addr" version)) (sha256 (base32 "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2")))) (build-system haskell-build-system) @@ -10356,9 +9656,7 @@ of the @code{primitive} library before @code{primitive-0.7.0.0}.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/process-extras/" - "process-extras-" version ".tar.gz")) + (hackage-uri "process-extras" version)) (sha256 (base32 "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9")))) @@ -10383,10 +9681,7 @@ API.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/profunctors/profunctors-" - version - ".tar.gz")) + (uri (hackage-uri "profunctors" version)) (sha256 (base32 "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5")))) @@ -10413,9 +9708,7 @@ API.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/project-template/project-template-" - version ".tar.gz")) + (uri (hackage-uri "project-template" version)) (sha256 (base32 "0ac43x36i6b595jhflif1qqhri1rrqw90ama5n7rsh0ffnzyb69d")))) @@ -10446,10 +9739,7 @@ the ideal templating system.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/protolude/protolude-" - version - ".tar.gz")) + (uri (hackage-uri "protolude" version)) (sha256 (base32 "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))) @@ -10471,8 +9761,7 @@ replace the standard one provided by GHC.") (version "1.1.0.1") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/PSQueue-" - version "/PSQueue-" version ".tar.gz")) + (uri (hackage-uri "PSQueue" version)) (sha256 (base32 "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza")))) @@ -10499,9 +9788,7 @@ keys, in linear time.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "psqueues-" version "/" - "psqueues-" version ".tar.gz")) + (uri (hackage-uri "psqueues" version)) (sha256 (base32 "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6")))) @@ -10569,9 +9856,7 @@ Typical applications of Priority Search Queues include: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pwstore-fast/" - "pwstore-fast-" version ".tar.gz")) + (uri (hackage-uri "pwstore-fast" version)) (sha256 (base32 "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj")))) @@ -10598,10 +9883,7 @@ usable.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/random/random-" - version - ".tar.gz")) + (uri (hackage-uri "random" version)) (sha256 (base32 "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4")))) (build-system haskell-build-system) @@ -10646,9 +9928,7 @@ library, including the ability to split random number generators.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "raw-strings-qq/raw-strings-qq-" - version ".tar.gz")) + (uri (hackage-uri "raw-strings-qq" version)) (sha256 (base32 "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f")))) @@ -10672,8 +9952,7 @@ DOS/Windows paths and markup languages (such as XML).") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "readable/readable-" version ".tar.gz")) + (uri (hackage-uri "readable" version)) (sha256 (base32 "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h")))) @@ -10693,9 +9972,7 @@ includes efficient implementations for common data types.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "rebase-" version "/" - "rebase-" version ".tar.gz")) + (uri (hackage-uri "rebase" version)) (sha256 (base32 "0sh1vha10n28c4jb97p99xglghqph8ppydqzbnb2h25a34057927")))) @@ -10752,10 +10029,7 @@ the community, with the missing features being added with pull-requests.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/reducers/reducers-" - version - ".tar.gz")) + (uri (hackage-uri "reducers" version)) (sha256 (base32 "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) @@ -10780,9 +10054,7 @@ containers and a general map/reduce framework for Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "refact/refact-" - version ".tar.gz")) + (uri (hackage-uri "refact" version)) (sha256 (base32 "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) @@ -10803,10 +10075,7 @@ specify refactorings without depending on GHC.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/reflection/reflection-" - version - ".tar.gz")) + (uri (hackage-uri "reflection" version)) (sha256 (base32 "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz")))) @@ -10831,8 +10100,7 @@ configurations to coexist without resorting to mutable global variables or (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/regex/" - "regex-" version ".tar.gz")) + (uri (hackage-uri "regex" version)) (sha256 (base32 "02hxgy5ck3h5pwd5gzs4565qbql8457cjdbbc2yrk236qzc1qa8x")))) @@ -10876,9 +10144,7 @@ copious examples.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-applicative/" - "regex-applicative-" version ".tar.gz")) + (uri (hackage-uri "regex-applicative" version)) (sha256 (base32 "0di66pi2kq5rrsn0k6pwakzwa0bgi9jfb2csm72kp5gzqdws8s8p")))) @@ -10901,10 +10167,7 @@ regular expressions. Parsers can be built using Applicative interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-base/regex-base-" - version - ".tar.gz")) + (uri (hackage-uri "regex-base" version)) (sha256 (base32 "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi")))) @@ -10924,10 +10187,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-compat/regex-compat-" - version - ".tar.gz")) + (uri (hackage-uri "regex-compat" version)) (sha256 (base32 "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg")))) @@ -10948,9 +10208,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-compat-tdfa/regex-compat-tdfa-" - version ".tar.gz")) + (uri (hackage-uri "regex-compat-tdfa" version)) (sha256 (base32 "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg")))) @@ -10973,8 +10231,7 @@ this problem.") (version "0.95.0.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "regex-pcre/regex-pcre-" version ".tar.gz")) + (uri (hackage-uri "regex-pcre" version)) (sha256 (base32 "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n")))) @@ -11001,9 +10258,7 @@ expressions.") (version "0.95.2.3.8.44") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "regex-pcre-builtin/regex-pcre-builtin-" - version ".tar.gz")) + (uri (hackage-uri "regex-pcre-builtin" version)) (sha256 (base32 "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna")))) @@ -11026,10 +10281,7 @@ providing the PCRE backend to accompany regex-base, with bundled code from (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-posix/regex-posix-" - version - ".tar.gz")) + (uri (hackage-uri "regex-posix" version)) (sha256 (base32 "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7")))) @@ -11050,9 +10302,7 @@ Haskell library @code{regex-base}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-tdfa/regex-tdfa-" - version ".tar.gz")) + (uri (hackage-uri "regex-tdfa" version)) (sha256 (base32 "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi")))) @@ -11079,10 +10329,7 @@ inspired by libtre.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/repline/repline-" - version - ".tar.gz")) + (uri (hackage-uri "repline" version)) (sha256 (base32 "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3")))) @@ -11104,9 +10351,7 @@ normal mtl transformers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/rerebase/rerebase-" - version ".tar.gz")) + (uri (hackage-uri "rerebase" version)) (sha256 (base32 "0j50l96whwi65ir35nfhn24h6103zy1ilfjsqiax63ajzw169fkv")))) @@ -11129,9 +10374,7 @@ the project's home page}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/resolv/resolv-" - version ".tar.gz")) + (uri (hackage-uri "resolv" version)) (sha256 (base32 "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1")))) @@ -11161,9 +10404,7 @@ Unix systems.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "resource-pool-" version "/" - "resource-pool-" version ".tar.gz")) + (uri (hackage-uri "resource-pool" version)) (sha256 (base32 "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6")))) @@ -11185,8 +10426,7 @@ connections.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/resourcet/" - "resourcet-" version ".tar.gz")) + (uri (hackage-uri "resourcet" version)) (sha256 (base32 "0zrvnikw1a0r2j59k12fxikyrg0ki5a7xhqhjgfl9h6dqpz54h85")))) @@ -11214,8 +10454,7 @@ code where you can safely allocate resources.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "retry/retry-" version ".tar.gz")) + (uri (hackage-uri "retry" version)) (sha256 (base32 "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5")))) @@ -11245,8 +10484,7 @@ the query instead of simply raising an exception.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/rfc5051/" - "rfc5051-" version ".tar.gz")) + (uri (hackage-uri "rfc5051" version)) (sha256 (base32 "0nri7js5ymywh2gi3li25wrkl1nf712qhbzw5hn46fib83qsq73k")))) @@ -11269,9 +10507,7 @@ better for some purposes.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/rio/rio-" - version ".tar.gz")) + (uri (hackage-uri "rio" version)) (sha256 (base32 "013m4xgsmg8h1rba9krxppz49lc5wz26gksms5zibsjj0w59m58h")))) @@ -11333,10 +10569,7 @@ the conversion functions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/safe/safe-" - version - ".tar.gz")) + (uri (hackage-uri "safe" version)) (sha256 (base32 "18pp6cn9np9jgs01x9mac6wk41k34g86fx5ibfarbapqr1138115")))) @@ -11358,9 +10591,7 @@ exceptions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "safe-exceptions/safe-exceptions-" - version ".tar.gz")) + (uri (hackage-uri "safe-exceptions" version)) (sha256 (base32 "15a80s87f603w8l7fnaba2cyqx62042vvcidpjzyga2685wpyqv9")))) @@ -11386,8 +10617,7 @@ handling wrong.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/safeio/" - "safeio-" version ".tar.gz")) + (uri (hackage-uri "safeio" version)) (sha256 (base32 "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm")))) @@ -11413,8 +10643,7 @@ avoid the problem of partial intermediate files.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "SafeSemaphore/SafeSemaphore-" version ".tar.gz")) + (uri (hackage-uri "SafeSemaphore" version)) (sha256 (base32 "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) @@ -11436,9 +10665,7 @@ are not exception safe and can be broken by @code{killThread}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/sandi/sandi-" - version ".tar.gz")) + (uri (hackage-uri "sandi" version)) (sha256 (base32 "1ndgai8idlxyccvkz5zsgq06v58blc30i6hkky5b1sf5x6gs2h29")))) @@ -11465,10 +10692,7 @@ are not exception safe and can be broken by @code{killThread}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/say/say-" - version - ".tar.gz")) + (uri (hackage-uri "say" version)) (sha256 (base32 "1r5kffjfwpas45g74sip8glrj1m9nygrnxjm7xgw898rq9pnafgn")))) @@ -11498,10 +10722,7 @@ as sending some messages to the terminal - that has the following properties: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/scientific/scientific-" - version - ".tar.gz")) + (uri (hackage-uri "scientific" version)) (sha256 (base32 "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3")))) @@ -11545,10 +10766,7 @@ notation}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL/SDL-" - version - ".tar.gz")) + (uri (hackage-uri "SDL" version)) (sha256 (base32 "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) @@ -11572,8 +10790,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "sdl2/sdl2-" version ".tar.gz")) + (uri (hackage-uri "sdl2" version)) (sha256 (base32 "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q")))) @@ -11604,8 +10821,7 @@ programming.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/sdl2-image/" - "sdl2-image-" version ".tar.gz")) + (uri (hackage-uri "sdl2-image" version)) (sha256 (base32 "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) @@ -11628,8 +10844,7 @@ programming.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/" - "sdl2-mixer-" version ".tar.gz")) + (uri (hackage-uri "sdl2-mixer" version)) (sha256 (base32 "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) @@ -11657,10 +10872,7 @@ programming.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL-image/SDL-image-" - version - ".tar.gz")) + (uri (hackage-uri "SDL-image" version)) (sha256 (base32 "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) @@ -11687,10 +10899,7 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL-mixer/SDL-mixer-" - version - ".tar.gz")) + (uri (hackage-uri "SDL-mixer" version)) (sha256 (base32 "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) @@ -11718,9 +10927,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "securemem-" version "/" - "securemem-" version ".tar.gz")) + (uri (hackage-uri "securemem" version)) (sha256 (base32 "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) @@ -11741,10 +10948,7 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semialign/semialign-" - version - ".tar.gz")) + (uri (hackage-uri "semialign" version)) (sha256 (base32 "11qs4imy3cq4cx9mm6g30r6qk3rngqrmz7lkl5379gs1yvgvs44q")))) @@ -11778,10 +10982,7 @@ class, forming lattice-like structure.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semigroupoids/semigroupoids-" - version - ".tar.gz")) + (uri (hackage-uri "semigroupoids" version)) (sha256 (base32 "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n")))) @@ -11818,10 +11019,7 @@ just a @code{Semigroup} are added.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semigroups/semigroups-" - version - ".tar.gz")) + (uri (hackage-uri "semigroups" version)) (sha256 (base32 "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855")))) @@ -11856,10 +11054,7 @@ semigroup.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semirings/semirings-" - version - ".tar.gz")) + (uri (hackage-uri "semirings" version)) (sha256 (base32 "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr")))) (build-system haskell-build-system) @@ -11891,10 +11086,7 @@ by @code{0} annihilates R.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/serialise/serialise-" - version - ".tar.gz")) + (uri (hackage-uri "serialise" version)) (sha256 (base32 "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69")))) @@ -11939,10 +11131,7 @@ convenient command-line utility for working with CBOR data.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/setenv/setenv-" - version - ".tar.gz")) + (uri (hackage-uri "setenv" version)) (sha256 (base32 "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73")))) @@ -11960,9 +11149,7 @@ environment variables.") (version "1.0.0.10") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/setlocale-" - version "/setlocale-" version ".tar.gz")) + (uri (hackage-uri "setlocale" version)) (sha256 (base32 "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir")))) @@ -11981,9 +11168,7 @@ environment variables.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "shakespeare-" version "/" - "shakespeare-" version ".tar.gz")) + (uri (hackage-uri "shakespeare" version)) (sha256 (base32 "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4")))) @@ -12012,9 +11197,7 @@ interpolates variables according to the type being inserted.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/shelly/shelly-" - version ".tar.gz")) + (uri (hackage-uri "shelly" version)) (sha256 (base32 "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday")))) @@ -12048,10 +11231,7 @@ spirit to POSIX shells. Shelly is originally forked from the Shellish package. (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/silently/silently-" - version - ".tar.gz")) + (uri (hackage-uri "silently" version)) (sha256 (base32 "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz")))) @@ -12071,10 +11251,7 @@ writing to stdout and other handles.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/simple-reflect/simple-reflect-" - version - ".tar.gz")) + (uri (hackage-uri "simple-reflect" version)) (sha256 (base32 "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) @@ -12099,9 +11276,7 @@ them.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "simple-sendfile-" version "/" - "simple-sendfile-" version ".tar.gz")) + (uri (hackage-uri "simple-sendfile" version)) (sha256 (base32 "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn")))) @@ -12124,8 +11299,7 @@ are the bottleneck of web servers.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "size-based/size-based-" version ".tar.gz")) + (uri (hackage-uri "size-based" version)) (sha256 (base32 "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp")))) @@ -12156,9 +11330,7 @@ enumerations.") (version "0.10.5.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "skylighting-core/skylighting-core-" - version ".tar.gz")) + (uri (hackage-uri "skylighting-core" version)) (sha256 (base32 "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d")))) @@ -12199,8 +11371,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (version "0.10.5.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/skylighting-" - version "/skylighting-" version ".tar.gz")) + (uri (hackage-uri "skylighting-core" version)) (sha256 (base32 "152ywiy7h04xjy0fdl571jwahl6c9350isqbm4p0na4cjd9cczzh")))) @@ -12215,10 +11386,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/smallcheck/smallcheck-" - version - ".tar.gz")) + (uri (hackage-uri "smallcheck" version)) (sha256 (base32 "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4")))) @@ -12240,8 +11408,7 @@ automatically by SmallCheck.") (version "0.6.1") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "socks/socks-" version ".tar.gz")) + (uri (hackage-uri "socks" version)) (sha256 (base32 "0wvaxy3dkv97wrncjv1rxrmjr4014hgxz82kixvcwqdhidalfi3k")))) @@ -12262,8 +11429,7 @@ automatically by SmallCheck.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "sop-core/sop-core-" version ".tar.gz")) + (uri (hackage-uri "sop-core" version)) (sha256 (base32 "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys")))) @@ -12286,9 +11452,7 @@ generics-sop}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/special-values/" - "special-values-" version ".tar.gz")) + (uri (hackage-uri "special-values" version)) (sha256 (base32 "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w")))) @@ -12311,10 +11475,7 @@ used for example by QuickCheck, see quickcheck-special." ) (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/split/split-" - version - ".tar.gz")) + (uri (hackage-uri "split" version)) (sha256 (base32 "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7")))) @@ -12339,8 +11500,7 @@ mainstream languages.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "splitmix/splitmix-" version ".tar.gz")) + (uri (hackage-uri "splitmix" version)) (sha256 (base32 "0das5n44dhlcv5i233iakx37d17kidqvhrvp6w9nd7hc015ry026")))) @@ -12388,10 +11548,7 @@ internal state).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/spoon/spoon-" - version - ".tar.gz")) + (uri (hackage-uri "spoon" version)) (sha256 (base32 "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr")))) @@ -12420,10 +11577,7 @@ Note that this suffers from the (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/StateVar/StateVar-" - version - ".tar.gz")) + (uri (hackage-uri "StateVar" version)) (sha256 (base32 "098q4lk60najzpbfal4bg4sh7izxm840aa5h4ycaamjn77d3jjsy")))) @@ -12442,9 +11596,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "statistics-" version "/" - "statistics-" version ".tar.gz")) + (uri (hackage-uri "statistics" version)) (sha256 (base32 "0j9awbg47fzb58k5z2wgkp6a0042j7hqrl1g6lyflrbsfswdp5n4")))) @@ -12503,9 +11655,7 @@ and regression and autocorrelation analysis. (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "stm-chans-" version "/" - "stm-chans-" version ".tar.gz")) + (uri (hackage-uri "stm-chans" version)) (sha256 (base32 "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa")))) @@ -12525,8 +11675,7 @@ features.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/stm-conduit/" - "stm-conduit-" version ".tar.gz")) + (uri (hackage-uri "stm-conduit" version)) (sha256 (base32 "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8")))) @@ -12564,8 +11713,7 @@ source and a sink.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/STMonadTrans" - "/STMonadTrans-" version ".tar.gz")) + (uri (hackage-uri "STMonadTrans" version)) (sha256 (base32 "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb")))) (build-system haskell-build-system) @@ -12591,9 +11739,7 @@ for strict state threads.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/storable-complex/storable-complex-" - version ".tar.gz")) + (uri (hackage-uri "storable-complex" version)) (sha256 (base32 "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s")))) (build-system haskell-build-system) @@ -12615,9 +11761,7 @@ and Fortran complex data types.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/storable-record/" - "storable-record-" version ".tar.gz")) + (hackage-uri "storable-record" version)) (sha256 (base32 "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf")))) @@ -12645,9 +11789,7 @@ alignment of the record elements.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/storable-tuple/" - "storable-tuple-" version ".tar.gz")) + (hackage-uri "storable-tuple" version)) (sha256 (base32 "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw")))) @@ -12672,9 +11814,7 @@ together.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/storablevector/storablevector-" - version ".tar.gz")) + (hackage-uri "storablevector" version)) (sha256 (base32 "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w")))) @@ -12710,9 +11850,7 @@ a library that provides fusion with lazy lists.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "streaming-commons/streaming-commons-" - version ".tar.gz")) + (uri (hackage-uri "streaming-commons" version)) (sha256 (base32 "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) @@ -12736,8 +11874,7 @@ needed by various Haskell streaming data libraries, such as @code{conduit} and (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/strict/strict-" - version ".tar.gz")) + (uri (hackage-uri "strict" version)) (sha256 (base32 "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz")))) (build-system haskell-build-system) @@ -12759,10 +11896,7 @@ IO operations.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stringbuilder/stringbuilder-" - version - ".tar.gz")) + (uri (hackage-uri "stringbuilder" version)) (sha256 (base32 "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) @@ -12783,10 +11917,7 @@ literals.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/string-qq/string-qq-" - version - ".tar.gz")) + (uri (hackage-uri "string-qq" version)) (sha256 (base32 "0wfxkw4x6j6jq9nd82k83g2k3hskpsvk1dp4cpkshvjr4wg9qny8")))) @@ -12809,10 +11940,7 @@ and bytestrings.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stringsearch/stringsearch-" - version - ".tar.gz")) + (uri (hackage-uri "stringsearch" version)) (sha256 (base32 "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9")))) @@ -12836,8 +11964,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "svg-builder/svg-builder-" version ".tar.gz")) + (uri (hackage-uri "svg-builder" version)) (sha256 (base32 "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g")))) @@ -12862,10 +11989,7 @@ building Scalable Vector Graphics (SVG).") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/syb/syb-" - version - ".tar.gz")) + (uri (hackage-uri "syb" version)) (sha256 (base32 "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq")))) @@ -12891,9 +12015,7 @@ variety of traversals.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/system-fileio/system-fileio-" - version ".tar.gz")) + (uri (hackage-uri "system-fileio" version)) (sha256 (base32 "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l")))) @@ -12957,9 +12079,7 @@ which can't be decoded in the current locale encoding.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/system-filepath/system-filepath-" - version ".tar.gz")) + (uri (hackage-uri "system-filepath" version)) (sha256 (base32 "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) @@ -13016,10 +12136,7 @@ increasing type safety.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tabular/tabular-" - version - ".tar.gz")) + (uri (hackage-uri "tabular" version)) (sha256 (base32 "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb")))) @@ -13060,10 +12177,7 @@ B 3 || meh | well... || worst ever | ok (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tagged/tagged-" - version - ".tar.gz")) + (uri (hackage-uri "tagged" version)) (sha256 (base32 "00kcc6lmj7v3xm2r3wzw5jja27m4alcw1wi8yiismd0bbzwzrq7m")))) @@ -13087,9 +12201,7 @@ having to unsafely pass dummy arguments.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tar/tar-" - version ".tar.gz")) + (uri (hackage-uri "tar" version)) (sha256 (base32 "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k")))) @@ -13120,8 +12232,7 @@ an index.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tar-conduit/tar-conduit-" version ".tar.gz")) + (uri (hackage-uri "tar-conduit" version)) (sha256 (base32 "0bgn3hyf20g1gfnzy8f41s7nj54kfcyjk2izw99svrw8f3dphi80")))) @@ -13145,10 +12256,7 @@ interface for extracting and creating tar files.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/temporary/temporary-" - version - ".tar.gz")) + (uri (hackage-uri "temporary" version)) (sha256 (base32 "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c")))) @@ -13174,10 +12282,7 @@ installed.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/temporary-rc/temporary-rc-" - version - ".tar.gz")) + (uri (hackage-uri "temporary-rc" version)) (sha256 (base32 "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs")))) @@ -13203,9 +12308,7 @@ This is a better maintained fork of the \"temporary\" package.") (version "0.3.2.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/terminal-size/" - "terminal-size-" version ".tar.gz")) + (uri (hackage-uri "terminal-size" version)) (sha256 (base32 "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm")))) @@ -13223,8 +12326,7 @@ dependency.") (version "0.12.3.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "texmath/texmath-" version ".tar.gz")) + (uri (hackage-uri "texmath" version)) (sha256 (base32 "1d9r3na7hmkgr0j63fs50ssll506l1wyqhw0dpap7jk0rdz8pv6n")))) @@ -13252,9 +12354,7 @@ it can parse and apply LaTeX macros.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "text-binary/text-binary-" - version ".tar.gz")) + (uri (hackage-uri "text-binary" version)) (sha256 (base32 "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) @@ -13275,11 +12375,7 @@ text package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text-manipulate" - "/text-manipulate-" - version - ".tar.gz")) + (uri (hackage-uri "text-manipulate" version)) (sha256 (base32 "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a")))) @@ -13313,8 +12409,7 @@ upgraded. Consider yourself warned!") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "text-metrics/text-metrics-" version ".tar.gz")) + (uri (hackage-uri "text-metrics" version)) (sha256 (base32 "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2")))) @@ -13341,10 +12436,7 @@ string metrics efficiently.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tf-random/tf-random-" - version - ".tar.gz")) + (uri (hackage-uri "tf-random" version)) (sha256 (base32 "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f")))) (build-system haskell-build-system) @@ -13367,9 +12459,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-abstraction/th-abstraction-" - version ".tar.gz")) + (uri (hackage-uri "th-abstraction" version)) (sha256 (base32 "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8")))) @@ -13390,9 +12480,7 @@ Template Haskell.") (version "0.4.8.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-expand-syns/th-expand-syns-" - version ".tar.gz")) + (uri (hackage-uri "th-expand-syns" version)) (sha256 (base32 "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si")))) @@ -13416,8 +12504,7 @@ Template Haskell.") (version "0.8.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-lift/th-lift-" version ".tar.gz")) + (uri (hackage-uri "th-lift" version)) (sha256 (base32 "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s")))) @@ -13439,9 +12526,7 @@ datatypes.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-lift-instances/th-lift-instances-" - version ".tar.gz")) + (uri (hackage-uri "th-lift-instances" version)) (sha256 (base32 "09nv1zsffvv6zfz1fjzcqrla3lc350qr4i4xf7wgvzp049sprrdy")))) @@ -13462,8 +12547,7 @@ instances. This package provides orphan instances for @code{containers}, (version "0.13.12") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-orphans/th-orphans-" version ".tar.gz")) + (uri (hackage-uri "th-orphans" version)) (sha256 (base32 "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz")))) @@ -13497,10 +12581,7 @@ package, and that's where the version number started.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/these/these-" - version - ".tar.gz")) + (uri (hackage-uri "these" version)) (sha256 (base32 "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p")))) @@ -13548,8 +12629,7 @@ variant of @code{These}. (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "threads/threads-" version ".tar.gz")) + (uri (hackage-uri "threads" version)) (sha256 (base32 "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk")))) @@ -13583,9 +12663,7 @@ package is similar to the @code{threadmanager}, @code{async} and (version "0.1.10") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-reify-many/th-reify-many-" - version ".tar.gz")) + (uri (hackage-uri "th-reify-many" version)) (sha256 (base32 "19g4gc1q3zxbylmvrgk3dqjzychq2k02i7fwvs3vhbrg4ihhw9cx")))) @@ -13609,8 +12687,7 @@ function which generates instances.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "time-compat/time-compat-" version ".tar.gz")) + (uri (hackage-uri "time-compat" version)) (sha256 (base32 "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii")))) @@ -13642,9 +12719,7 @@ features as possible.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "time-locale-compat/time-locale-compat-" - version ".tar.gz")) + (uri (hackage-uri "time-locale-compat" version)) (sha256 (base32 "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7")))) @@ -13664,8 +12739,7 @@ features as possible.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "time-manager/time-manager-" version ".tar.gz")) + (uri (hackage-uri "time-manager" version)) (sha256 (base32 "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh")))) @@ -13687,9 +12761,7 @@ timer manager.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/timeit/timeit-" - version ".tar.gz")) + (hackage-uri "timeit" version)) (sha256 (base32 "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1")))) @@ -13709,9 +12781,7 @@ used CPU time of monadic computation with an IO base.") (origin (method url-fetch) (uri - (string-append - "mirror://hackage/package/timezone-series/timezone-series-" - version ".tar.gz")) + (hackage-uri "timezone-series" version)) (sha256 (base32 "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5")))) @@ -13733,9 +12803,7 @@ create timezone series, see the ghc-timezone-olson package.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/timezone-olson/timezone-olson-" - version ".tar.gz")) + (hackage-uri "timezone-olson" version)) (sha256 (base32 "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg")))) @@ -13761,10 +12829,7 @@ objects from the timezone-series package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tldr/tldr-" - version - ".tar.gz")) + (uri (hackage-uri "tldr" version)) (sha256 (base32 "1yypb9zhsj9ks7bbw2sayqv3rn9y8z3w5p1xmsnwb4w99dqmvcx5")))) @@ -13795,9 +12860,7 @@ man pages with practical examples.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/torrent/torrent-" - version ".tar.gz")) + (uri (hackage-uri "torrent" version)) (sha256 (base32 "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290")))) (build-system haskell-build-system) @@ -13817,10 +12880,7 @@ BitTorrent files.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/transformers/transformers-" - version - ".tar.gz")) + (uri (hackage-uri "transformers" version)) (sha256 (base32 "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n")))) @@ -13857,10 +12917,7 @@ other transformers.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/transformers-base/transformers-base-" - version - ".tar.gz")) + (uri (hackage-uri "transformers-base" version)) (sha256 (base32 "146g69yxmlrmvqnzwcw4frxfl3z04lda9zqwcqib34dnkrlghfrj")))) @@ -13885,9 +12942,7 @@ compatibility to run on old versions of the platform.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/transformers-compat" - "/transformers-compat-" version ".tar.gz")) + (uri (hackage-uri "transformers-compat" version)) (sha256 (base32 "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky")))) @@ -13908,10 +12963,7 @@ but also need those types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tree-diff/tree-diff-" - version - ".tar.gz")) + (uri (hackage-uri "tree-diff" version)) (sha256 (base32 "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap")))) @@ -13954,9 +13006,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (version "2.1.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/trifecta/" - "trifecta-" version ".tar.gz")) + (uri (hackage-uri "trifecta" version)) (sha256 (base32 "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y")))) @@ -13995,9 +13045,7 @@ with slicing and Clang-style colored diagnostics.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tuple-th-" version "/" - "tuple-th-" version ".tar.gz")) + (uri (hackage-uri "tuple-th" version)) (sha256 (base32 "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn")))) @@ -14018,10 +13066,7 @@ statically known size.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/turtle/turtle-" - version - ".tar.gz")) + (uri (hackage-uri "turtle" version)) (sha256 (base32 "14lf43b5rxci6p9sy1gkb715m4b1s4rl65swn2qpdqv3h2yvpi4s")))) @@ -14078,9 +13123,7 @@ similar functionality.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "typed-process/typed-process-" - version ".tar.gz")) + (uri (hackage-uri "typed-process" version)) (sha256 (base32 "071mw4yv4xr5n82si33qbcqcxvcr7h56zlyd8gmsfrsdnacbq47k")))) @@ -14105,10 +13148,7 @@ upon it.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/uglymemo/uglymemo-" - version - ".tar.gz")) + (uri (hackage-uri "uglymemo" version)) (sha256 (base32 "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy")))) @@ -14128,8 +13168,7 @@ function.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/unagi-chan" - "/unagi-chan-" version ".tar.gz")) + (uri (hackage-uri "unagi-chan" version)) (sha256 (base32 "15fnk9x4fd2ryp31fjfrwm8k61m3a0qyb95m4065zc0yi0jyacp2")))) @@ -14156,10 +13195,7 @@ instruction is not available.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unbounded-delays/unbounded-delays-" - version - ".tar.gz")) + (uri (hackage-uri "unbounded-delays" version)) (sha256 (base32 "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar")))) @@ -14180,9 +13216,7 @@ unbounded @code{Integer} type.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "unexceptionalio-" version "/" "unexceptionalio-" - version ".tar.gz")) + (uri (hackage-uri "unexceptionalio" version)) (sha256 (base32 "07py2nffdgxpz8sryvqcghzb2kiiagpdf5ja1dia4z0rpwi79smh")))) (build-system haskell-build-system) (properties '((upstream-name . "unexceptionalio"))) @@ -14201,9 +13235,7 @@ handled safely, this is what you're left with.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "unicode-transforms/unicode-transforms-" - version ".tar.gz")) + (uri (hackage-uri "unicode-transforms" version)) (sha256 (base32 "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f")))) @@ -14223,9 +13255,7 @@ normalization in Haskell (normalization forms C, KC, D, and KD).") (version "0.2") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/union-find/union-find-" - version ".tar.gz")) + (uri (hackage-uri "union-find" version)) (sha256 (base32 "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6")))) @@ -14250,10 +13280,7 @@ constant-time: (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/uniplate/uniplate-" - version - ".tar.gz")) + (uri (hackage-uri "uniplate" version)) (sha256 (base32 "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7")))) @@ -14275,10 +13302,7 @@ work, but is substantially simpler and faster.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unix-compat/unix-compat-" - version - ".tar.gz")) + (uri (hackage-uri "unix-compat" version)) (sha256 (base32 "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8")))) @@ -14300,10 +13324,7 @@ isn't available, portable implementations are used.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unix-time/unix-time-" - version - ".tar.gz")) + (uri (hackage-uri "unix-time" version)) (sha256 (base32 "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr")))) @@ -14327,10 +13348,7 @@ for Unix time in Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unliftio/unliftio-" - version - ".tar.gz")) + (uri (hackage-uri "unliftio" version)) (sha256 (base32 "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my")))) @@ -14356,9 +13374,7 @@ working with it.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "unliftio-core-" version "/" - "unliftio-core-" version ".tar.gz")) + (uri (hackage-uri "unliftio-core" version)) (sha256 (base32 "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi")))) @@ -14383,9 +13399,7 @@ functions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unordered-containers" - "/unordered-containers-" version ".tar.gz")) + (uri (hackage-uri "unordered-containers" version)) (sha256 (base32 "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1")))) @@ -14426,9 +13440,7 @@ and high speed.") (origin (method url-fetch) (uri - (string-append - "https://hackage.haskell.org/package/unsafe/unsafe-" - version ".tar.gz")) + (hackage-uri "unsafe" version)) (sha256 (base32 "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz")))) @@ -14453,9 +13465,7 @@ a style ready for qualification, that is, you should import them by (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uri-bytestring-" version "/" - "uri-bytestring-" version ".tar.gz")) + (uri (hackage-uri "uri-bytestring" version)) (sha256 (base32 "0s0k26v5x6601rbpkjkl5vp3dkp9xwj1dlgy4xkl470i4sna1rzk")))) @@ -14483,10 +13493,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/utf8-light/utf8-light-" - version - ".tar.gz")) + (uri (hackage-uri "utf8-light" version)) (sha256 (base32 "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q")))) @@ -14509,10 +13516,7 @@ including only one module.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/utf8-string/utf8-string-" - version - ".tar.gz")) + (uri (hackage-uri "utf8-string" version)) (sha256 (base32 "16mh36ffva9rh6k37bi1046pgpj14h0cnmj1iir700v0lynxwj7f")))) (build-system haskell-build-system) @@ -14534,7 +13538,7 @@ UTF8 without truncation.") (source (origin (method url-fetch) - (uri (string-append home-page "/utility-ht-" version ".tar.gz")) + (uri (hackage-uri "utility-ht" version)) (sha256 (base32 "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw")))) (build-system haskell-build-system) @@ -14553,9 +13557,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uuid-" version "/" - "uuid-" version ".tar.gz")) + (uri (hackage-uri "uuid" version)) (sha256 (base32 "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq")))) @@ -14582,9 +13584,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uuid-types-" version "/" - "uuid-types-" version ".tar.gz")) + (uri (hackage-uri "uuid-types" version)) (sha256 (base32 "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d")))) @@ -14609,10 +13609,7 @@ functions.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/validation/validation-" - version - ".tar.gz")) + (uri (hackage-uri "validation" version)) (sha256 (base32 "1dv7azpljdcf7irbnznnz31hq611bn1aj2m6ywghz3hgv835qqak")))) @@ -14651,10 +13648,7 @@ example of, \"An applicative functor that is not a monad.\"") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/validity/validity-" - version - ".tar.gz")) + (uri (hackage-uri "validity" version)) (sha256 (base32 "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x")))) @@ -14677,10 +13671,7 @@ explicit by providing a function to check whether the invariants hold.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/vault/vault-" - version - ".tar.gz")) + (uri (hackage-uri "vault" version)) (sha256 (base32 "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc")))) @@ -14707,10 +13698,7 @@ representing a store for a single element.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/vector/vector-" - version - ".tar.gz")) + (uri (hackage-uri "vector" version)) (sha256 (base32 "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv")))) @@ -14741,9 +13729,7 @@ optimisation framework.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-algorithms-" version "/" - "vector-algorithms-" version ".tar.gz")) + (uri (hackage-uri "vector-algorithms" version)) (sha256 (base32 "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn")))) @@ -14765,10 +13751,7 @@ optimisation framework.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "vector-binary-instances/vector-binary-instances-" - version ".tar.gz")) + (uri (hackage-uri "vector-binary-instances" version)) (sha256 (base32 "0kgmlb4rf89b18d348cf2k06xfhdpamhmvq7iz5pab5014hknbmp")))) @@ -14794,9 +13777,7 @@ boxed and storable vectors.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-builder-" version "/" - "vector-builder-" version ".tar.gz")) + (uri (hackage-uri "vector-builder" version)) (sha256 (base32 "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs")))) @@ -14828,9 +13809,7 @@ vector.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-th-unbox-" version "/" - "vector-th-unbox-" version ".tar.gz")) + (uri (hackage-uri "vector-th-unbox" version)) (sha256 (base32 "0jbzm31d91kxn8m0h6iplj54h756q6f4zzdrnb2w7rzz5zskgqyl")))) @@ -14852,10 +13831,7 @@ and from some existing type with an Unbox instance.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/void/void-" - version - ".tar.gz")) + (uri (hackage-uri "void" version)) (sha256 (base32 "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk")))) @@ -14877,10 +13853,7 @@ given term should not exist.") (version "0.2.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wave/wave-" - version - ".tar.gz")) + (uri (hackage-uri "wave" version)) (sha256 (base32 "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki")))) @@ -14911,8 +13884,7 @@ files in Haskell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" - version ".tar.gz")) + (uri (hackage-uri "wcwidth" version)) (sha256 (base32 "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) @@ -14943,8 +13915,7 @@ widths to the Char type.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/weigh/" - "weigh-" version ".tar.gz")) + (uri (hackage-uri "weigh" version)) (sha256 (base32 "13pbjr7fzqy3s9c1nd2jhfwzbpccmpfwdn7y46z9k2bfkch1jam9")))) @@ -14965,10 +13936,7 @@ Haskell value or function.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wizards/wizards-" - version - ".tar.gz")) + (uri (hackage-uri "wizards" version)) (sha256 (base32 "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85")))) @@ -15007,9 +13975,7 @@ also be used for making GUI wizard interfaces.") (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wl-pprint/wl-pprint-" - version ".tar.gz")) + (uri (hackage-uri "wl-pprint" version)) (sha256 (base32 "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) @@ -15030,10 +13996,7 @@ instances of the @code{Pretty} class.") (source (origin (method url-fetch) - (uri (string-append - "mirror://hackage/package/wl-pprint-annotated/wl-pprint-annotated-" - version - ".tar.gz")) + (uri (hackage-uri "wl-pprint-annotated" version)) (sha256 (base32 "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) @@ -15060,9 +14023,7 @@ modernized interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wl-pprint-text/wl-pprint-text-" - version ".tar.gz")) + (uri (hackage-uri "wl-pprint-text" version)) (sha256 (base32 "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly")))) @@ -15083,8 +14044,7 @@ modernized interface.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "word-wrap/word-wrap-" version ".tar.gz")) + (uri (hackage-uri "word-wrap" version)) (sha256 (base32 "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb")))) (build-system haskell-build-system) @@ -15106,10 +14066,7 @@ modernized interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/word8/word8-" - version - ".tar.gz")) + (uri (hackage-uri "word8" version)) (sha256 (base32 "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16")))) @@ -15129,10 +14086,7 @@ modernized interface.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wordexp/wordexp-" - version - ".tar.gz")) + (uri (hackage-uri "wordexp" version)) (sha256 (base32 "1mbcrq89jz0dcibw66w0jdy4f4bfpx4zwjfs98rm3jjgdikwdzb4")))) @@ -15154,8 +14108,7 @@ word expansion like a posix-shell.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/X11/" - "X11-" version ".tar.gz")) + (uri (hackage-uri "X11" version)) (sha256 (base32 "1ip207l97s8nw4daxp9s254agk8f0wibpf0prx0n695klqyn8bz1")))) (build-system haskell-build-system) @@ -15180,8 +14133,7 @@ bindings are a direct translation of the C bindings.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/X11-xft/" - "X11-xft-" version ".tar.gz")) + (uri (hackage-uri "X11-xft" version)) (sha256 (base32 "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf")))) (arguments @@ -15206,9 +14158,7 @@ parts.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xdg-basedir/" - "xdg-basedir-" version ".tar.gz")) + (uri (hackage-uri "xdg-basedir" version)) (sha256 (base32 "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4")))) @@ -15226,10 +14176,7 @@ parts.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xml/xml-" - version - ".tar.gz")) + (uri (hackage-uri "xml" version)) (sha256 (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) @@ -15247,8 +14194,7 @@ parts.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xml-conduit/" - "xml-conduit-" version ".tar.gz")) + (uri (hackage-uri "xml-conduit" version)) (sha256 (base32 "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx")))) @@ -15279,8 +14225,7 @@ the @code{conduit} package.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xml-types/" - "xml-types-" version ".tar.gz")) + (uri (hackage-uri "xml-types" version)) (sha256 (base32 "102cm0nvfmf9gn8hvn5z8qvmg931laczs33wwd5iyz9bc37f9mfs")))) @@ -15299,8 +14244,7 @@ documents.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xml-hamlet/" - "xml-hamlet-" version ".tar.gz")) + (uri (hackage-uri "xml-hamlet" version)) (sha256 (base32 "0jrhcjy7ww59dafg857f2g2df1fw2jmbwcs1q379ph0pc5rxj3lj")))) (build-system haskell-build-system) @@ -15321,8 +14265,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (version "0.11.7.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yaml/yaml-" version ".tar.gz")) + (uri (hackage-uri "yaml" version)) (sha256 (base32 "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx")))) @@ -15359,10 +14302,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/zip-archive/zip-archive-" - version - ".tar.gz")) + (uri (hackage-uri "zip-archive" version)) (sha256 (base32 "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5")))) @@ -15396,10 +14336,7 @@ modifying, and extracting files from zip archives in Haskell.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/zlib/zlib-" - version - ".tar.gz")) + (uri (hackage-uri "zlib" version)) (sha256 (base32 "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0")))) @@ -15437,8 +14374,7 @@ provides access to the full zlib feature set.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "zlib-bindings/zlib-bindings-" version ".tar.gz")) + (uri (hackage-uri "zlib-bindings" version)) (sha256 (base32 "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8")))) @@ -15464,8 +14400,7 @@ provides access to the full zlib feature set.") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "zstd/zstd-" version ".tar.gz")) + (uri (hackage-uri "zstd" version)) (sha256 (base32 "0vghl48cxcqy72sqk2gpi7rvy5ya36j13vndaxi6kck6bqivbhm0")))) @@ -15489,10 +14424,7 @@ compression ratios.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/indexed-traversable/indexed-traversable-" - version - ".tar.gz")) + (uri (hackage-uri "indexed-traversable" version)) (sha256 (base32 "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs")))) (build-system haskell-build-system) @@ -15533,10 +14465,7 @@ associated @code{TypeFamilies} instead of @code{FunctionalDependencies}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/type-equality/type-equality-" - version - ".tar.gz")) + (uri (hackage-uri "type-equality" version)) (sha256 (base32 "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27")))) (build-system haskell-build-system) @@ -15566,10 +14495,7 @@ for compilers with @code{PolyKinds}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/selective/selective-" - version - ".tar.gz")) + (uri (hackage-uri "selective" version)) (sha256 (base32 "1mg5hnr3f4zjh3ajy16jkxj630rnfa9iqnnmpjqd9gkjdxpssd5l")))) (build-system haskell-build-system) @@ -15594,10 +14520,7 @@ on selective functors} for more details.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/keys/keys-" - version - ".tar.gz")) + (uri (hackage-uri "keys" version)) (sha256 (base32 "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm")))) (build-system haskell-build-system) @@ -15627,10 +14550,7 @@ dependencies.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pointed/pointed-" - version - ".tar.gz")) + (uri (hackage-uri "pointed" version)) (sha256 (base32 "07p92y62dibys3xa59rvx52xyyr39nghl73z7hzwnksa3ry3vfmq")))) (build-system haskell-build-system) @@ -15658,10 +14578,7 @@ dependencies.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/vector-instances/vector-instances-" - version - ".tar.gz")) + (uri (hackage-uri "vector-instances" version)) (sha256 (base32 "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv")))) (build-system haskell-build-system) @@ -15688,10 +14605,7 @@ the @code{ghc-vector} package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/th-compat/th-compat-" - version - ".tar.gz")) + (uri (hackage-uri "th-compat" version)) (sha256 (base32 "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b")))) (build-system haskell-build-system) @@ -15716,10 +14630,7 @@ range of @code{template-haskell} versions. On recent versions of (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/filepattern/filepattern-" - version - ".tar.gz")) + (uri (hackage-uri "filepattern" version)) (sha256 (base32 "0nznzji5haxl4ninm2a79dqf4c7fj6pc3z9gdc6wbf5h1pp14afr")))) (build-system haskell-build-system) @@ -15760,10 +14671,7 @@ traverals using patterns. (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ghc-lib-parser-ex/ghc-lib-parser-ex-" - version - ".tar.gz")) + (uri (hackage-uri "ghc-lib-parser-ex" version)) (sha256 (base32 "0r5sl7hhn0cxp0b1dskx1lshplc0yka7hcvs2nh10nrj07fjd3vj")))) (build-system haskell-build-system) @@ -15784,10 +14692,7 @@ traverals using patterns. (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lift-type/lift-type-" - version - ".tar.gz")) + (uri (hackage-uri "lift-type" version)) (sha256 (base32 "1195iyf0s8zmibjmvd10bszyccp1a2g4wdysn7yk10d3j0q9xdxf")))) (build-system haskell-build-system) @@ -15808,10 +14713,7 @@ it.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unicode-collation/unicode-collation-" - version - ".tar.gz")) + (uri (hackage-uri "unicode-collation" version)) (sha256 (base32 "0nbxkpd29ivdi6vcikbaasffkcz9m2vd4nhv29p6gmvckzmhj7zi")))) (build-system haskell-build-system) @@ -15837,10 +14739,7 @@ provided.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/citeproc/citeproc-" - version - ".tar.gz")) + (uri (hackage-uri "citeproc" version)) (sha256 (base32 "13hgbcbr7jbyfbxp8fsc43c2wq4fhlbxzqwh1plfkdi5n9bif1lv")))) (build-system haskell-build-system) @@ -15876,10 +14775,7 @@ entries. For more information about CSL, see @uref{https://citationstyles.org/} (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/commonmark/commonmark-" - version - ".tar.gz")) + (uri (hackage-uri "commonmark" version)) (sha256 (base32 "105szy7l4ji255fwv0kbfcy3i3a3a4197zgj6s9jb12kwbn6n0c7")))) (build-system haskell-build-system) @@ -15913,10 +14809,7 @@ varies linearly with input length.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/commonmark-extensions/commonmark-extensions-" - version - ".tar.gz")) + (uri (hackage-uri "commonmark-extensions" version)) (sha256 (base32 "0jm6w84p2a2gyaljvnlvjjwrwnir1lss3ps53d0bd8mkvhixxrqr")))) (build-system haskell-build-system) @@ -15940,10 +14833,7 @@ footnotes, math, and more.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/commonmark-pandoc/commonmark-pandoc-" - version - ".tar.gz")) + (uri (hackage-uri "commonmark-pandoc" version)) (sha256 (base32 "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp")))) (build-system haskell-build-system) @@ -15964,10 +14854,7 @@ Pandoc types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hslua-module-path/hslua-module-path-" - version - ".tar.gz")) + (uri (hackage-uri "hslua-module-path" version)) (sha256 (base32 "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68")))) (build-system haskell-build-system) @@ -15989,10 +14876,7 @@ platform independent way.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/template-haskell/template-haskell-" - version - ".tar.gz")) + (uri (hackage-uri "template-haskell" version)) (sha256 (base32 "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g")))) (build-system haskell-build-system) @@ -16014,10 +14898,7 @@ information.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/genvalidity-hspec/genvalidity-hspec-" - version - ".tar.gz")) + (uri (hackage-uri "genvalidity-hspec" version)) (sha256 (base32 "0aajx07n2rznyqxb0c4pn9j2cvkzw5brz9ki4grhhigbcri3jzmv")))) (build-system haskell-build-system) @@ -16044,10 +14925,7 @@ information.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ghc-boot-th/ghc-boot-th-" - version - ".tar.gz")) + (uri (hackage-uri "ghc-boot-th" version)) (sha256 (base32 "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli")))) (build-system haskell-build-system) @@ -16069,10 +14947,7 @@ upon by user code.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/binary-orphans/binary-orphans-" - version - ".tar.gz")) + (uri (hackage-uri "binary-orphans" version)) (sha256 (base32 "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3")))) (build-system haskell-build-system) @@ -16097,10 +14972,7 @@ upon by user code.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/netlink/netlink-" - version - ".tar.gz")) + (uri (hackage-uri "netlink" version)) (sha256 (base32 "1q8sxycv93sap6dgbw70scklnpjj5vav6qlvsxm5500jlvb3jnf0")))) (build-system haskell-build-system) @@ -16123,10 +14995,7 @@ of Netlink families.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest-driver-gen/doctest-driver-gen-" - version - ".tar.gz")) + (uri (hackage-uri "doctest-driver-gen" version)) (sha256 (base32 "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a")))) (build-system haskell-build-system) @@ -16147,10 +15016,7 @@ lets you automatically generate driver file for Doctest's Cabal integration.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/template-haskell-compat-v0208/template-haskell-compat-v0208-" - version - ".tar.gz")) + (uri (hackage-uri "template-haskell-compat-v0208" version)) (sha256 (base32 "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8")))) (build-system haskell-build-system) @@ -16169,10 +15035,7 @@ Haskell newer than 2.8.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mysql/mysql-" - version - ".tar.gz")) + (uri (hackage-uri "mysql" version)) (sha256 (base32 "051w428arxbix06a52dacqjpnkfx42zbazxsd3l9d857dsd0kl3g")))) (build-system haskell-build-system) @@ -16201,10 +15064,7 @@ built.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/blaze-textual/blaze-textual-" - version - ".tar.gz")) + (uri (hackage-uri "blaze-textual" version)) (sha256 (base32 "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs")))) (build-system haskell-build-system) @@ -16228,10 +15088,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mysql-simple/mysql-simple-" - version - ".tar.gz")) + (uri (hackage-uri "mysql-simple" version)) (sha256 (base32 "1mhmszpq64h8kxr20iaj1laq46wr2gaqc8xxq1k821i7jfxfld6j")))) (build-system haskell-build-system) @@ -16263,10 +15120,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-qq/persistent-qq-" - version - ".tar.gz")) + (uri (hackage-uri "persistent-qq" version)) (sha256 (base32 "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p")))) (build-system haskell-build-system) @@ -16296,10 +15150,7 @@ Language} for @code{ghc-persistent}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-mysql/persistent-mysql-" - version - ".tar.gz")) + (uri (hackage-uri "persistent-mysql" version)) (sha256 (base32 "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732")))) (build-system haskell-build-system) @@ -16346,10 +15197,7 @@ is officially supported.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-expectations-lifted/hspec-expectations-lifted-" - version - ".tar.gz")) + (uri (hackage-uri "hspec-expectations-lifted" version)) (sha256 (base32 "0a1qwz0n80lph8m9cq6cb06m8bsmqgg8ifx0acpylvrrkd8g3k92")))) (build-system haskell-build-system) @@ -16369,10 +15217,7 @@ to @code{MonadIO}.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/string-conversions/string-conversions-" - version - ".tar.gz")) + (uri (hackage-uri "string-conversions" version)) (sha256 (base32 "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26")))) (build-system haskell-build-system) @@ -16395,10 +15240,7 @@ string types into values of other string types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/postgresql-libpq/postgresql-libpq-" - version - ".tar.gz")) + (uri (hackage-uri "postgresql-libpq" version)) (sha256 (base32 "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3")))) (build-system haskell-build-system) @@ -16423,10 +15265,7 @@ server and to receive the results of these queries.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/postgresql-simple/postgresql-simple-" - version - ".tar.gz")) + (uri (hackage-uri "postgresql-simple" version)) (sha256 (base32 "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d")))) (build-system haskell-build-system) @@ -16470,10 +15309,7 @@ server and to receive the results of these queries.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/persistent-postgresql/persistent-postgresql-" - version - ".tar.gz")) + (uri (hackage-uri "persistent-postgresql" version)) (sha256 (base32 "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir")))) (build-system haskell-build-system) @@ -16521,10 +15357,7 @@ using the @code{ghc-postgresql-simple} package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/filtrable/filtrable-" - version - ".tar.gz")) + (uri (hackage-uri "filtrable" version)) (sha256 (base32 "058jl7wjaxzvcayc9qzpikxvi9x42civ4sb02jh66rcvpndbfh5y")))) (build-system haskell-build-system) @@ -16544,10 +15377,7 @@ using the @code{ghc-postgresql-simple} package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/filelock/filelock-" - version - ".tar.gz")) + (uri (hackage-uri "filelock" version)) (sha256 (base32 "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh")))) (build-system haskell-build-system) @@ -16567,10 +15397,7 @@ using the @code{ghc-postgresql-simple} package.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/HsYAML-aeson/HsYAML-aeson-" - version - ".tar.gz")) + (uri (hackage-uri "HsYAML-aeson" version)) (sha256 (base32 "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg")))) (build-system haskell-build-system) @@ -16603,10 +15430,7 @@ data into native Haskell data types.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lukko/lukko-" - version - ".tar.gz")) + (uri (hackage-uri "lukko" version)) (sha256 (base32 "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8")))) (build-system haskell-build-system) @@ -16645,10 +15469,7 @@ locking. (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dec/dec-" - version - ".tar.gz")) + (uri (hackage-uri "dec" version)) (sha256 (base32 "0yslffafmqfkvhcw2arpc53hfmn1788z85ss9lxnbclr29lbvzgc")))) (build-system haskell-build-system) @@ -16722,10 +15543,7 @@ pages.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/singleton-bool/singleton-bool-" - version - ".tar.gz")) + (uri (hackage-uri "singleton-bool" version)) (sha256 (base32 "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0")))) (build-system haskell-build-system) diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index da4e2a205e..dd048197b4 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -38,10 +38,7 @@ (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/purescript/purescript-" - version - ".tar.gz")) + (uri (hackage-uri "purescript" version)) (sha256 (base32 "06f318hdah076vkviw1ryyg2p0gpbabsp8lbm5x03f2qv92n9j1n")))) (build-system haskell-build-system) @@ -135,10 +132,7 @@ expressive types, inspired by Haskell and compiling to JavaScript.") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/purescript-cst/purescript-cst-" - version - ".tar.gz")) + (uri (hackage-uri "purescript-cst" version)) (sha256 (base32 "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g")))) (build-system haskell-build-system) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0dfc45a58e..f7a4a3214f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -809,8 +809,7 @@ manager and a system tray.") (synopsis "Tiling window manager") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad/" - "xmonad-" version ".tar.gz")) + (uri (hackage-uri "xmonad" version)) (sha256 (base32 "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) @@ -854,8 +853,7 @@ tiled on several screens.") (version "0.15") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad/" - "xmonad-" version ".tar.gz")) + (uri (hackage-uri "xmonad" version)) (sha256 (base32 "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) @@ -880,8 +878,7 @@ tiled on several screens.") (version "0.44.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xmobar/" - "xmobar-" version ".tar.gz")) + (uri (hackage-uri "xmobar" version)) (sha256 (base32 "0gdphjn5ll5lkb2psdsb34563wsz6g0y2gg3z8cj4jy8lvbbv808")))) @@ -955,8 +952,7 @@ particular, it displays commonly-chosen options before uncommon ones.") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad-contrib/" - "xmonad-contrib-" version ".tar.gz")) + (uri (hackage-uri "xmonad-contrib" version)) (sha256 (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) (build-system haskell-build-system) @@ -978,8 +974,7 @@ tiling window manager for X.") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad-contrib/" - "xmonad-contrib-" version ".tar.gz")) + (uri (hackage-uri "xmonad-contrib" version)) (sha256 (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) (arguments -- cgit 1.4.1 From 49a320aaa6fb4c20d6b30c56c35a8c7ffceed822 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 15 Jan 2023 10:09:44 +0100 Subject: Upgrade Haskell packages. Script-aided bulk change. --- gnu/local.mk | 6 +- gnu/packages/bioinformatics.scm | 211 +- gnu/packages/dhall.scm | 166 +- gnu/packages/elm.scm | 2 +- gnu/packages/finance.scm | 173 +- gnu/packages/haskell-apps.scm | 525 +- gnu/packages/haskell-check.scm | 594 +- gnu/packages/haskell-crypto.scm | 223 +- gnu/packages/haskell-web.scm | 1149 ++- gnu/packages/haskell-xyz.scm | 9091 +++++++++++--------- gnu/packages/idris.scm | 2 +- gnu/packages/lisp.scm | 127 +- .../cabal-install-base16-bytestring1.0.patch | 29 - gnu/packages/patches/cabal-install-ghc8.10.patch | 393 - gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch | 303 + .../patches/ghc-bytestring-handle-ghc9.patch | 67 + gnu/packages/patches/ngless-unliftio.patch | 66 - gnu/packages/patches/xmonad-dynamic-linking.patch | 24 +- .../patches/xmonad-next-dynamic-linking.patch | 16 - gnu/packages/purescript.scm | 158 +- gnu/packages/wm.scm | 117 +- 21 files changed, 6904 insertions(+), 6538 deletions(-) delete mode 100644 gnu/packages/patches/cabal-install-base16-bytestring1.0.patch delete mode 100644 gnu/packages/patches/cabal-install-ghc8.10.patch create mode 100644 gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch create mode 100644 gnu/packages/patches/ghc-bytestring-handle-ghc9.patch delete mode 100644 gnu/packages/patches/ngless-unliftio.patch delete mode 100644 gnu/packages/patches/xmonad-next-dynamic-linking.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 63ec92ebef..04a7320960 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,8 +955,6 @@ dist_patch_DATA = \ %D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ - %D%/packages/patches/cabal-install-base16-bytestring1.0.patch \ - %D%/packages/patches/cabal-install-ghc8.10.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \ %D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ @@ -1200,6 +1198,8 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ + %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \ + %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ @@ -1576,7 +1576,6 @@ dist_patch_DATA = \ %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ - %D%/packages/patches/ngless-unliftio.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/network-manager-meson.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \ @@ -2012,7 +2011,6 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ - %D%/packages/patches/xmonad-next-dynamic-linking.patch \ %D%/packages/patches/xnnpack-system-libraries.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b5d132749f..2b20191bb3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14823,110 +14823,121 @@ datasets.") (define-public ngless (package (name "ngless") - (version "1.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ngless-toolkit/ngless.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pb9f6b0yk9p4cdwiym8r190q1bcdiwvc7i2s6rw54qgi8r3g6pj")) - (patches (search-patches "ngless-unliftio.patch")))) + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "NGLess" version)) + (sha256 + (base32 + "0pljyrlpr9r3cl5311dhgxdl8y40szyi4vprn34i3piy0qrldymi")))) (build-system haskell-build-system) (arguments - (list - #:haddock? #f ;The haddock phase fails with: NGLess/CmdArgs.hs:20:1: - ;error: parse error on input import - ;import Options.Applicative - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'create-Versions.hs - (lambda _ - (substitute* "Makefile" - (("BWA_VERSION = .*") - (string-append "BWA_VERSION = " - #$(package-version bwa) "\n")) - (("SAM_VERSION = .*") - (string-append "SAM_VERSION = " - #$(package-version samtools) "\n")) - (("PRODIGAL_VERSION = .*") - (string-append "PRODIGAL_VERSION = " - #$(package-version prodigal) "\n")) - (("MINIMAP2_VERSION = .*") - (string-append "MINIMAP2_VERSION = " - #$(package-version minimap2) "\n"))) - (invoke "make" "NGLess/Dependencies/Versions.hs"))) - (add-after 'create-Versions.hs 'create-cabal-file - (lambda _ (invoke "hpack"))) - ;; These tools are expected to be installed alongside ngless. - (add-after 'install 'link-tools - (lambda* (#:key inputs #:allow-other-keys) - (let ((bin (string-append #$output "/bin/"))) - (symlink (search-input-file inputs "/bin/prodigal") - (string-append bin "ngless-" #$version "-prodigal")) - (symlink (search-input-file inputs "/bin/minimap2") - (string-append bin "ngless-" #$version "-minimap2")) - (symlink (search-input-file inputs "/bin/samtools") - (string-append bin "ngless-" #$version "-samtools")) - (symlink (search-input-file inputs "/bin/bwa") - (string-append bin "ngless-" #$version "-bwa")))))))) - (inputs - (list prodigal - bwa - samtools - minimap2 - ghc-aeson - ghc-ansi-terminal - ghc-async - ghc-atomic-write - ghc-bytestring-lexing - ghc-conduit - ghc-conduit-algorithms - ghc-conduit-extra - ghc-configurator - ghc-convertible - ghc-data-default - ghc-diagrams-core - ghc-diagrams-lib - ghc-diagrams-svg - ghc-double-conversion - ghc-edit-distance - ghc-either - ghc-errors - ghc-extra - ghc-filemanip - ghc-file-embed - ghc-gitrev - ghc-hashtables - ghc-http-conduit - ghc-inline-c - ghc-inline-c-cpp - ghc-int-interval-map - ghc-missingh - ghc-optparse-applicative - ghc-regex - ghc-safe - ghc-safeio - ghc-strict - ghc-tar - ghc-tar-conduit - ghc-unliftio - ghc-unliftio-core - ghc-vector - ghc-yaml - ghc-zlib)) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "NGLess.cabal" + (("\\b(base)\\s+[^,]+" all dep) + dep)))) + (add-after 'unpack 'create-Versions.hs + (lambda _ + (substitute* "NGLess/Dependencies/Versions.hs" + (("bwaVersion = .+") + (string-append "bwaVersion = \"" + ,(package-version bwa) "\"")) + (("samtoolsVersion = .+") + (string-append "samtoolsVersion = \"" + ,(package-version samtools) "\"")) + (("prodigalVersion = .+") + (string-append "prodigalVersion = \"" + ,(package-version prodigal) "\"")) + (("megahitVersion = .+") + (string-append "megahitVersion = \"" + ,(package-version megahit) "\"")) + (("minimap2Version = .+") + (string-append "minimap2Version = \"" + ,(package-version minimap2) "\""))))) + ;; See NGLess/FileManagement.hs. + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bwa (search-input-file inputs "/bin/bwa")) + (samtools (search-input-file inputs "/bin/samtools")) + (prodigal (search-input-file inputs "/bin/prodigal")) + (minimap2 (search-input-file inputs "/bin/minimap2")) + (megahit (search-input-file inputs "/bin/megahit"))) + (wrap-program (string-append out "/bin/ngless") + `("NGLESS_BWA_BIN" " " = (,bwa)) + `("NGLESS_SAMTOOLS_BIN" " " = (,samtools)) + `("NGLESS_PRODIGAL_BIN" " " = (,prodigal)) + `("NGLESS_MINIMAP2_BIN" " " = (,minimap2)) + `("NGLESS_MEGAHIT_BIN" " " = (,megahit)))))) + ;; Sanity check. + (add-after 'wrap-program 'check-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((ngless (string-append (assoc-ref outputs "out") "/bin/ngless"))) + (invoke ngless "--check-install"))))))) + (inputs (list prodigal + bwa + samtools + minimap2 + megahit + ghc-missingh + ghc-aeson + ghc-ansi-terminal + ghc-async + ghc-atomic-write + ghc-bytestring-lexing + ghc-conduit + ghc-conduit-algorithms + ghc-conduit-extra + ghc-configurator + ghc-convertible + ghc-data-default + ghc-edit-distance + ghc-either + ghc-errors + ghc-extra + ghc-file-embed + ghc-filemanip + ghc-hashable + ghc-hashtables + ghc-hostname + ghc-http-client + ghc-http-conduit + ghc-inline-c + ghc-inline-c-cpp + ghc-int-interval-map + ghc-network + ghc-optparse-applicative + ghc-primitive + ghc-random-shuffle + ghc-regex + ghc-resourcet + ghc-safe + ghc-stm-chans + ghc-stm-conduit + ghc-strict + ghc-tar + ghc-tar-conduit + ghc-unix-compat + ghc-unliftio + ghc-unliftio-core + ghc-vector + ghc-vector-algorithms + ghc-yaml + ghc-zlib + ghc-bzlib-conduit + ghc-double-conversion + ghc-safeio)) (propagated-inputs (list r-r6 r-hdf5r r-iterators r-itertools r-matrix)) - (native-inputs - (list ghc-hpack - ghc-quickcheck - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-test-framework-th)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-tasty-th)) (home-page "https://ngless.embl.de/") (synopsis "DSL for processing next-generation sequencing data") (description "Ngless is a domain-specific language for diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index 9e80abb08a..e84ee7647f 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -30,108 +30,76 @@ (define-public dhall (package (name "dhall") - (version "1.39.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "dhall" version)) - (sha256 - (base32 "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab")))) + (version "1.41.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "dhall" version)) + (sha256 + (base32 + "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka")))) (build-system haskell-build-system) (properties '((upstream-name . "dhall"))) - (inputs - (list ghc-aeson - ghc-aeson-pretty - ghc-ansi-terminal - ghc-atomic-write-0.2.0.7 - ghc-case-insensitive - ghc-cborg - ghc-cborg-json - ghc-contravariant - ghc-data-fix - ghc-diff - ghc-dotgen - ghc-either - ghc-exceptions - ghc-half - ghc-hashable - ghc-lens-family-core - ghc-megaparsec - ghc-memory - ghc-mmorph - ghc-network-uri - ghc-optparse-applicative - ghc-parsers - ghc-parser-combinators - ghc-prettyprinter - ghc-prettyprinter-ansi-terminal - ghc-pretty-simple - ghc-profunctors - ghc-pretty-simple - ghc-repline - ghc-serialise - ghc-scientific - ghc-text-manipulate - ghc-th-lift-instances - ghc-transformers-compat - ghc-unordered-containers - ghc-uri-encode - ghc-vector - ghc-cryptonite - ghc-http-types - ghc-http-client - ghc-http-client-tls)) - (native-inputs - (list ghc-foldl - ghc-generic-random-1.3.0.1 - ghc-quickcheck - ghc-quickcheck-instances - ghc-semigroups - ghc-special-values - ghc-spoon - ghc-tasty - ghc-tasty-expected-failure - ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-tasty-silver - ghc-turtle - ghc-mockery - ghc-doctest)) + (inputs (list ghc-aeson + ghc-aeson-pretty + ghc-ansi-terminal + ghc-atomic-write + ghc-base16-bytestring + ghc-case-insensitive + ghc-cborg + ghc-cborg-json + ghc-contravariant + ghc-data-fix + ghc-diff + ghc-dotgen + ghc-either + ghc-half + ghc-hashable + ghc-indexed-traversable + ghc-lens-family-core + ghc-megaparsec + ghc-mmorph + ghc-network-uri + ghc-optparse-applicative + ghc-parsers + ghc-parser-combinators + ghc-prettyprinter + ghc-prettyprinter-ansi-terminal + ghc-pretty-simple + ghc-profunctors + ghc-repline + ghc-serialise + ghc-scientific + ghc-text-manipulate + ghc-text-short + ghc-th-lift-instances + ghc-unordered-containers + ghc-uri-encode + ghc-vector + ghc-cryptohash-sha256 + ghc-http-types + ghc-http-client + ghc-http-client-tls)) + (native-inputs (list ghc-foldl + ghc-generic-random + ghc-quickcheck + ghc-quickcheck-instances + ghc-special-values + ghc-spoon + ghc-system-filepath + ghc-tasty + ghc-tasty-expected-failure + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-tasty-silver + ghc-temporary + ghc-turtle + ghc-mockery + ghc-doctest)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-network-tests - (lambda _ - (with-directory-excursion "dhall-lang/tests" - (for-each - delete-file - '("import/success/customHeadersA.dhall" - "import/success/noHeaderForwardingA.dhall" - "import/success/unit/RemoteAsTextA.dhall" - "import/success/unit/SimpleRemoteA.dhall" - "import/success/unit/asLocation/RemoteChain1A.dhall" - "import/success/unit/asLocation/RemoteChain2A.dhall" - "import/success/unit/asLocation/RemoteChain3A.dhall" - "import/success/unit/asLocation/RemoteChainEnvA.dhall" - "import/success/unit/asLocation/RemoteChainMissingA.dhall" - "type-inference/success/CacheImportsA.dhall" - "type-inference/success/CacheImportsCanonicalizeA.dhall"))) - (substitute* "src/Dhall/Tutorial.hs" - (((string-append - "-- >>> input auto " - "\"https://raw.githubusercontent.com/dhall-lang" - "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" - "examples/True\" :: IO Bool")) - "") - (((string-append - "-- >>> input auto " - "\"False == " - "https://raw.githubusercontent.com/dhall-lang" - "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" - "examples/True\" :: IO Bool")) - "")) - #t))))) - (home-page "https://dhall-lang.org/") + `(#:tests? #f ; Tries to access httpbin.org + #:cabal-revision ("4" + "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx"))) + (home-page "http://hackage.haskell.org/package/dhall") (synopsis "Configuration language guaranteed to terminate") (description "Dhall is an explicitly typed configuration language that is not Turing diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index 12c7e8301b..6d301cf51c 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -70,7 +70,7 @@ (add-before 'configure 'update-constraints (lambda _ (substitute* "elm.cabal" - (("(ansi-terminal|containers|network|http-client|language-glsl)\\s+[^,]+" all dep) + (("(ansi-terminal|bytestring|containers|network|HTTP|http-client|language-glsl)\\s+[^,]+" all dep) dep))))))) (inputs (list ghc-ansi-terminal diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ea3b7c8577..192d1d2817 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -217,14 +217,13 @@ line client and a client based on Qt.") (define-public hledger (package (name "hledger") - (version "1.21") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hledger" version)) - (sha256 - (base32 - "07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss")))) + (version "1.27.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hledger" version)) + (sha256 + (base32 + "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb")))) (build-system haskell-build-system) (arguments (list @@ -235,34 +234,34 @@ line client and a client based on Qt.") (install-file "hledger.info" (string-append #$output "/share/info")) (install-file "hledger.1" (string-append #$output "/man/man1"))))))) (properties '((upstream-name . "hledger"))) - (inputs - (list ghc-ansi-terminal - ghc-base-compat-batteries - ghc-cmdargs - ghc-data-default - ghc-decimal - ghc-diff - ghc-hashable - ghc-hledger-lib - ghc-lucid - ghc-math-functions - ghc-megaparsec - ghc-old-time - ghc-regex-tdfa - ghc-safe - ghc-aeson - ghc-extra - ghc-tasty - ghc-timeit - ghc-shakespeare - ghc-split - ghc-tabular - ghc-temporary - ghc-unordered-containers - ghc-utf8-string - ghc-utility-ht - ghc-wizards)) - (home-page "https://hledger.org") + (inputs (list ghc-decimal + ghc-diff + ghc-aeson + ghc-ansi-terminal + ghc-breakpoint + ghc-cmdargs + ghc-data-default + ghc-extra + ghc-githash + ghc-hashable + ghc-hledger-lib + ghc-lucid + ghc-math-functions + ghc-megaparsec + ghc-microlens + ghc-regex-tdfa + ghc-safe + ghc-shakespeare + ghc-split + ghc-tabular + ghc-tasty + ghc-temporary + ghc-timeit + ghc-unordered-containers + ghc-utf8-string + ghc-utility-ht + ghc-wizards)) + (home-page "http://hledger.org") (synopsis "Command-line interface for the hledger accounting system") (description "The command-line interface for the hledger accounting system. Its basic @@ -1969,59 +1968,63 @@ generate a variety of reports from them, and provides a web interface.") (define-public hledger-web (package (name "hledger-web") - (version "1.21") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hledger-web" version)) - (sha256 - (base32 - "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2")))) + (version "1.27.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hledger-web" version)) + (sha256 + (base32 + "151dxci7dld8626dzw823sr3d9iaac92wfzbfcbdz4jh9f7n07wa")))) (build-system haskell-build-system) (properties '((upstream-name . "hledger-web"))) + (inputs (list ghc-decimal + ghc-aeson + ghc-base64 + ghc-blaze-html + ghc-blaze-markup + ghc-breakpoint + ghc-case-insensitive + ghc-clientsession + ghc-cmdargs + ghc-conduit + ghc-conduit-extra + ghc-data-default + ghc-extra + ghc-hjsmin + hledger + ghc-hledger-lib + ghc-hspec + ghc-http-client + ghc-http-conduit + ghc-http-types + ghc-megaparsec + ghc-network + ghc-shakespeare + ghc-unix-compat + ghc-unordered-containers + ghc-utf8-string + ghc-wai + ghc-wai-cors + ghc-wai-extra + ghc-wai-handler-launch + ghc-warp + ghc-yaml + ghc-yesod + ghc-yesod-core + ghc-yesod-form + ghc-yesod-static + ghc-yesod-test)) (arguments - `(#:tests? #f ; TODO: fail. - #:cabal-revision - ("1" "1hnw10ibhbafbsfj5lzlxwjg4cjnqr5bb51n6mqbi30qqabgq78x"))) - (inputs - (list ghc-aeson - ghc-blaze-html - ghc-blaze-markup - ghc-case-insensitive - ghc-clientsession - ghc-cmdargs - ghc-conduit-extra - ghc-conduit - ghc-data-default - ghc-decimal - ghc-extra - ghc-hjsmin - ghc-hledger-lib - ghc-hspec - ghc-http-client - ghc-http-conduit - ghc-http-types - ghc-megaparsec - ghc-network - ghc-shakespeare - ghc-unix-compat - ghc-unordered-containers - ghc-utf8-string - ghc-wai-cors - ghc-wai-extra - ghc-wai - ghc-wai-handler-launch - ghc-warp - ghc-yaml - ghc-yesod-core - ghc-yesod-form - ghc-yesod - ghc-yesod-static - ghc-yesod-test - hledger)) - (home-page "https://hledger.org") + (list #:phases + #~(modify-phases %standard-phases + ;; Tests write to $HOME. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (home-page "http://hledger.org") (synopsis "Web-based user interface for the hledger accounting system") - (description "This package provides a simple Web-based User + (description + "This package provides a simple Web-based User Interface (UI) for the hledger accounting system. It can be used as a local, single-user UI, or as a multi-user UI for viewing, adding, and editing on the Web.") diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 4e680e612b..5a6bae5281 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -61,29 +61,27 @@ (define-public apply-refact (package (name "apply-refact") - (version "0.9.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "apply-refact" version)) - (sha256 - (base32 - "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w")))) + (version "0.10.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "apply-refact" version)) + (sha256 + (base32 + "129bf8n66kpwh5420rxprngg43bqr2agyd8q8d7l49k2rxsjl1fb")))) (build-system haskell-build-system) (properties '((upstream-name . "apply-refact"))) - (inputs - (list ghc-refact - ghc-exactprint - ghc-syb - ghc-extra - ghc-uniplate - ghc-filemanip - ghc-unix-compat - ghc-optparse-applicative)) - (native-inputs - (list ghc-tasty ghc-tasty-golden ghc-tasty-expected-failure - ghc-silently)) - (home-page "https://hackage.haskell.org/package/apply-refact") + (inputs (list ghc-refact + ghc-exactprint + ghc-paths + ghc-extra + ghc-syb + ghc-filemanip + ghc-uniplate + ghc-unix-compat + ghc-optparse-applicative)) + (native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-expected-failure + ghc-silently)) + (home-page "https://github.com/mpickering/apply-refact") (synopsis "Perform refactorings specified by the refact library") (description "This package lets you perform refactorings specified by the refact @@ -94,43 +92,36 @@ library. It is primarily used with HLint's @code{--refactor} flag.") ;; update this packages after updating GHC. (define-public cabal-install (package - (name "cabal-install") - (version "3.2.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cabal-install" version)) - (patches (search-patches "cabal-install-base16-bytestring1.0.patch" - "cabal-install-ghc8.10.patch")) - (sha256 - (base32 "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0")))) + (name "cabal-install") + (version "3.6.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "cabal-install" version)) + (sha256 + (base32 + "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw")))) (build-system haskell-build-system) (properties '((upstream-name . "cabal-install"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "cabal-install.cabal" - (("(base|base16-bytestring|random)\\s+[^,]+" all dep) - dep))))))) - (inputs - (list ghc-async - ghc-base16-bytestring - ghc-cryptohash-sha256 - ghc-echo - ghc-edit-distance - ghc-hackage-security - ghc-hashable - ghc-http - ghc-network-uri - ghc-network - ghc-random - ghc-resolv - ghc-tar - ghc-zip-archive - ghc-zlib)) - (home-page "https://www.haskell.org/cabal/") + (inputs (list ghc-async + ghc-base16-bytestring + ghc-cryptohash-sha256 + ghc-echo + ghc-edit-distance + ghc-hashable + ghc-http + ghc-network-uri + ghc-random + ghc-tar + ghc-zlib + ghc-hackage-security + ghc-regex-base + ghc-regex-posix + ghc-resolv + ghc-lukko)) + (arguments + `(#:cabal-revision ("2" + "1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv"))) + (home-page "http://www.haskell.org/cabal/") (synopsis "Command-line interface for Cabal and Hackage") (description "The cabal command-line program simplifies the process of managing @@ -153,6 +144,9 @@ installation of Haskell libraries and programs.") (properties '((upstream-name . "cpphs"))) (inputs (list ghc-polyparse ghc-old-locale ghc-old-time)) + (arguments + `(#:cabal-revision ("1" + "1f8jzs8zdh4wwbcq8fy6qqxkv75ypnvsm4yzw49wpr3b9vpnzlha"))) (home-page "https://projects.haskell.org/cpphs/") (synopsis "Liberalised re-implementation of cpp, the C pre-processor") (description "Cpphs is a re-implementation of the C pre-processor that is @@ -170,14 +164,14 @@ unlit literate code files; and an option to turn off macro-expansion.") (define-public darcs (package (name "darcs") - (version "2.16.4") + (version "2.16.5") (source (origin (method url-fetch) (uri (hackage-uri "darcs" version)) (sha256 (base32 - "07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4")) + "0ar4markr71l9hzrbgcz4q37cf2rf3936i6qi8p827p36v96qg6n")) (modules '((guix build utils))) ;; Remove time-dependent code for reproducibility. (snippet @@ -203,57 +197,50 @@ unlit literate code files; and an option to turn off macro-expansion.") (add-before 'configure 'update-constraints (lambda _ (substitute* "darcs.cabal" - (("(constraints)\\s+[^,]+" all dep) - dep) - (("(cryptonite)\\s+[^,]+" all dep) + (("(attoparsec|base|bytestring|constraints|cryptonite|hashable|memory|regex-tdfa|time)\\s+[^,]+" all dep) dep))))))) - (inputs - (list ghc-cmdargs - ghc-split - ghc-test-framework-quickcheck2 - ghc-test-framework-hunit - ghc-test-framework - ghc-quickcheck - ghc-constraints - ghc-findbin - ghc-hunit - ghc-cryptonite - ghc-http-conduit - ghc-http-types - ghc-async - ghc-attoparsec - ghc-base16-bytestring - ghc-bytestring-builder - ghc-cryptohash - ghc-data-ordlist - ghc-fgl - ghc-system-filepath - ghc-graphviz - ghc-hashable - ghc-html - ghc-mmap - ghc-old-time - ghc-random - ghc-regex-applicative - ghc-regex-compat-tdfa - ghc-sandi - ghc-shelly - ghc-tar - ghc-transformers-compat - ghc-unix-compat - ghc-utf8-string - ghc-vector - ghc-zip-archive - ghc-zlib - ghc-http - curl - ghc - ncurses - perl - ghc-network - ghc-network-uri)) - (native-inputs - (list pkg-config)) + (inputs (list ghc-regex-base + ghc-regex-tdfa + ghc-regex-applicative + ghc-fgl + ghc-html + ghc-memory + ghc-cryptonite + ghc-base16-bytestring + ghc-utf8-string + ghc-vector + ghc-tar + ghc-data-ordlist + ghc-attoparsec + ghc-zip-archive + ghc-async + ghc-constraints + ghc-unix-compat + ghc-old-time + ghc-temporary + ghc-hashable + ghc-mmap + ghc-zlib + ghc-network-uri + ghc-network + ghc-conduit + ghc-http-conduit + ghc-http-types + curl)) + (native-inputs (list ghc-cmdargs + ghc-findbin + ghc-quickcheck + ghc-leancheck + ghc-hunit + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2 + ghc-test-framework-leancheck + ghc-monad-control + ghc-system-filepath + ghc-system-fileio + ghc-transformers-base + pkg-config)) (home-page "http://darcs.net") (synopsis "Distributed Revision Control System") (description @@ -509,36 +496,39 @@ used to keep a folder in sync between computers.") (define-public hlint (package (name "hlint") - (version "3.2.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hlint" version)) - (sha256 - (base32 - "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g")))) + (version "3.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hlint" version)) + (sha256 + (base32 + "0bkk03c9hacvfd73dk89g4r81b50g7pjgw5pavldali4qwss34cz")))) (build-system haskell-build-system) (properties '((upstream-name . "hlint"))) - (inputs - (list ghc-unordered-containers - ghc-yaml - ghc-vector - ghc-data-default - ghc-file-embed - ghc-utf8-string - cpphs - ghc-filepattern - ghc-lib-parser-ex - hscolour - ghc-cmdargs - ghc-uniplate - ghc-ansi-terminal - ghc-extra - ghc-refact - ghc-aeson)) - (home-page "https://github.com/ndmitchell/hlint") + (inputs (list ghc-unordered-containers + ghc-vector + ghc-file-embed + ghc-utf8-string + ghc-data-default + cpphs + ghc-cmdargs + ghc-uniplate + ghc-ansi-terminal + ghc-extra + ghc-refact + ghc-aeson + ghc-deriving-aeson + ghc-filepattern + ghc-lib-parser-ex + hscolour + ghc-yaml)) + (arguments + `(#:cabal-revision ("1" + "1rdaffg5n179yfcn5zjwjb0bki09qy13gz2ijky455y9pbaz8yz9"))) + (home-page "https://github.com/ndmitchell/hlint#readme") (synopsis "Suggest improvements for Haskell source code") - (description "HLint reads Haskell programs and suggests changes that + (description + "HLint reads Haskell programs and suggests changes that hopefully make them easier to read. HLint also makes it easy to disable unwanted suggestions, and to add your own custom suggestions.") (license license:bsd-3))) @@ -546,50 +536,50 @@ unwanted suggestions, and to add your own custom suggestions.") (define-public hoogle (package (name "hoogle") - (version "5.0.18.2") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "hoogle" version)) - (sha256 - (base32 - "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7")))) + (version "5.0.18.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "hoogle" version)) + (sha256 + (base32 + "0v6k75w0an9pqgb7a6cicnpf9rz77xd2lmxfbafc5l4f99jg83bn")))) (build-system haskell-build-system) (properties '((upstream-name . "hoogle"))) - (inputs - (list ghc-quickcheck - ghc-aeson - ghc-blaze-html - ghc-blaze-markup - ghc-cmdargs - ghc-conduit - ghc-conduit-extra - ghc-connection - ghc-extra - ghc-foundation - ghc-old-locale - ghc-haskell-src-exts - ghc-http-conduit - ghc-http-types - ghc-js-flot - ghc-js-jquery - ghc-mmap - ghc-process-extras - ghc-resourcet - ghc-storable-tuple - ghc-tar - ghc-uniplate - ghc-utf8-string - ghc-vector - ghc-wai - ghc-wai-logger - ghc-warp - ghc-warp-tls - ghc-zlib)) + (inputs (list ghc-quickcheck + ghc-aeson + ghc-blaze-html + ghc-blaze-markup + ghc-cmdargs + ghc-conduit + ghc-conduit-extra + ghc-connection + ghc-extra + ghc-foundation + ghc-old-locale + ghc-hashable + ghc-haskell-src-exts + ghc-http-conduit + ghc-http-types + ghc-js-flot + ghc-js-jquery + ghc-mmap + ghc-process-extras + ghc-resourcet + ghc-storable-tuple + ghc-tar + ghc-uniplate + ghc-utf8-string + ghc-vector + ghc-wai + ghc-wai-logger + ghc-warp + ghc-warp-tls + ghc-zlib + ghc-semigroups)) (home-page "https://hoogle.haskell.org/") (synopsis "Haskell API Search") - (description "Hoogle is a Haskell API search engine, which allows + (description + "Hoogle is a Haskell API search engine, which allows you to search many standard Haskell libraries by either function name, or by approximate type signature.") (license license:bsd-3))) @@ -617,90 +607,89 @@ and mIRC chat codes.") (license license:bsd-3))) (define-public kmonad - (package - (name "kmonad") - (version "0.4.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/david-janssen/kmonad") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1rp880zxvrznx0y1k464wjrds441dpsz94syhrkaw5dnmxf74yjd")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'haddock) ; Haddock fails to generate docs - (add-after 'install 'install-udev-rules - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rules (string-append out "/lib/udev/rules.d"))) - (mkdir-p rules) - (call-with-output-file (string-append rules "/70-kmonad.rules") - (lambda (port) - (display - (string-append - "KERNEL==\"uinput\", MODE=\"0660\", " - "GROUP=\"input\", OPTIONS+=\"static_node=uinput\"\n") - port))) - #t))) - (add-after 'install-udev-rules 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/kmonad-" ,version))) - (install-file "README.md" doc) - (copy-recursively "doc" doc) - (copy-recursively "keymap" (string-append doc "/keymap")) - #t)))))) - (inputs - (list ghc-cereal - ghc-exceptions - ghc-hashable - ghc-lens - ghc-megaparsec - ghc-optparse-applicative - ghc-resourcet - ghc-rio - ghc-unagi-chan - ghc-unliftio - ghc-unordered-containers)) - (home-page "https://github.com/david-janssen/kmonad") - (synopsis "Advanced keyboard manager") - (description "KMonad is a keyboard remapping utility that supports + ;; Project is active, but no new releases exist. Pick current master + ;; HEAD as of 2023-01-08. + (let ((commit "a0af5b8b3f085adb2c09ca52374a53566c25194c") + (revision "1")) + (package + (name "kmonad") + (version (git-version "0.4.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/david-janssen/kmonad") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00qmmk1lgadhh32dqi530xm18v79ndcm7rrxvdsf827vicv2nhw1")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; Haddock fails to generate docs + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-git-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/KMonad/Args/TH.hs" + (("\"git\"") + (string-append "\"" (search-input-file inputs "/bin/git") "\""))))) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d"))) + (mkdir-p rules) + (call-with-output-file (string-append rules "/70-kmonad.rules") + (lambda (port) + (display + (string-append + "KERNEL==\"uinput\", MODE=\"0660\", " + "GROUP=\"input\", OPTIONS+=\"static_node=uinput\"\n") + port))) + #t))) + (add-after 'install-udev-rules 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/kmonad-" ,version))) + (install-file "README.md" doc) + (copy-recursively "doc" doc) + (copy-recursively "keymap" (string-append doc "/keymap")) + #t)))))) + (inputs + (list ghc-cereal + ghc-exceptions + ghc-lens + ghc-megaparsec + ghc-optparse-applicative + ghc-resourcet + ghc-rio + ghc-unliftio + ghc-unordered-containers + ghc-template-haskell)) + (native-inputs (list ghc-hspec hspec-discover git)) + (home-page "https://github.com/david-janssen/kmonad") + (synopsis "Advanced keyboard manager") + (description "KMonad is a keyboard remapping utility that supports advanced functionality, such as custom keymap layers and modifiers, macros, and conditional mappings that send a different keycode when tapped or held. By operating at a lower level than most similar tools, it supports X11, Wayland, and Linux console environments alike.") - (license license:expat))) + (license license:expat)))) (define-public nixfmt (package (name "nixfmt") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (hackage-uri "nixfmt" version)) (sha256 - (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) + (base32 "0rxi8zrd2xr72w673nvgnhb0g3r7rssc1ahlhz8rmdpc6c1a82wl")))) (build-system haskell-build-system) (properties '((upstream-name . "nixfmt"))) (inputs (list ghc-megaparsec ghc-parser-combinators ghc-cmdargs ghc-safe-exceptions)) - (arguments - `(#:cabal-revision - ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "nixfmt.cabal" - (("(base|megaparsec)\\s+[^,]+" all dep) - dep))))))) (home-page "https://github.com/serokell/nixfmt") (synopsis "Opinionated formatter for Nix") (description @@ -711,16 +700,16 @@ formatting by forgetting all existing formatting during parsing.") (define-public greenclip (package (name "greenclip") - (version "3.4") + (version "4.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/erebe/greenclip") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1baw360dcnyavacf7a8v6wq4m5g6bcmyybkckv4cz7r4xl5p3qws")))) + (base32 "10r485q055ci29fmpsjy55n1yqfil53cvdxldlzw2n6mpynmckyv")))) (build-system haskell-build-system) (native-inputs (list pkg-config)) @@ -734,6 +723,7 @@ formatting by forgetting all existing formatting during parsing.") ghc-microlens ghc-microlens-mtl ghc-protolude + ghc-tomland ghc-vector ghc-wordexp)) (home-page "https://github.com/erebe/greenclip") @@ -929,34 +919,31 @@ output, stderr, and exit status.") (define-public stylish-haskell (package (name "stylish-haskell") - (version "0.13.0.0") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "stylish-haskell" version)) - (sha256 - (base32 - "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf")))) + (version "0.14.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "stylish-haskell" version)) + (sha256 + (base32 + "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d")))) (build-system haskell-build-system) (properties '((upstream-name . "stylish-haskell"))) - (inputs - (list ghc-aeson - ghc-file-embed - ghc-haskell-src-exts - ghc-semigroups - ghc-syb - ghc-hsyaml - ghc-hsyaml-aeson - ghc-lib-parser - ghc-strict - ghc-optparse-applicative - ghc-hunit - ghc-test-framework - ghc-test-framework-hunit)) - (home-page "https://github.com/jaspervdj/stylish-haskell") + (inputs (list ghc-aeson + ghc-file-embed + ghc-regex-tdfa + ghc-syb + ghc-hsyaml-aeson + ghc-hsyaml + ghc-semigroups + ghc-lib-parser-ex + ghc-strict + ghc-optparse-applicative)) + (native-inputs (list ghc-hunit ghc-random ghc-test-framework + ghc-test-framework-hunit)) + (home-page "https://github.com/haskell/stylish-haskell") (synopsis "Haskell code prettifier") - (description "Stylish-haskell is a Haskell code prettifier. The goal is + (description + "Stylish-haskell is a Haskell code prettifier. The goal is not to format all of the code in a file, to avoid \"getting in the way\". However, this tool can e.g. clean up import statements and help doing various tasks that get tedious very quickly. It can diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index e00103d2fe..6b7fe878e2 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -90,25 +90,19 @@ Haskell test framework.") (define-public ghc-tasty-quickcheck (package (name "ghc-tasty-quickcheck") - (version "0.10.1.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-quickcheck" version)) - (sha256 - (base32 - "0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49")))) + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-quickcheck" version)) + (sha256 + (base32 + "1qnc6rdvjvlw08q6sln2n98rvj0s0pp689h6w4z58smjbn0lr25l")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-quickcheck"))) - (inputs - (list ghc-quickcheck - ghc-tagged - ghc-tasty - ghc-random - ghc-ansi-terminal - ghc-tasty-hunit - ghc-pcre-light)) - (home-page "http://documentup.com/feuerbach/tasty") + (inputs (list ghc-tagged ghc-tasty ghc-random ghc-quickcheck + ghc-optparse-applicative)) + (native-inputs (list ghc-tasty-hunit ghc-pcre-light)) + (home-page "https://github.com/UnkindPartition/tasty") (synopsis "QuickCheck support for the Tasty test framework") (description "This package provides QuickCheck support for the Tasty Haskell test framework.") @@ -117,26 +111,23 @@ Haskell test framework.") (define-public ghc-tasty-golden (package (name "ghc-tasty-golden") - (version "2.3.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-golden" version)) - (sha256 - (base32 - "1nskavqgfxx1cw7q6c0cmizlwj54rnlv93yhgssaa77gv1nbvwpn")))) + (version "2.3.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-golden" version)) + (sha256 + (base32 + "03klnxn9rcv0l7fl4w8q6s59fzl1328j1wzwi1za4gb0l90vadwb")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-golden"))) - (inputs - (list ghc-async - ghc-optparse-applicative - ghc-tagged - ghc-tasty - ghc-temporary - ghc-unix-compat)) + (inputs (list ghc-tasty + ghc-typed-process + ghc-optparse-applicative + ghc-temporary + ghc-tagged + ghc-async)) (native-inputs (list ghc-tasty-hunit)) - (home-page - "https://github.com/feuerbach/tasty-golden") + (home-page "https://github.com/UnkindPartition/tasty-golden") (synopsis "Golden tests support for tasty") (description "This package provides support for @code{golden testing}. A @dfn{golden @@ -148,28 +139,20 @@ contains the correct result for the test.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "1.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty" version)) - (sha256 - (base32 - "0574hbqzxzyv6vsk5kzbf04kz58y0iy8x9ydcj4b8fpncgmgy63g")))) + (version "1.4.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty" version)) + (sha256 + (base32 + "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty"))) - (inputs - (list ghc-tagged - ghc-regex-tdfa - ghc-optparse-applicative - ghc-unbounded-delays - ghc-async - ghc-ansi-terminal - ghc-clock-bootstrap - ghc-wcwidth-bootstrap)) - (home-page "http://documentup.com/feuerbach/tasty") + (inputs (list ghc-tagged ghc-optparse-applicative ghc-ansi-terminal)) + (home-page "https://github.com/UnkindPartition/tasty") (synopsis "Modern and extensible testing framework") - (description "Tasty is a modern testing framework for Haskell. It lets + (description + "Tasty is a modern testing framework for Haskell. It lets you combine your unit tests, golden tests, QuickCheck/SmallCheck properties, and any other types of tests into a single test suite.") (license license:expat))) @@ -177,23 +160,21 @@ and any other types of tests into a single test suite.") (define-public ghc-tasty-hedgehog (package (name "ghc-tasty-hedgehog") - (version "1.1.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-hedgehog" version)) - (sha256 - (base32 - "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb")))) + (version "1.3.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-hedgehog" version)) + (sha256 + (base32 + "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-hedgehog"))) - (inputs - (list ghc-tagged ghc-tasty ghc-hedgehog)) - (native-inputs - (list ghc-tasty-expected-failure)) + (inputs (list ghc-tagged ghc-tasty ghc-hedgehog)) + (native-inputs (list ghc-tasty-expected-failure)) (home-page "https://github.com/qfpl/tasty-hedgehog") (synopsis "Integration for tasty and hedgehog") - (description "This package provides the means for integrating the + (description + "This package provides the means for integrating the @url{https://hackage.haskell.org/package/hedgehog, hedgehog testing library} with the @url{https://hackage.haskell.org/package/tasty, tasty testing framework}.") @@ -202,31 +183,27 @@ framework}.") (define-public ghc-tasty-hspec (package (name "ghc-tasty-hspec") - (version "1.1.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-hspec" version)) - (sha256 - (base32 - "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl")))) + (version "1.2.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-hspec" version)) + (sha256 + (base32 + "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-hspec"))) - (inputs - (list ghc-hspec - ghc-hspec-core - ghc-quickcheck - ghc-tagged - ghc-tasty - ghc-tasty-smallcheck - ghc-tasty-quickcheck)) + (inputs (list ghc-hspec + ghc-hspec-core + ghc-quickcheck + ghc-tasty + ghc-tasty-smallcheck + ghc-tasty-quickcheck + ghc-tagged)) (arguments - `(#:cabal-revision - ("1" "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj"))) - (home-page - "https://github.com/mitchellwrosen/tasty-hspec") - (synopsis - "Hspec support for the Tasty test framework") + `(#:cabal-revision ("1" + "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"))) + (home-page "https://github.com/mitchellwrosen/tasty-hspec") + (synopsis "Hspec support for the Tasty test framework") (description "This package provides a Tasty provider for Hspec test suites.") (license license:bsd-3))) @@ -276,21 +253,23 @@ tasty.") (define-public ghc-tasty-lua (package (name "ghc-tasty-lua") - (version "0.2.3.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-lua" version)) - (sha256 - (base32 - "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53")))) + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-lua" version)) + (sha256 + (base32 + "1vnyvgcjsvqhwwyqkbgqksr9ppj5whiihpwcqkg33sl7jj3ysdwv")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-lua"))) - (inputs - (list ghc-file-embed ghc-hslua ghc-tasty)) - (native-inputs - (list ghc-tasty-hunit)) - (home-page "https://github.com/hslua/tasty-lua") + (inputs (list ghc-hslua-core + ghc-hslua-marshalling + ghc-lua-arbitrary + ghc-tasty + ghc-quickcheck + ghc-file-embed)) + (native-inputs (list ghc-tasty-hunit)) + (home-page "https://github.com/hslua/hslua") (synopsis "Write tests in Lua, integrate into tasty") (description "This package gives users the ability to define tasty tests from Lua.") @@ -335,6 +314,9 @@ test-framework.") (inputs (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged ghc-tasty)) + (arguments + `(#:cabal-revision ("3" + "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb"))) (home-page "https://github.com/ocharles/tasty-rerun") (synopsis "Run tests by filtering the test tree") (description "This package adds the ability to run tests by filtering the @@ -376,37 +358,35 @@ development.") (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.25.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "quickcheck-instances" version)) - (sha256 - (base32 - "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h")))) + (version "0.3.28") + (source (origin + (method url-fetch) + (uri (hackage-uri "quickcheck-instances" version)) + (sha256 + (base32 + "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4")))) (build-system haskell-build-system) (properties '((upstream-name . "quickcheck-instances"))) - (arguments - `(#:cabal-revision - ("2" "1lsa3pbg4ljlk29fhm3mdklnx3hwffyga1nr5krbpcyc3ywq8fq8"))) - (inputs - (list ghc-case-insensitive - ghc-data-fix - ghc-hashable - ghc-integer-logarithms - ghc-old-time - ghc-quickcheck - ghc-scientific - ghc-splitmix - ghc-strict - ghc-tagged - ghc-these - ghc-time-compat - ghc-transformers-compat - ghc-unordered-containers - ghc-uuid-types - ghc-vector)) - (home-page "https://github.com/aslatter/qc-instances") + (inputs (list ghc-quickcheck + ghc-splitmix + ghc-case-insensitive + ghc-data-fix + ghc-hashable + ghc-integer-logarithms + ghc-old-time + ghc-onetuple + ghc-primitive + ghc-scientific + ghc-strict + ghc-tagged + ghc-these + ghc-time-compat + ghc-transformers-compat + ghc-unordered-containers + ghc-uuid-types + ghc-vector + ghc-text-short)) + (home-page "https://github.com/haskellari/qc-instances") (synopsis "Common quickcheck instances") (description "This package provides QuickCheck instances for types provided by the Haskell Platform.") @@ -521,8 +501,8 @@ HUnit.") `(#:tests? #f ; FIXME: Tests do not build. #:cabal-revision ("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r"))) - (native-inputs - (list ghc-hunit ghc-quickcheck)) + ;(native-inputs + ; (list ghc-hunit ghc-quickcheck)) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) @@ -673,19 +653,17 @@ JUnit tool for Java.") (define-public hspec-discover (package (name "hspec-discover") - (version "2.7.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hspec-discover" version)) - (sha256 - (base32 - "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa")))) + (version "2.9.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-discover" version)) + (sha256 + (base32 + "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-discover"))) - (native-inputs - (list ghc-quickcheck ghc-hspec-meta)) - (home-page "https://hspec.github.io/") + (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery-bootstrap)) + (home-page "http://hspec.github.io/") (synopsis "Automatically discover and run Hspec tests") (description "hspec-discover is a tool which automatically discovers and runs Hspec tests.") @@ -694,28 +672,28 @@ runs Hspec tests.") (define-public ghc-hspec-core (package (name "ghc-hspec-core") - (version "2.7.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hspec-core" version)) - (sha256 - (base32 - "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1")))) + (version "2.9.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-core" version)) + (sha256 + (base32 + "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-core"))) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. - (inputs - (list ghc-setenv - ghc-ansi-terminal - ghc-clock - ghc-quickcheck-io - ghc-hunit - ghc-quickcheck - ghc-hspec-expectations - ghc-silently - ghc-tf-random)) - (home-page "https://hspec.github.io/") + (inputs (list ghc-hunit + ghc-quickcheck + ghc-ansi-terminal + ghc-call-stack + ghc-clock + ghc-hspec-expectations + ghc-quickcheck-io + ghc-random + ghc-setenv + ghc-tf-random)) + (native-inputs (list ghc-base-orphans-bootstrap ghc-hspec-meta + ghc-silently-bootstrap ghc-temporary)) + (home-page "http://hspec.github.io/") (synopsis "Testing framework for Haskell") (description "This library exposes internal types and functions that can be used to extend Hspec's functionality.") @@ -724,26 +702,23 @@ be used to extend Hspec's functionality.") (define-public ghc-hspec-meta (package (name "ghc-hspec-meta") - (version "2.7.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hspec-meta" version)) - (sha256 - (base32 - "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si")))) + (version "2.9.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-meta" version)) + (sha256 + (base32 + "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-meta"))) - (inputs - (list ghc-quickcheck - ghc-hunit - ghc-ansi-terminal - ghc-clock - ghc-hspec-expectations - ghc-setenv - ghc-random - ghc-quickcheck-io)) - (home-page "https://hspec.github.io/") + (inputs (list ghc-quickcheck + ghc-ansi-terminal + ghc-call-stack-boot + ghc-clock + ghc-quickcheck-io + ghc-random + ghc-setenv)) + (home-page "http://hspec.github.io/") (synopsis "Version of Hspec to test Hspec itself") (description "This library provides a stable version of Hspec which is used to test the in-development version of Hspec.") @@ -752,26 +727,18 @@ used to test the in-development version of Hspec.") (define-public ghc-hspec (package (name "ghc-hspec") - (version "2.7.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hspec" version)) - (sha256 - (base32 - "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw")))) + (version "2.9.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec" version)) + (sha256 + (base32 + "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-hspec-core - hspec-discover - ghc-hspec-expectations - ghc-quickcheck - ghc-hunit - ghc-stringbuilder - ghc-hspec-meta)) - (home-page "https://hspec.github.io/") + (inputs (list ghc-quickcheck ghc-hspec-core hspec-discover + ghc-hspec-expectations)) + (home-page "http://hspec.github.io/") (synopsis "Testing Framework for Haskell") (description "This library provides the Hspec testing framework for Haskell, inspired by the Ruby library RSpec.") @@ -780,23 +747,21 @@ Haskell, inspired by the Ruby library RSpec.") (define-public ghc-hspec-contrib (package (name "ghc-hspec-contrib") - (version "0.5.1") + (version "0.5.1.1") (source (origin (method url-fetch) (uri (hackage-uri "hspec-contrib" version)) (sha256 (base32 - "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc")))) + "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-contrib"))) - (inputs - (list ghc-hspec-core ghc-hunit ghc-hspec ghc-quickcheck)) - (native-inputs - (list hspec-discover)) - (home-page "https://hspec.github.io/") + (inputs (list ghc-hunit ghc-hspec-core)) + (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) + (arguments (list #:tests? #f)) ; Tests fail to compile. + (home-page "http://hspec.github.io/") (synopsis "Contributed functionality for Hspec") - (description - "This package provides contributed Hspec extensions.") + (description "This package provides contributed Hspec extensions.") (license license:expat))) (define-public ghc-hspec-expectations @@ -834,8 +799,8 @@ Haskell, inspired by the Ruby library RSpec.") "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g")))) (build-system haskell-build-system) (properties '((upstream-name . "nanospec"))) - (inputs - (list ghc-hspec ghc-silently)) + (inputs (list ghc-silently-bootstrap)) + (native-inputs (list ghc-hspec)) (home-page "https://github.com/hspec/nanospec#readme") (synopsis "Lightweight implementation of a subset of Hspec's API") (description @@ -843,6 +808,14 @@ Haskell, inspired by the Ruby library RSpec.") minimal dependencies.") (license license:expat))) +(define-public ghc-nanospec-bootstrap + (package + (inherit ghc-nanospec) + (name "ghc-nanospec-bootstrap") + (arguments '(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-crypto-cipher-tests (package (name "ghc-crypto-cipher-tests") @@ -874,31 +847,29 @@ implementations of cryptographic ciphers.") (define-public ghc-hedgehog (package (name "ghc-hedgehog") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hedgehog" version)) - (sha256 - (base32 - "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6")))) + (version "1.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "hedgehog" version)) + (sha256 + (base32 + "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1")))) (build-system haskell-build-system) (properties '((upstream-name . "hedgehog"))) - (inputs - (list ghc-ansi-terminal - ghc-async - ghc-concurrent-output - ghc-erf - ;("ghc-exceptions" ,ghc-exceptions) - ghc-lifted-async - ghc-mmorph - ghc-monad-control - ghc-pretty-show - ghc-primitive - ghc-random - ghc-resourcet - ghc-transformers-base - ghc-wl-pprint-annotated)) + (inputs (list ghc-ansi-terminal + ghc-async + ghc-barbies + ghc-concurrent-output + ghc-erf + ghc-lifted-async + ghc-mmorph + ghc-monad-control + ghc-pretty-show + ghc-primitive + ghc-random + ghc-resourcet + ghc-transformers-base + ghc-wl-pprint-annotated)) (home-page "https://hedgehog.qa") (synopsis "Property-based testing in the spirt of QuickCheck") (description @@ -910,23 +881,30 @@ To get started quickly, see the examples: @uref{https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example}") (license license:bsd-3))) +;; Deprecated. Don’t use. (define-public cabal-doctest (package (name "cabal-doctest") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cabal-doctest" version)) - (sha256 - (base32 - "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) + (version "1.0.9") + (source (origin + (method url-fetch) + (uri (hackage-uri "cabal-doctest" version)) + (sha256 + (base32 + "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm")))) (build-system haskell-build-system) (properties '((upstream-name . "cabal-doctest"))) (arguments - `(#:cabal-revision - ("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"))) - (home-page "https://github.com/phadej/cabal-doctest") + `(#:cabal-revision ("2" + "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cabal-doctest.cabal" + (("\\b(Cabal|base)\\s+[^,]+" all dep) + dep))))))) + (home-page "https://github.com/haskellari/cabal-doctest") (synopsis "Setup.hs helper for running doctests") (description "To properly work, the @code{doctest} package needs plenty of @@ -934,6 +912,10 @@ configuration. This library provides the common bits for writing custom @file{Setup.hs} files.") (license license:bsd-3))) +;; Deprecated. Don’t use. +(define-public ghc-cabal-doctest + (deprecated-package "ghc-cabal-doctest" cabal-doctest)) + (define-public ghc-testing-type-modifiers (package (name "ghc-testing-type-modifiers") @@ -959,22 +941,20 @@ testing frameworks.") (define-public ghc-testing-feat (package (name "ghc-testing-feat") - (version "1.1.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "testing-feat" version)) - (sha256 - (base32 - "1v2qzzpf1s008g7q6q67glf7vbm1pkpq4rc3ii74f4g6vhfx610r")))) + (version "1.1.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "testing-feat" version)) + (sha256 + (base32 + "14d6licgrkiw36xj1cshnqxcbx5iwzxwq731xlb1wb5n2sw8ijf2")))) (build-system haskell-build-system) (properties '((upstream-name . "testing-feat"))) - (inputs - (list ghc-quickcheck ghc-size-based ghc-testing-type-modifiers - ghc-semigroups)) - (home-page "https://github.com/JonasDuregard/testing-feat") + (inputs (list ghc-quickcheck ghc-size-based ghc-testing-type-modifiers)) + (home-page "https://github.com/size-based/testing-feat") (synopsis "Functional Enumeration of Algebraic Types") - (description "Feat (Functional Enumeration of Algebraic Types) + (description + "Feat (Functional Enumeration of Algebraic Types) provides enumerations as functions from natural numbers to values (similar to @code{toEnum} but for any algebraic data type). This can be used for SmallCheck-style systematic testing, QuickCheck-style @@ -984,18 +964,16 @@ random testing, and hybrids of the two.") (define-public ghc-inspection-testing (package (name "ghc-inspection-testing") - (version "0.4.6.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "inspection-testing" version)) - (sha256 - (base32 - "0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig")))) + (version "0.4.6.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "inspection-testing" version)) + (sha256 + (base32 + "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y")))) (build-system haskell-build-system) (properties '((upstream-name . "inspection-testing"))) - (home-page - "https://github.com/nomeata/inspection-testing") + (home-page "https://github.com/nomeata/inspection-testing") (synopsis "GHC plugin to do inspection testing") (description "Some carefully crafted libraries make promises to their users beyond @@ -1133,6 +1111,9 @@ these constraints more cleanly.") (properties '((upstream-name . "doctest-exitcode-stdio"))) (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups)) + (arguments + `(#:cabal-revision ("1" + "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3"))) (home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/") (synopsis "Run Doctests in a @code{Cabal.Test.exitcode-stdio} environment") (description @@ -1140,55 +1121,33 @@ these constraints more cleanly.") environment.") (license license:bsd-3))) -(define-public ghc-cabal-doctest - (package - (name "ghc-cabal-doctest") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cabal-doctest" version)) - (sha256 - (base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) - (build-system haskell-build-system) - (properties '((upstream-name . "cabal-doctest"))) - (arguments - `(#:cabal-revision - ("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"))) - (home-page "https://github.com/phadej/cabal-doctest") - (synopsis "@file{Setup.hs} helper for Doctests running") - (description - "This package provides helpers for running Doctests in @file{Setup.hs}.") - (license license:bsd-3))) - (define-public ghc-tasty-silver (package (name "ghc-tasty-silver") - (version "3.2.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tasty-silver" version)) - (sha256 - (base32 "0nvh2k8iqqkanmp7lpwd3asimyarzisly8wavbdahcxryn0j4xb7")))) + (version "3.3.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-silver" version)) + (sha256 + (base32 + "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-silver"))) - (inputs - (list ghc-ansi-terminal - ghc-async - ghc-optparse-applicative - ghc-process-extras - ghc-regex-tdfa - ghc-semigroups - ghc-tagged - ghc-tasty - ghc-temporary)) - (native-inputs - (list ghc-tasty-hunit ghc-silently)) + (inputs (list ghc-ansi-terminal + ghc-async + ghc-optparse-applicative + ghc-process-extras + ghc-regex-tdfa + ghc-silently + ghc-tagged + ghc-tasty + ghc-temporary + ghc-semigroups)) + (native-inputs (list ghc-tasty-hunit)) (home-page "https://github.com/phile314/tasty-silver") (synopsis "Fancy test runner, including support for golden tests") (description - "This package provides a fancy test runner and support for @dfn{golden + "This package provides a fancy test runner and support for @dfn{golden testing}. A golden test is an IO action that writes its result to a file. To pass the test, this output file should be identical to the corresponding ``golden'' file, which contains the correct result for the test. The test @@ -1196,3 +1155,22 @@ runner allows filtering tests using regexes, and to interactively inspect the result of golden tests.") (license license:expat))) +(define-public ghc-tasty-inspection-testing + (package + (name "ghc-tasty-inspection-testing") + (version "0.1.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-inspection-testing" version)) + (sha256 + (base32 + "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp")))) + (build-system haskell-build-system) + (properties '((upstream-name . "tasty-inspection-testing"))) + (inputs (list ghc-inspection-testing ghc-tasty)) + (home-page "https://github.com/Bodigrim/tasty-inspection-testing") + (synopsis "Inspection testing support for tasty") + (description + "Integrate @@inspection-testing@@ into @@tasty@@ test suites.") + (license license:expat))) + diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index e06ff7058b..0046e0481a 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (guix build-system haskell) #:use-module (guix download) @@ -209,25 +210,24 @@ that hides the C implementation.") (define-public ghc-cryptohash-sha1 (package (name "ghc-cryptohash-sha1") - (version "0.11.100.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cryptohash-sha1" version)) - (sha256 - (base32 - "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w")))) + (version "0.11.101.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "cryptohash-sha1" version)) + (sha256 + (base32 + "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154")))) (build-system haskell-build-system) (properties '((upstream-name . "cryptohash-sha1"))) - (arguments - `(#:cabal-revision - ("6" "10rpxrmqgwihmplczglwxf5q3l13z9j3kvi065z884y4dymmnkgc") - #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty - ghc-tasty-quickcheck ghc-hunit)) + ghc-tasty-quickcheck ghc-tasty-hunit)) + (arguments + `(#:cabal-revision ("1" + "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b"))) (home-page "https://github.com/hvr/cryptohash-sha1") (synopsis "SHA-1 implementation for Haskell") - (description "This Haskell package provides an incremental and one-pass, + (description + "This Haskell package provides an incremental and one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-1, SHA-1 hash algorithm}, including @uref{https://en.wikipedia.org/wiki/HMAC, HMAC support}, with performance close to the fastest implementations available in other languages. @@ -270,23 +270,18 @@ the C implementation.") (define-public ghc-cryptonite (package (name "ghc-cryptonite") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri (hackage-uri "cryptonite" version)) (sha256 (base32 - "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq")))) + "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an")))) (build-system haskell-build-system) (properties '((upstream-name . "cryptonite"))) - ;; FIXME: tests are broken. - ;; See https://github.com/haskell-crypto/cryptonite/issues/260 - (arguments '(#:tests? #f)) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-basement ghc-memory ghc-byteable)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit ghc-tasty-kat)) + (inputs (list ghc-memory ghc-basement)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit + ghc-tasty-kat)) (home-page "https://github.com/haskell-crypto/cryptonite") (synopsis "Cryptography primitives") (description @@ -299,24 +294,21 @@ generators, and more.") (define-public ghc-digest (package (name "ghc-digest") - (version "0.0.1.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "digest" version)) - (sha256 - (base32 - "1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm")))) + (version "0.0.1.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "digest" version)) + (sha256 + (base32 + "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr")))) (build-system haskell-build-system) (properties '((upstream-name . "digest"))) (arguments `(#:extra-directories ("zlib"))) - (inputs - (list zlib)) - (home-page - "https://hackage.haskell.org/package/digest") - (synopsis - "Various cryptographic hashes for bytestrings") + (inputs (list zlib)) + (native-inputs (list pkg-config)) + (home-page "http://hackage.haskell.org/package/digest") + (synopsis "Various cryptographic hashes for bytestrings") (description "This package provides efficient cryptographic hash implementations for strict and lazy bytestrings. For now, CRC32 and Adler32 are supported; they @@ -326,13 +318,13 @@ are implemented as FFI bindings to efficient code from zlib.") (define-public ghc-entropy (package (name "ghc-entropy") - (version "0.4.1.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "entropy" version)) - (sha256 - (base32 "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd")))) + (version "0.4.1.10") + (source (origin + (method url-fetch) + (uri (hackage-uri "entropy" version)) + (sha256 + (base32 + "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45")))) (build-system haskell-build-system) (properties '((upstream-name . "entropy"))) (home-page "https://github.com/TomMD/entropy") @@ -418,26 +410,24 @@ libraries, like OpenSSL.") (define-public ghc-x509 (package (name "ghc-x509") - (version "1.7.5") + (version "1.7.7") (source (origin (method url-fetch) (uri (hackage-uri "x509" version)) (sha256 (base32 - "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i")))) + "1zk8lll1hmzl5xvrd16dhyz25151y59xhsqp2mm1wgymwl7r5ijr")))) (build-system haskell-build-system) (properties '((upstream-name . "x509"))) - (inputs - (list ghc-memory - ghc-hourglass - ghc-pem - ghc-asn1-types - ghc-asn1-encoding - ghc-asn1-parse - ghc-cryptonite)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck)) - (home-page "https://github.com/vincenthz/hs-certificate") + (inputs (list ghc-memory + ghc-hourglass + ghc-pem + ghc-asn1-types + ghc-asn1-encoding + ghc-asn1-parse + ghc-cryptonite)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck)) + (home-page "http://github.com/vincenthz/hs-certificate") (synopsis "X509 reader and writer") (description "This library provides functions to read and write X509 certificates.") @@ -446,21 +436,19 @@ libraries, like OpenSSL.") (define-public ghc-x509-store (package (name "ghc-x509-store") - (version "1.6.7") + (version "1.6.9") (source (origin (method url-fetch) (uri (hackage-uri "x509-store" version)) (sha256 (base32 - "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp")))) + "1nn8ql7vkp4qgf2msm600sr6ranpsajbhq0sc4c0l6pk1i9174n5")))) (build-system haskell-build-system) (properties '((upstream-name . "x509-store"))) - (inputs - (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-cryptonite - ghc-x509)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit)) - (home-page "https://github.com/vincenthz/hs-certificate") + (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-cryptonite + ghc-x509)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "http://github.com/vincenthz/hs-certificate") (synopsis "X.509 collection accessing and storing methods") (description "This package provides functions for accessing and storing X.509 @@ -470,29 +458,26 @@ collections, certificates, revocation lists, and exception lists.") (define-public ghc-x509-validation (package (name "ghc-x509-validation") - (version "1.6.11") + (version "1.6.12") (source (origin (method url-fetch) (uri (hackage-uri "x509-validation" version)) (sha256 (base32 - "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr")))) + "1j7is28ljz4yxwxz5ax3x7ykgwkr38dx46bw7vgj4arkk7hl93hd")))) (build-system haskell-build-system) (properties '((upstream-name . "x509-validation"))) - (inputs - (list ghc-memory - ghc-byteable - ghc-hourglass - ghc-data-default-class - ghc-pem - ghc-asn1-types - ghc-asn1-encoding - ghc-x509 - ghc-x509-store - ghc-cryptonite)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit)) - (home-page "https://github.com/vincenthz/hs-certificate") + (inputs (list ghc-memory + ghc-hourglass + ghc-data-default-class + ghc-pem + ghc-asn1-types + ghc-asn1-encoding + ghc-x509 + ghc-x509-store + ghc-cryptonite)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "http://github.com/vincenthz/hs-certificate") (synopsis "X.509 certificate and revocation list validation") (description "This package provides functions for X.509 certificate and revocation @@ -502,18 +487,17 @@ list validation.") (define-public ghc-x509-system (package (name "ghc-x509-system") - (version "1.6.6") + (version "1.6.7") (source (origin (method url-fetch) (uri (hackage-uri "x509-system" version)) (sha256 (base32 - "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20")))) + "049bdaxrih49nkhkyl2342qnbx2f0q99z8rld648bz1kkgyizz38")))) (build-system haskell-build-system) (properties '((upstream-name . "x509-system"))) - (inputs - (list ghc-pem ghc-x509 ghc-x509-store)) - (home-page "https://github.com/vincenthz/hs-certificate") + (inputs (list ghc-pem ghc-x509 ghc-x509-store)) + (home-page "http://github.com/vincenthz/hs-certificate") (synopsis "Handle system X.509 accessors and storage") (description "This package provides a library to handle system accessors and storage @@ -654,7 +638,7 @@ percent. (properties '((upstream-name . "ed25519"))) (arguments `(#:cabal-revision - ("3" "1yidh86ymzwmp2b449pwim6vvfcs1qgkkncbixw1zmb7wj6v167v") + ("6" "0qyx6cl52fnll8lp6v9133wfvv3zhvq7v2crn441mng520j9wp48") ;; We omit these test suites because they require old versions of ;; packages and packages we do not have. #:configure-flags @@ -671,33 +655,30 @@ guidelines.") (define-public ghc-tls (package (name "ghc-tls") - (version "1.5.5") + (version "1.5.8") (source (origin (method url-fetch) (uri (hackage-uri "tls" version)) (sha256 (base32 - "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a")))) + "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b")))) (build-system haskell-build-system) (properties '((upstream-name . "tls"))) - (inputs - (list ghc-cereal - ghc-data-default-class - ghc-memory - ghc-cryptonite - ghc-asn1-types - ghc-asn1-encoding - ghc-x509 - ghc-x509-store - ghc-x509-validation - ghc-async - ghc-network - ghc-hourglass)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck)) - (home-page "https://github.com/vincenthz/hs-tls") - (synopsis - "TLS/SSL protocol native implementation (Server and Client)") + (inputs (list ghc-cereal + ghc-data-default-class + ghc-memory + ghc-cryptonite + ghc-asn1-types + ghc-asn1-encoding + ghc-x509 + ghc-x509-store + ghc-x509-validation + ghc-async + ghc-hourglass + ghc-network)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck)) + (home-page "http://github.com/vincenthz/hs-tls") + (synopsis "TLS/SSL protocol native implementation (Server and Client)") (description "Native Haskell TLS and SSL protocol implementation for server and client. This provides a high-level implementation of a sensitive security protocol, @@ -711,23 +692,22 @@ extensions.") (define-public ghc-hsopenssl (package (name "ghc-hsopenssl") - (version "0.11.7.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "HsOpenSSL" version)) - (sha256 - (base32 - "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5")))) + (version "0.11.7.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "HsOpenSSL" version)) + (sha256 + (base32 + "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf")))) (build-system haskell-build-system) (properties '((upstream-name . "HsOpenSSL"))) + (inputs (list ghc-network openssl)) (arguments `(#:extra-directories ("openssl"))) - (inputs - (list ghc-network openssl)) - (home-page "https://github.com/vshabanov/HsOpenSSL") + (home-page "https://github.com/haskell-cryptography/HsOpenSSL") (synopsis "Partial OpenSSL binding for Haskell") - (description "HsOpenSSL is an OpenSSL binding for Haskell. It can + (description + "HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA and DSA keys, read and write PEM files, generate message digests, sign and verify messages, encrypt and decrypt messages. It has also some capabilities of creating SSL clients and servers. This @@ -754,6 +734,9 @@ implementation of SSL.") (list ghc-hsopenssl ghc-io-streams ghc-network)) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) + (arguments + `(#:cabal-revision ("1" + "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp"))) (home-page "https://hackage.haskell.org/package/openssl-streams") (synopsis "OpenSSL network support for io-streams") (description "This library contains io-streams routines for secure diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 3194bcdf05..75b84b10a7 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -167,48 +167,26 @@ both client and server code).") (define-public ghc-http (package (name "ghc-http") - (version "4000.3.16") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "HTTP" version)) - (sha256 - (base32 - "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn")))) + (version "4000.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "HTTP" version)) + (sha256 + (base32 + "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz")))) (build-system haskell-build-system) (properties '((upstream-name . "HTTP"))) - (native-inputs - (list ghc-httpd-shed ghc-hunit ghc-test-framework - ghc-test-framework-hunit)) - (inputs - (list ghc-case-insensitive - ghc-conduit - ghc-conduit-extra - ghc-http-types - ghc-old-time - ghc-puremd5 - ghc-network - ghc-network-uri - ghc-split)) + (inputs (list ghc-network ghc-network-uri)) + (native-inputs (list ghc-httpd-shed + ghc-hunit + ghc-puremd5 + ghc-split + ghc-test-framework + ghc-test-framework-hunit)) (arguments - `(#:tests? #f ; FIXME: currently missing libraries used for tests. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'create-simple-paths-module - (lambda _ - (call-with-output-file "Paths_HTTP.hs" - (lambda (port) - (format port "\ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_HTTP (version) where -import Data.Version (Version(..)) -version :: Version -version = Version [~a] [] -" (string-map (lambda (chr) (if (eq? chr #\.) #\, chr)) ,version)))) - #t))))) + `(#:tests? #f ; Tests fail due to missing /etc/protocols? + #:cabal-revision ("1" + "04y04vbxbnblpmqqmpl8km4bkcjaj96nbxkssdr1zgbhqisxay5q"))) (home-page "https://github.com/haskell/HTTP") (synopsis "Library for client-side HTTP") (description @@ -220,37 +198,35 @@ responses coming back.") (define-public ghc-http-client (package (name "ghc-http-client") - (version "0.7.11") + (version "0.7.13.1") (source (origin (method url-fetch) (uri (hackage-uri "http-client" version)) (sha256 (base32 - "12j7vkpkm2djws6ny7vm2324c7916d0iaf1mbvf4mfjxzy2w7imv")))) + "09qfmakjk285jz2rnb53c1m9c764fg8vngfq43ipga1g72h8d3n9")))) (build-system haskell-build-system) (properties '((upstream-name . "http-client"))) - ;; Tests require access to the web. - (arguments `(#:tests? #f)) - (inputs - (list ghc-async - ghc-base64-bytestring - ghc-blaze-builder - ghc-case-insensitive - ghc-cookie - ghc-data-default-class - ghc-exceptions - ghc-http-types - ghc-iproute - ghc-memory - ghc-mime-types - ghc-monad-control - ghc-network - ghc-network-uri - ghc-random - ghc-streaming-commons - ghc-zlib)) - (native-inputs - (list ghc-hspec)) + (inputs (list ghc-http-types + ghc-blaze-builder + ghc-network + ghc-streaming-commons + ghc-case-insensitive + ghc-base64-bytestring + ghc-cookie + ghc-random + ghc-mime-types + ghc-iproute + ghc-async + ghc-network-uri)) + (native-inputs (list ghc-hspec + ghc-monad-control + ghc-zlib + ghc-hspec + ghc-monad-control + ghc-zlib + hspec-discover)) + (arguments (list #:tests? #f)) ; Tests try to access httpbin.org. (home-page "https://github.com/snoyberg/http-client") (synopsis "HTTP client engine") (description @@ -344,42 +320,44 @@ Date in Haskell.") (define-public ghc-http2 (package (name "ghc-http2") - (version "3.0.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "http2" version)) - (sha256 - (base32 - "13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1")))) + (version "3.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "http2" version)) + (sha256 + (base32 + "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv")))) (build-system haskell-build-system) (properties '((upstream-name . "http2"))) - (inputs - (list ghc-aeson - ghc-aeson-pretty - ghc-base16-bytestring - ghc-case-insensitive - ghc-cryptonite - ghc-http-types - ghc-network-byte-order - ghc-network - ghc-network-run - ghc-psqueues - ghc-time-manager - ghc-unix-time - ghc-unordered-containers - ghc-vector - ghc-word8)) - (native-inputs - (list ghc-async - ghc-doctest - ghc-glob - ghc-hspec - hspec-discover - ghc-typed-process)) + (inputs (list ghc-async + ghc-case-insensitive + ghc-http-types + ghc-network + ghc-network-byte-order + ghc-psqueues + ghc-time-manager + ghc-unix-time + ghc-network-run + ghc-cryptonite + ghc-aeson + ghc-aeson-pretty + ghc-base16-bytestring + ghc-unordered-containers + ghc-vector + ghc-word8)) + (native-inputs (list ghc-doctest + ghc-hspec + ghc-typed-process + ghc-hspec + ghc-typed-process + ghc-hspec + ghc-glob + ghc-hspec + hspec-discover)) (home-page "https://github.com/kazu-yamamoto/http2") (synopsis "HTTP/2 library including frames, priority queues and HPACK") - (description "This package provides a HTTP/2.0 library including frames + (description + "This package provides a HTTP/2.0 library including frames and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (license license:bsd-3))) @@ -444,34 +422,30 @@ which allow you to avoid direct usage of conduits.") (define-public ghc-http-reverse-proxy (package (name "ghc-http-reverse-proxy") - (version "0.6.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "http-reverse-proxy" version)) - (sha256 - (base32 - "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v")))) + (version "0.6.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "http-reverse-proxy" version)) + (sha256 + (base32 + "0a0fc9rqr1crbb1sbq3gzbkwjcfff662d4bgmy3vzspk7ky697ld")))) (build-system haskell-build-system) (properties '((upstream-name . "http-reverse-proxy"))) - (inputs - (list ghc-case-insensitive - ghc-http-types - ghc-word8 - ghc-blaze-builder - ghc-http-client - ghc-wai - ghc-network - ghc-conduit - ghc-conduit-extra - ghc-wai-logger - ghc-resourcet - ghc-unliftio - ghc-streaming-commons)) - (native-inputs - (list ghc-hspec ghc-warp ghc-http-conduit)) - (home-page - "https://github.com/fpco/http-reverse-proxy") + (inputs (list ghc-case-insensitive + ghc-http-types + ghc-word8 + ghc-blaze-builder + ghc-http-client + ghc-wai + ghc-network + ghc-conduit + ghc-conduit-extra + ghc-wai-logger + ghc-resourcet + ghc-unliftio + ghc-streaming-commons)) + (native-inputs (list ghc-hspec ghc-warp ghc-http-conduit)) + (home-page "https://github.com/fpco/http-reverse-proxy") (synopsis "Reverse proxy HTTP requests, either over raw sockets or with WAI") (description @@ -512,14 +486,14 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.3.6") + (version "2.4.0") (source (origin (method url-fetch) (uri (hackage-uri "wai-logger" version)) (sha256 (base32 - "0hbm7if28p6qa36cgpyq6i569275si53z9gsl2g1z8x09z3xiyz2")))) + "02i9jsy5gdglqwwk5gcvax8y498lz9flrfp4v9nrv8rmrmd66zh5")))) (build-system haskell-build-system) (properties '((upstream-name . "wai-logger"))) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported @@ -543,38 +517,39 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.1.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "wai-extra" version)) - (sha256 - (base32 - "1avf7bjcsbs8l6klp5kkd0cd2dc5n0j0a2yf8813pnwfn5b7qyd4")))) + (version "3.1.13.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "wai-extra" version)) + (sha256 + (base32 + "1h4cqd5akrq0vhv3l0fzryy7qw0c2jb58lngx7x8ij63bckjs3fz")))) (build-system haskell-build-system) (properties '((upstream-name . "wai-extra"))) - (inputs - (list ghc-ansi-terminal - ghc-base64-bytestring - ghc-call-stack - ghc-cookie - ghc-network - ghc-streaming-commons - ghc-resourcet - ghc-fast-logger - ghc-wai-logger - ghc-word8 - ghc-iproute - ghc-wai - ghc-http-types - ghc-http2 - ghc-case-insensitive - ghc-data-default-class - ghc-vault - ghc-aeson)) - (native-inputs - (list hspec-discover ghc-hspec ghc-hunit ghc-zlib)) - (home-page "https://github.com/yesodweb/wai") + (inputs (list ghc-aeson + ghc-ansi-terminal + ghc-base64-bytestring + ghc-call-stack + ghc-case-insensitive + ghc-cookie + ghc-data-default-class + ghc-fast-logger + ghc-http-types + ghc-hunit + ghc-iproute + ghc-network + ghc-resourcet + ghc-streaming-commons + ghc-vault + ghc-wai + ghc-wai-logger + ghc-warp + ghc-word8)) + (native-inputs (list ghc-hspec ghc-temporary ghc-zlib hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0dyvg2bb37im790757khncxpnf45451dd8575p736ry4g8rpqgpw"))) + (home-page "http://github.com/yesodweb/wai") (synopsis "Some basic WAI handlers and middleware") (description "This library provides basic WAI handlers and middleware functionality.") @@ -615,11 +590,7 @@ Haskell's Web Application Interface (WAI).") (build-system haskell-build-system) (properties '((upstream-name . "bsb-http-chunked"))) (arguments - `(;; XXX: As of 0.0.4, one property test ("Identical output as Blaze") - ;; fails on i686-linux. - #:tests? ,(and (not (%current-target-system)) - (not (string-prefix? "i686" (or (%current-target-system) - (%current-system))))) + `(#:tests? #f ; Tests fail: Variable not in scope. #:cabal-revision ("3" "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd"))) (native-inputs @@ -640,13 +611,13 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.3.17") + (version "3.3.23") (source (origin (method url-fetch) (uri (hackage-uri "warp" version)) (sha256 - (base32 "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0")))) + (base32 "0y1r7czq5zrgklqrx1b9pmxn5lhmf7zpqdjz7hfmnzsmr3vndmms")))) (build-system haskell-build-system) (properties '((upstream-name . "warp"))) (inputs @@ -668,7 +639,8 @@ transfers.") ghc-simple-sendfile ghc-unliftio ghc-x509 - ghc-http2)) + ghc-http2 + ghc-recv)) (native-inputs (list curl ghc-silently @@ -709,27 +681,25 @@ limitation, automatic pruning, energy saving and replay resistance.") (define-public ghc-warp-tls (package (name "ghc-warp-tls") - (version "3.3.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "warp-tls" version)) - (sha256 - (base32 - "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m")))) + (version "3.3.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "warp-tls" version)) + (sha256 + (base32 + "00vgs9v7k0fapl05knqii9g47svf4lapb7ixkll7xr4zvmkk0r0m")))) (build-system haskell-build-system) (properties '((upstream-name . "warp-tls"))) - (inputs - (list ghc-cryptonite - ghc-data-default-class - ghc-network - ghc-streaming-commons - ghc-tls - ghc-tls-session-manager - ghc-unliftio - ghc-wai - ghc-warp)) - (home-page "https://github.com/yesodweb/wai") + (inputs (list ghc-wai + ghc-warp + ghc-data-default-class + ghc-tls + ghc-cryptonite + ghc-network + ghc-streaming-commons + ghc-tls-session-manager + ghc-unliftio)) + (home-page "http://github.com/yesodweb/wai") (synopsis "SSL/TLS support for Warp") (description "This package provides SSL/TLS support for Warp, a WAI handler, via the native Haskell TLS implementation.") @@ -738,34 +708,34 @@ a WAI handler, via the native Haskell TLS implementation.") (define-public ghc-websockets (package (name "ghc-websockets") - (version "0.12.7.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "websockets" version)) - (sha256 - (base32 - "1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44")))) + (version "0.12.7.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "websockets" version)) + (sha256 + (base32 + "0g3z0n4irf3gvbdf9p97jq05ybdg0gwjy5bj4nfc7ivsvyhaic6k")))) (build-system haskell-build-system) (properties '((upstream-name . "websockets"))) - (inputs - (list ghc-attoparsec - ghc-base64-bytestring - ghc-bytestring-builder - ghc-case-insensitive - ghc-network - ghc-random - ghc-sha - ghc-clock - ghc-async - ghc-streaming-commons - ghc-entropy)) - (native-inputs - (list ghc-hunit ghc-quickcheck ghc-test-framework - ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "https://jaspervdj.be/websockets/") - (synopsis - "Write WebSocket-capable servers in Haskell") + (inputs (list ghc-async + ghc-attoparsec + ghc-base64-bytestring + ghc-bytestring-builder + ghc-case-insensitive + ghc-clock + ghc-network + ghc-random + ghc-sha + ghc-streaming-commons + ghc-entropy)) + (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (arguments + `(#:cabal-revision ("1" + "1yx97y6jl74vy200y43vjxfyzx338kh10dx8vxkjhr0mfh36wldq"))) + (home-page "http://jaspervdj.be/websockets") + (synopsis "Write WebSocket-capable servers in Haskell") (description "This library allows you to write WebSocket-capable servers. @@ -811,26 +781,25 @@ See also: (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "xss-sanitize" version)) - (sha256 - (base32 - "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) + (version "0.3.7.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "xss-sanitize" version)) + (sha256 + (base32 + "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h")))) (build-system haskell-build-system) (properties '((upstream-name . "xss-sanitize"))) - (inputs - (list ghc-tagsoup ghc-utf8-string ghc-css-text ghc-network-uri)) - (native-inputs - (list ghc-attoparsec ghc-hspec ghc-hunit)) - (home-page "https://github.com/yesodweb/haskell-xss-sanitize") + (inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup + ghc-utf8-string)) + (native-inputs (list ghc-hunit ghc-hspec)) + (home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme") (synopsis "Sanitize untrusted HTML to prevent XSS attacks") - (description "This library provides @code{sanitizeXSS}. Run untrusted + (description + "This library provides @code{sanitizeXSS}. Run untrusted HTML through @code{Text.HTML.SanitizeXSS.sanitizeXSS} to prevent XSS attacks.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-css-text (package @@ -955,54 +924,54 @@ entity decoding bugfixes applied.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "1.5.6.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "aeson" version)) - (sha256 - (base32 - "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83")))) + (version "2.0.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "aeson" version)) + (sha256 + (base32 + "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")))) (build-system haskell-build-system) (properties '((upstream-name . "aeson"))) + (inputs (list ghc-base-compat-batteries + ghc-time-compat + ghc-attoparsec + ghc-data-fix + ghc-dlist + ghc-hashable + ghc-indexed-traversable + ghc-onetuple + ghc-primitive + ghc-quickcheck + ghc-scientific + ghc-semialign + ghc-strict + ghc-tagged + ghc-text-short + ghc-th-abstraction + ghc-these + ghc-unordered-containers + ghc-uuid-types + ghc-vector + ghc-witherable)) + (native-inputs (list ghc-base-compat + ghc-base-orphans + ghc-base16-bytestring + ghc-diff + ghc-generic-deriving + ghc-integer-logarithms + ghc-quickcheck-instances + ghc-tasty + ghc-tasty-golden + ghc-tasty-hunit + ghc-tasty-quickcheck)) (arguments - `(#:tests? #f ; FIXME: testing libraries are missing. - #:cabal-revision - ("2" "1zxkarvmbgc2cpcc9sx1rlqm7nfh473052898ypiwk8azawp1hbj"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-attoparsec - ghc-base-compat-batteries - ghc-data-fix - ghc-dlist - ghc-hashable - ghc-primitive - ghc-scientific - ghc-strict - ghc-tagged - ghc-th-abstraction - ghc-these - ghc-time-compat - ghc-unordered-containers - ghc-uuid-types - ghc-vector)) -; (native-inputs -; `(("ghc-base16-bytestring" ,ghc-base16-bytestring) -; ("ghc-base-compat" ,ghc-base-compat) -; ("ghc-base-orphans" ,ghc-base-orphans) -; ("ghc-diff" ,ghc-diff) -; ("ghc-generic-deriving" ,ghc-generic-deriving) -; ("ghc-hashable-time" ,ghc-hashable-time) -; ("ghc-integer-logarithms" ,ghc-integer-logarithms) -; ("ghc-quickcheck" ,ghc-quickcheck) -; ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) -; ("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-golden" ,ghc-tasty-golden) -; ("ghc-tasty-hunit" ,ghc-tasty-hunit) -; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/bos/aeson") + `(#:cabal-revision ("1" + "1zrgn63jzrpk3n3vd44zkzgw7kb5qxlvhx4nk6g3sswwrsz5j32i"))) + (home-page "https://github.com/haskell/aeson") (synopsis "Fast JSON parsing and encoding") - (description "This package provides a JSON parsing and encoding library + (description + "This package provides a JSON parsing and encoding library for Haskell, optimized for ease of use and high performance. (A note on naming: in Greek mythology, Aeson was the father of Jason.)") (license license:bsd-3))) @@ -1071,28 +1040,27 @@ of a JSON value into a @code{Data.Aeson.Value}.") (define-public ghc-aeson-better-errors (package (name "ghc-aeson-better-errors") - (version "0.9.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "aeson-better-errors" version)) - (sha256 - (base32 - "09vkyrhwak3bmpfsqcd2az8hfqqkxyhg468hv5avgisy0nzh3w38")))) + (version "0.9.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "aeson-better-errors" version)) + (sha256 + (base32 + "05yibq9kqbjb8rh84n12sbax05amvd8jccpja0hyadz58pjy4jnk")))) (build-system haskell-build-system) (properties '((upstream-name . "aeson-better-errors"))) - (inputs - (list ghc-aeson - ghc-unordered-containers - ghc-dlist - ghc-scientific - ghc-vector - ghc-transformers-compat - ghc-void)) - (home-page - "https://github.com/hdgarrood/aeson-better-errors") - (synopsis - "Better error messages when decoding JSON values in Haskell") + (inputs (list ghc-aeson + ghc-unordered-containers + ghc-dlist + ghc-scientific + ghc-vector + ghc-transformers-compat + ghc-void)) + (arguments + `(#:cabal-revision ("1" + "0wzvrmhn5q2x1mcv43cyxhlck815ldkhx7c7gz5ijjyva1iicgn2"))) + (home-page "https://github.com/hdgarrood/aeson-better-errors") + (synopsis "Better error messages when decoding JSON values in Haskell") (description "Gives you the tools to build parsers to decode JSON values, and gives good error messages when parsing fails. See also @@ -1114,6 +1082,9 @@ good error messages when parsing fails. See also (properties '((upstream-name . "multipart"))) (inputs (list ghc-stringsearch)) + (arguments + `(#:cabal-revision ("1" + "03gaapwnvn843hpm5qwdci9df1wf383msd42p8w9ghilpfjj4qy9"))) (home-page "http://www.github.com/silkapp/multipart") (synopsis @@ -1137,6 +1108,9 @@ good error messages when parsing fails. See also (properties '((upstream-name . "uri-encode"))) (inputs (list ghc-utf8-string ghc-network-uri)) + (arguments + `(#:cabal-revision ("2" + "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"))) (home-page "https://hackage.haskell.org/package/uri-encode") (synopsis "Unicode aware uri-encoding") (description "Unicode aware uri-encoding for Haskell.") @@ -1222,67 +1196,58 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.6.21.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "yesod-core" version)) - (sha256 - (base32 - "0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7")))) + (version "1.6.24.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "yesod-core" version)) + (sha256 + (base32 + "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-core"))) - (inputs (list ghc-wai - ghc-extra - ghc-shakespeare - ghc-blaze-builder + (inputs (list ghc-aeson + ghc-auto-update + ghc-blaze-html + ghc-blaze-markup + ghc-case-insensitive + ghc-cereal ghc-clientsession + ghc-conduit + ghc-conduit-extra + ghc-cookie + ghc-entropy + ghc-fast-logger + ghc-http-types + ghc-memory + ghc-monad-logger + ghc-path-pieces + ghc-primitive ghc-random - ghc-cereal - ghc-old-locale + ghc-resourcet + ghc-shakespeare + ghc-unix-compat ghc-unliftio ghc-unordered-containers - ghc-monad-control - ghc-transformers-base - ghc-cookie - ghc-http-types - ghc-case-insensitive ghc-vector - ghc-aeson - ghc-fast-logger + ghc-wai + ghc-wai-extra ghc-wai-logger - ghc-monad-logger - ghc-conduit - ghc-resourcet - ghc-rio - ghc-lifted-base - ghc-blaze-html - ghc-blaze-markup - ghc-data-default - ghc-safe ghc-warp - ghc-unix-compat - ghc-conduit-extra - ghc-exceptions - ghc-deepseq-generics - ghc-mwc-random - ghc-primitive - ghc-word8 - ghc-auto-update - ghc-semigroups - ghc-byteable)) + ghc-word8)) (native-inputs (list ghc-hspec - ghc-path-pieces ghc-hunit + ghc-async + ghc-hspec ghc-hspec-expectations - ghc-quickcheck ghc-network - ghc-async - ghc-streaming-commons - ghc-wai-extra)) - (home-page "https://www.yesodweb.com") + ghc-streaming-commons)) + (arguments + `(#:cabal-revision ("1" + "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl"))) + (home-page "http://www.yesodweb.com/") (synopsis "Core package for the Yesod web framework") - (description "This Haskell package provides all core functionality, for + (description + "This Haskell package provides all core functionality, for Yesod, on which other packages can be built. It provides dispatch, handler functions, widgets, etc.") (license license:expat))) @@ -1290,17 +1255,15 @@ functions, widgets, etc.") (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.6.0.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "yesod-persistent" version)) - (sha256 - (base32 - "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4")))) + (version "1.6.0.8") + (source (origin + (method url-fetch) + (uri (hackage-uri "yesod-persistent" version)) + (sha256 + (base32 + "02vm0qm0yxqn6x61iir81wf6ibwnf8gkia8lw71fgpxgav154ig6")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-persistent"))) - (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs (list ghc-yesod-core ghc-persistent ghc-persistent-template @@ -1308,9 +1271,9 @@ functions, widgets, etc.") ghc-conduit ghc-resourcet ghc-resource-pool)) - (native-inputs (list ghc-hspec ghc-wai-extra ghc-yesod-core - ghc-persistent-sqlite)) - (home-page "https://www.yesodweb.com/") + (native-inputs (list ghc-hspec ghc-wai-extra ghc-persistent-sqlite + hspec-discover)) + (home-page "http://www.yesodweb.com/") (synopsis "Helpers for using Persistent from Yesod") (description "This Haskell package provides helpers for using Persistent from Yesod.") @@ -1318,78 +1281,75 @@ from Yesod.") (define-public ghc-yesod-form (package - (name "ghc-yesod-form") - (version "1.7.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "yesod-form" version)) - (sha256 - (base32 - "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi")))) - (build-system haskell-build-system) - (properties '((upstream-name . "yesod-form"))) - (inputs - (list ghc-yesod-core - ghc-yesod-persistent - ghc-shakespeare - ghc-persistent - ghc-data-default - ghc-xss-sanitize - ghc-blaze-builder - ghc-email-validate - ghc-wai - ghc-blaze-html - ghc-blaze-markup - ghc-attoparsec - ghc-byteable - ghc-aeson - ghc-resourcet - ghc-semigroups - ghc-network-uri - ghc-hspec)) - (home-page "https://www.yesodweb.com") - (synopsis "Form handling support for Yesod Web Framework") - (description "This Haskell package provides a set of basic form inputs such + (name "ghc-yesod-form") + (version "1.7.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "yesod-form" version)) + (sha256 + (base32 + "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww")))) + (build-system haskell-build-system) + (properties '((upstream-name . "yesod-form"))) + (inputs (list ghc-aeson + ghc-attoparsec + ghc-blaze-builder + ghc-blaze-html + ghc-blaze-markup + ghc-byteable + ghc-data-default + ghc-email-validate + ghc-persistent + ghc-resourcet + ghc-shakespeare + ghc-wai + ghc-xss-sanitize + ghc-yesod-core + ghc-yesod-persistent + ghc-network-uri)) + (native-inputs (list ghc-hspec)) + (home-page "http://www.yesodweb.com/") + (synopsis "Form handling support for Yesod Web Framework") + (description + "This Haskell package provides a set of basic form inputs such as text, number, time, checkbox, select, textarea, etc through the @code{Yesod.Form.Fields} module. Also, there is @code{Yesod.Form.Nic} module providing richtext field using Nic editor.") - (license license:expat))) + (license license:expat))) (define-public ghc-yesod (package (name "ghc-yesod") - (version "1.6.1.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "yesod" version)) - (sha256 - (base32 - "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f")))) + (version "1.6.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "yesod" version)) + (sha256 + (base32 + "1qglaxqx96c7wi4817ff67c9g2fxlnjzdpgic458i80khpdlmb5c")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod"))) - (inputs - (list ghc-yesod-core - ghc-yesod-persistent - ghc-yesod-form - ghc-wai - ghc-wai-extra - ghc-warp - ghc-aeson - ghc-file-embed - ghc-data-default-class - ghc-unordered-containers - ghc-yaml - ghc-monad-logger - ghc-fast-logger - ghc-conduit - ghc-shakespeare - ghc-streaming-commons - ghc-wai-logger)) - (home-page "https://www.yesodweb.com") + (inputs (list ghc-aeson + ghc-conduit + ghc-data-default-class + ghc-fast-logger + ghc-file-embed + ghc-monad-logger + ghc-shakespeare + ghc-streaming-commons + ghc-unordered-containers + ghc-wai + ghc-wai-extra + ghc-wai-logger + ghc-warp + ghc-yaml + ghc-yesod-core + ghc-yesod-form + ghc-yesod-persistent)) + (home-page "http://www.yesodweb.com/") (synopsis "Framework for creating type-safe, RESTful web applications") - (description "The Haskell package package groups together the various + (description + "The Haskell package package groups together the various Yesod related packages into one cohesive whole. This is the version of Yesod, whereas most of the core code lives in @code{ghc-yesod-core}.") (license license:expat))) @@ -1541,56 +1501,69 @@ pipes-http re-export this package's types and functions.") (define-public ghc-http-streams (package (name "ghc-http-streams") - (version "0.8.9.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "http-streams" version)) - (sha256 - (base32 - "03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa")))) + (version "0.8.9.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "http-streams" version)) + (sha256 + (base32 + "1h8nnp1y4ngv6mwr3fxv428kcvrd3ming179sza8fkn49pcwdlxs")))) (build-system haskell-build-system) (properties '((upstream-name . "http-streams"))) - (inputs - (list ghc-attoparsec - ghc-base64-bytestring - ghc-blaze-builder - ghc-case-insensitive - ghc-io-streams - ghc-hsopenssl - ghc-openssl-streams - ghc-unordered-containers - ghc-aeson - ghc-http-common - ghc-network-uri - ghc-network)) - (arguments - `(#:tests? #f)) ; tests rely on an outdated version of snap-server - (home-page "https://github.com/afcowie/http-streams/") + (inputs (list ghc-attoparsec + ghc-base64-bytestring + ghc-blaze-builder + ghc-case-insensitive + ghc-io-streams + ghc-hsopenssl + ghc-openssl-streams + ghc-unordered-containers + ghc-aeson + ghc-http-common + ghc-network-uri + ghc-network)) + (native-inputs (list ghc-hunit + ghc-lifted-base + ghc-aeson-pretty + ghc-hspec + ghc-hspec-expectations + ghc-random + ghc-snap-core + ghc-snap-server)) + (home-page "https://github.com/aesiniath/http-streams/") (synopsis "HTTP client using io-streams") - (description "An HTTP client using the Snap Framework's io-streams + (description + "An HTTP client using the Snap Framework's io-streams library to handle the streaming IO. The API is optimized for ease of use for the rather common case of code needing to query web services and deal with the result.") (license license:bsd-3))) +;; Breaks cycle between ghc-http-streams and ghc-snap-server +(define-public ghc-http-streams-bootstrap + (package + (inherit ghc-http-streams) + (name "ghc-http-streams-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-snap-core (package (name "ghc-snap-core") - (version "1.0.4.2") + (version "1.0.5.0") (source (origin (method url-fetch) (uri (hackage-uri "snap-core" version)) (sha256 (base32 - "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs")))) + "0hf671g7h4nikfvi05q3mmcxhfcsh874dkansssn0mc68k9fsak4")))) (build-system haskell-build-system) (properties '((upstream-name . "snap-core"))) (arguments - `(#:tests? #f ; TODO: Fail to compile. - #:cabal-revision - ("1" "065v61clskzikywv0gy9n4fjaszi2fnjklal83kqbzhzzgkf83ng"))) + `(#:cabal-revision + ("3" "02r6plphl4vqig3xap9amdib0qjd98nqpn5jhy6hsbiwh3p7cy9b"))) (inputs (list ghc-old-locale ghc-hunit @@ -1659,12 +1632,20 @@ contains the core definitions and types for the Snap framework.") ghc-threads ghc-hunit ghc-quickcheck - ghc-http-streams + ghc-http-streams-bootstrap ghc-http-common ghc-parallel ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "snap-server.cabal" + (("\\b(attoparsec|base|bytestring|time)\\s+[^,]+" all dep) + dep))))))) (home-page "http://snapframework.com/") (synopsis "Web server for the Snap Framework") (description "Snap is a simple and fast web development framework @@ -1730,37 +1711,33 @@ requirements of downstream users (e.g. Debian).") (define-public ghc-happstack-server (package (name "ghc-happstack-server") - (version "7.7.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "happstack-server" version)) - (sha256 - (base32 - "0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n")))) + (version "7.7.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "happstack-server" version)) + (sha256 + (base32 + "175aal1l4g558y89skck3s04db0bjblkxp77bijf1s9iyc07n669")))) (build-system haskell-build-system) (properties '((upstream-name . "happstack-server"))) - (inputs - (list ghc-network - ghc-network-bsd - ghc-network-uri - ghc-base64-bytestring - ghc-blaze-html - ghc-exceptions - ghc-extensible-exceptions - ghc-hslogger - ghc-html - ghc-monad-control - ghc-old-locale - ghc-semigroups - ghc-sendfile - ghc-system-filepath - ghc-syb - ghc-threads - ghc-transformers-base - ghc-transformers-compat - ghc-utf8-string - ghc-zlib)) + (inputs (list ghc-network + ghc-network-uri + ghc-base64-bytestring + ghc-blaze-html + ghc-extensible-exceptions + ghc-hslogger + ghc-html + ghc-monad-control + ghc-old-locale + ghc-semigroups + ghc-sendfile + ghc-system-filepath + ghc-syb + ghc-threads + ghc-transformers-base + ghc-transformers-compat + ghc-utf8-string + ghc-zlib)) (native-inputs (list ghc-hunit)) (home-page "https://happstack.com") (synopsis "Web related tools and services for Haskell") @@ -1773,19 +1750,17 @@ cookies, serving files, and more.") (define-public ghc-sendfile (package (name "ghc-sendfile") - (version "0.7.11.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sendfile" version)) - (sha256 - (base32 - "0988snmx3bylpw3kcq8hsgji8idc6xcrcfp275qjv3apfdgc9rp0")))) + (version "0.7.11.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "sendfile" version)) + (sha256 + (base32 + "1i2i0w18l2ysambyylv93jzy0adiiqwwnhg7zagqb7p2srybxc3k")))) (build-system haskell-build-system) (properties '((upstream-name . "sendfile"))) (inputs (list ghc-network)) - (home-page - "https://hub.darcs.net/stepcut/sendfile") + (home-page "https://github.com/Happstack/sendfile") (synopsis "Portable sendfile library for Haskell") (description "Haskell library which exposes zero-copy sendfile functionality in a portable way.") @@ -1794,28 +1769,25 @@ cookies, serving files, and more.") (define-public ghc-scalpel-core (package (name "ghc-scalpel-core") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "scalpel-core" version)) - (sha256 - (base32 - "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf")))) + (version "0.6.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "scalpel-core" version)) + (sha256 + (base32 + "1yl1lsi5xm3qdlww2sb6vyppjiisj54f4yzvffv3qg8dgkfjfdra")))) (build-system haskell-build-system) (properties '((upstream-name . "scalpel-core"))) - (inputs - (list ghc-data-default - ghc-fail - ghc-pointedlist - ghc-regex-base - ghc-regex-tdfa - ghc-tagsoup - ghc-vector)) + (inputs (list ghc-data-default + ghc-fail + ghc-pointedlist + ghc-regex-base + ghc-regex-tdfa + ghc-tagsoup + ghc-vector)) (native-inputs (list ghc-hunit)) (home-page "https://github.com/fimad/scalpel") - (synopsis - "High level web scraping library for Haskell") + (synopsis "High level web scraping library for Haskell") (description "Scalpel core provides a subset of the scalpel web scraping library that is intended to have lightweight dependencies and to be free of all @@ -1825,26 +1797,23 @@ non-Haskell dependencies.") (define-public ghc-scalpel (package (name "ghc-scalpel") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "scalpel" version)) - (sha256 - (base32 - "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch")))) + (version "0.6.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "scalpel" version)) + (sha256 + (base32 + "0w3l38czfsgbyd3x6yir7qw9bl8nmhclrbpbwfyhs39728jlscnc")))) (build-system haskell-build-system) (properties '((upstream-name . "scalpel"))) - (inputs - (list ghc-scalpel-core - ghc-case-insensitive - ghc-data-default - ghc-http-client - ghc-http-client-tls - ghc-tagsoup)) + (inputs (list ghc-scalpel-core + ghc-case-insensitive + ghc-data-default + ghc-http-client + ghc-http-client-tls + ghc-tagsoup)) (home-page "https://github.com/fimad/scalpel") - (synopsis - "High level web scraping library for Haskell") + (synopsis "High level web scraping library for Haskell") (description "Scalpel is a web scraping library inspired by libraries like Parsec and Perl's @code{Web::Scraper}. Scalpel builds on top of TagSoup to provide a @@ -1854,23 +1823,19 @@ declarative and monadic interface.") (define-public ghc-sourcemap (package (name "ghc-sourcemap") - (version "0.1.6.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sourcemap" version)) - (sha256 - (base32 - "0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a")))) + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "sourcemap" version)) + (sha256 + (base32 + "09i340mhzlfi5ayy9cb0378glnygdmpdhhsgikm3zrvwf2wmwr2h")))) (build-system haskell-build-system) (properties '((upstream-name . "sourcemap"))) - (inputs - (list ghc-aeson ghc-unordered-containers ghc-attoparsec - ghc-utf8-string)) - (arguments - `(#:tests? #f ; FIXME: Fail to compile - #:cabal-revision - ("1" "1f7q44ar6qfip8fsllg43jyn7r15ifn2r0vz32cbmx0sb0d38dax"))) + (inputs (list ghc-aeson ghc-unordered-containers ghc-attoparsec + ghc-utf8-string)) + ;(native-inputs (list node)) + (arguments (list #:tests? #f)) ; Needs node and module source-map. (home-page "https://hackage.haskell.org/package/sourcemap") (synopsis @@ -1909,14 +1874,14 @@ as frontend to hjsmin.") (define-public ghc-bower-json (package (name "ghc-bower-json") - (version "1.0.0.1") + (version "1.1.0.0") (source (origin (method url-fetch) (uri (hackage-uri "bower-json" version)) (sha256 (base32 - "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs")))) + "0lnhcgivg38nicncb6czkkk3z2mk3jbifv1b4r51lk3p9blzydfl")))) (build-system haskell-build-system) (properties '((upstream-name . "bower-json"))) (inputs @@ -1969,42 +1934,41 @@ Authoring and Versioning (WebDAV) extensions to HTTP as well an executable, (define-public ghc-yesod-test (package (name "ghc-yesod-test") - (version "1.6.12") - (source - (origin - (method url-fetch) - (uri (hackage-uri "yesod-test" version)) - (sha256 - (base32 - "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8")))) + (version "1.6.15") + (source (origin + (method url-fetch) + (uri (hackage-uri "yesod-test" version)) + (sha256 + (base32 + "16q4f1l3m4l8iy5vmaa8c0vm2iiqhpghf3kykymlh41xy96mqpn3")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-test"))) - (inputs - (list ghc-hunit - ghc-aeson - ghc-attoparsec - ghc-blaze-builder - ghc-blaze-html - ghc-case-insensitive - ghc-conduit - ghc-cookie - ghc-hspec-core - ghc-html-conduit - ghc-http-types - ghc-network - ghc-memory - ghc-pretty-show - ghc-semigroups - ghc-wai - ghc-wai-extra - ghc-xml-conduit - ghc-xml-types - ghc-yesod-core)) - (native-inputs - (list ghc-hspec ghc-yesod-form ghc-unliftio ghc-unliftio-core)) - (home-page "https://www.yesodweb.com") + (inputs (list ghc-hunit + ghc-aeson + ghc-attoparsec + ghc-blaze-builder + ghc-blaze-html + ghc-case-insensitive + ghc-conduit + ghc-cookie + ghc-hspec-core + ghc-html-conduit + ghc-http-types + ghc-network + ghc-memory + ghc-pretty-show + ghc-wai + ghc-wai-extra + ghc-xml-conduit + ghc-xml-types + ghc-yesod-core + ghc-blaze-markup)) + (native-inputs (list ghc-hspec ghc-yesod-form ghc-unliftio + ghc-unliftio-core)) + (home-page "http://www.yesodweb.com") (synopsis "Integration testing for WAI/Yesod Applications") - (description "This package's main goal is to encourage integration + (description + "This package's main goal is to encourage integration and system testing of web applications by making everything easy to test. Tests are like browser sessions that keep track of cookies and the last visited page. You can perform assertions on the content of @@ -2014,41 +1978,36 @@ HTML responses using CSS selectors.") (define-public ghc-wai-app-static (package (name "ghc-wai-app-static") - (version "3.1.7.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "wai-app-static" version)) - (sha256 - (base32 - "138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8")))) + (version "3.1.7.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "wai-app-static" version)) + (sha256 + (base32 + "1h8zy3dprqjxvlqxrids65yg5qf1h4f63ddspwxrbp0r9d28hwb4")))) (build-system haskell-build-system) (properties '((upstream-name . "wai-app-static"))) - (inputs - (list ghc-wai - ghc-http-types - ghc-unix-compat - ghc-old-locale - ghc-file-embed - ghc-cryptonite - ghc-memory - ghc-http-date - ghc-blaze-html - ghc-blaze-markup - ghc-mime-types - ghc-unordered-containers - ghc-zlib - ghc-wai-extra - ghc-optparse-applicative - ghc-warp)) - (native-inputs - (list ghc-hspec ghc-network ghc-temporary ghc-mockery)) - (arguments - `(#:cabal-revision - ("1" "1q7zwjasysgbp9rdp75535igd7s6mhi2bnl4pzsn6vbyfw3qnsxd"))) - (home-page "https://www.yesodweb.com/book/web-application-interface") + (inputs (list ghc-wai + ghc-http-types + ghc-unix-compat + ghc-old-locale + ghc-file-embed + ghc-http-date + ghc-blaze-html + ghc-blaze-markup + ghc-mime-types + ghc-unordered-containers + ghc-zlib + ghc-wai-extra + ghc-optparse-applicative + ghc-warp + ghc-cryptonite + ghc-memory)) + (native-inputs (list ghc-hspec ghc-network ghc-temporary ghc-mockery)) + (home-page "http://www.yesodweb.com/book/web-application-interface") (synopsis "WAI application for static serving") - (description "This package provides a Web Application + (description + "This package provides a Web Application Interface (WAI) application for static serving. It also provides some helper functions and datatypes for use outside of WAI.") (license license:expat))) @@ -2067,7 +2026,9 @@ helper functions and datatypes for use outside of WAI.") (build-system haskell-build-system) (properties '((upstream-name . "hjsmin"))) (arguments - `(#:phases + `(#:cabal-revision ("2" + "184g49wsj2sfm8d75kgr7ylfw29gbyrqbqp4syyz30ch047jd0af") + #:phases (modify-phases %standard-phases (add-before 'build 'fix-dist-directory-for-tests (lambda _ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index aa8be12a88..69ff954ce4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell) @@ -73,6 +74,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system haskell) @@ -145,24 +147,25 @@ module for more details.") (define-public ghc-active (package (name "ghc-active") - (version "0.2.0.15") - (source - (origin - (method url-fetch) - (uri (hackage-uri "active" version)) - (sha256 - (base32 - "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74")))) + (version "0.2.0.16") + (source (origin + (method url-fetch) + (uri (hackage-uri "active" version)) + (sha256 + (base32 + "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i")))) (build-system haskell-build-system) (properties '((upstream-name . "active"))) - (inputs - (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens - ghc-linear)) - (native-inputs - (list ghc-quickcheck)) - (home-page "https://hackage.haskell.org/package/active") + (inputs (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens + ghc-linear)) + (native-inputs (list ghc-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8"))) + (home-page "http://hackage.haskell.org/package/active") (synopsis "Abstractions for animation") - (description "This package defines an @code{Active} abstraction for + (description + "This package defines an @code{Active} abstraction for time-varying values with finite start and end times. It is used for describing animations within the @url{https://archives.haskell.org/projects.haskell.org/diagrams/, @@ -172,38 +175,33 @@ diagrams framework}.") (define-public ghc-adjunctions (package (name "ghc-adjunctions") - (version "4.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "adjunctions" version)) - (sha256 - (base32 - "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) + (version "4.4.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "adjunctions" version)) + (sha256 + (base32 + "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql")))) (build-system haskell-build-system) (properties '((upstream-name . "adjunctions"))) - (arguments - `(#:cabal-revision - ("2" "1yfsjx7dqikg3hvld7i91xfsg5lawmr5980lvfd794sybmgxsf17"))) - (inputs - (list ghc-profunctors - ghc-comonad - ghc-contravariant - ghc-distributive - ghc-free - ghc-tagged - ghc-semigroupoids - ghc-semigroups - ghc-transformers-compat - ghc-void)) - (native-inputs - (list ghc-generic-deriving ghc-hspec hspec-discover)) - (home-page "https://github.com/ekmett/adjunctions/") + (inputs (list ghc-comonad + ghc-contravariant + ghc-distributive + ghc-free + ghc-profunctors + ghc-tagged + ghc-semigroupoids + ghc-semigroups + ghc-transformers-compat + ghc-void)) + (native-inputs (list ghc-generic-deriving ghc-hspec hspec-discover)) + (home-page "http://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors for Haskell.") (license license:bsd-3))) +;; Deprecated package. (define-public ghc-aeson-compat (package (name "ghc-aeson-compat") @@ -234,6 +232,9 @@ for Haskell.") ghc-quickcheck ghc-quickcheck-instances ghc-base-orphans)) + (arguments + `(#:cabal-revision ("4" + "001w7pck3q5k4cnx53npllil5cblkg1ssqza4s9v347dfih3zmss"))) (home-page "https://github.com/phadej/aeson-compat") (synopsis "Compatibility layer for ghc-aeson") (description "This Haskell package provides compatibility layer for @@ -243,14 +244,14 @@ ghc-aeson.") (define-public ghc-aeson-diff (package (name "ghc-aeson-diff") - (version "1.1.0.9") + (version "1.1.0.13") (source (origin (method url-fetch) (uri (hackage-uri "aeson-diff" version)) (sha256 (base32 - "18bm4qyjjwgrr6dxc4y0vai0z6qgrh2lcqb4jrr4xqs4cxrlwr92")))) + "0sd13q0nj0k1sam5xfj6dcjcki18f375sa69hm6i4xc6snfhn3cb")))) (build-system haskell-build-system) (properties '((upstream-name . "aeson-diff"))) (inputs @@ -271,7 +272,20 @@ ghc-aeson.") ghc-quickcheck ghc-doctest hlint)) - (home-page "https://github.com/thsutton/aeson-diff") + (arguments + `(#:cabal-revision ("1" + "1028adallw7bm72948lj322bb5a99gfs0qc1j0pnm8hryp6n7ma5") + #:tests? #f ; Needs doctest Setup.hs + #:phases + (modify-phases %standard-phases + ;; Tries to use non-existent doctest API. + (add-after 'unpack 'disable-doctest + (lambda _ + (with-output-to-file "Setup.hs" + (lambda _ + (display + "import Distribution.Simple\nmain = defaultMain\n")))))))) + (home-page "https://github.com/thsutton/aeson-diff") (synopsis "Extract and apply patches to JSON documents") (description "This is a small library for working with changes to JSON documents. It includes a library and two command-line executables in the @@ -282,30 +296,17 @@ systems.") (define-public ghc-alex (package (name "ghc-alex") - (version "3.2.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "alex" version)) - (sha256 - (base32 - "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali")))) + (version "3.2.7.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "alex" version)) + (sha256 + (base32 + "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv")))) (build-system haskell-build-system) (properties '((upstream-name . "alex"))) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'check 'set-check-variables - (lambda _ - (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" - (getenv "PATH"))) - (setenv "alex_datadir" (string-append (getcwd) "/data"))))))) - (inputs (list ghc-quickcheck)) - (native-inputs - (list which)) - (home-page "https://www.haskell.org/alex/") - (synopsis - "Tool for generating lexical analysers in Haskell") + (home-page "http://www.haskell.org/alex/") + (synopsis "Tool for generating lexical analysers in Haskell") (description "Alex is a tool for generating lexical analysers in Haskell. It takes a description of tokens based on regular expressions and generates a Haskell @@ -386,21 +387,20 @@ a variety of ways.") (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.11") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ansi-terminal" version)) - (sha256 - (base32 - "14rp62c7y79n9dmmi7m0l9n3mcq6dh331b4yyyrivm5da6g1nqf6")))) + (version "0.11.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "ansi-terminal" version)) + (sha256 + (base32 + "098f8bdxqmgxaz8y87s6b6bshsq950zq0b75rmbihp2k1a7y963q")))) (build-system haskell-build-system) (properties '((upstream-name . "ansi-terminal"))) - (inputs - (list ghc-colour)) - (home-page "https://github.com/feuerbach/ansi-terminal") + (inputs (list ghc-colour)) + (home-page "https://github.com/UnkindPartition/ansi-terminal") (synopsis "ANSI terminal support for Haskell") - (description "This package provides ANSI terminal support for Haskell. It + (description + "This package provides ANSI terminal support for Haskell. It allows cursor movement, screen clearing, color output showing or hiding the cursor, and changing the title.") (license license:bsd-3))) @@ -465,6 +465,9 @@ style.") (properties '((upstream-name . "assoc"))) (inputs (list ghc-bifunctors ghc-tagged)) + (arguments + `(#:cabal-revision ("3" + "0mrb12dx316q4gxyn68x2rl8jq0gd77zffd12r8j1r41l0xd9f4k"))) (home-page "https://hackage.haskell.org/package/assoc") (synopsis @@ -492,6 +495,9 @@ similar operations (e.g. @code{Either}, @code{These}).") (list ghc-hashable)) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) + (arguments + `(#:cabal-revision ("2" + "1j93w1krkadqijn59yjiws1366yhcn2mad1irqrk50in6l10k51b"))) (home-page "https://github.com/simonmar/async") (synopsis "Library to run IO operations asynchronously") (description "Async provides a library to run IO operations @@ -525,17 +531,14 @@ This library provides a safer method based on the concept of @code{Ticket}s.") (define-public ghc-atomic-write (package (name "ghc-atomic-write") - (version "0.2.0.6") + (version "0.2.0.7") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/atomic-write/atomic-write-" - version - ".tar.gz")) + (uri (hackage-uri "atomic-write" version)) (sha256 (base32 - "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl")))) + "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm")))) (build-system haskell-build-system) (properties `((upstream-name . "atomic-write"))) (inputs @@ -552,52 +555,28 @@ will destroy the permissions on the original file. This library preserves permissions while atomically writing to a file.") (license license:expat))) -(define-public ghc-atomic-write-0.2.0.7 - (package - (inherit ghc-atomic-write) - (version "0.2.0.7") - (source - (origin - (inherit (package-source ghc-atomic-write)) - (uri (hackage-uri "atomic-write" version)) - (sha256 - (base32 - "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm")))))) - (define-public ghc-attoparsec (package (name "ghc-attoparsec") - (version "0.13.2.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "attoparsec" version)) - (sha256 - (base32 - "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11")))) + (version "0.14.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "attoparsec" version)) + (sha256 + (base32 + "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz")))) (build-system haskell-build-system) (properties '((upstream-name . "attoparsec"))) + (inputs (list ghc-scientific)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-unicode ghc-tasty + ghc-tasty-quickcheck ghc-vector)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-for-newer-quickcheck - (lambda _ - (substitute* "attoparsec.cabal" - (("QuickCheck >= 2\\.7 && < 2\\.10") - "QuickCheck >= 2.7 && < 2.12")) - ;; This test fails because of the newer QuickCheck: - ;; . - (substitute* "tests/QC/ByteString.hs" - ((", testProperty \"satisfyWith\" satisfyWith") - ""))))))) - (inputs - (list ghc-scientific)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck - ghc-quickcheck-unicode ghc-vector)) - (home-page "https://github.com/bos/attoparsec") + `(#:cabal-revision ("2" + "00jyrn2asz1kp698l3fyh19xxxz4npf1993y041x9b9cq239smn0"))) + (home-page "https://github.com/bgamari/attoparsec") (synopsis "Fast combinator parsing for bytestrings and text") - (description "This library provides a fast parser combinator library, + (description + "This library provides a fast parser combinator library, aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) @@ -615,21 +594,17 @@ complicated text/binary file formats.") (define-public ghc-attoparsec-iso8601 (package (name "ghc-attoparsec-iso8601") - (version "1.0.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "attoparsec-iso8601" version)) - (sha256 - (base32 - "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582")))) + (version "1.0.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "attoparsec-iso8601" version)) + (sha256 + (base32 + "1zmj6v63xjj20ja50ffbi222yg513cnnqyxl76ybb4x98z9jld0k")))) (build-system haskell-build-system) (properties '((upstream-name . "attoparsec-iso8601"))) - (arguments - `(#:cabal-revision - ("2" "18557xy5gvkhj0sb35wwxmhqirkiqrkwm0y0pqygsr0aimccs5zm"))) (inputs (list ghc-attoparsec ghc-base-compat-batteries ghc-time-compat)) - (home-page "https://github.com/bos/aeson") + (home-page "https://github.com/haskell/aeson") (synopsis "Parse ISO 8601 dates") (description "Haskell library for parsing of ISO 8601 dates, originally from aeson.") @@ -659,27 +634,18 @@ periodic, on-demand actions in Haskell.") (define-public ghc-aws (package (name "ghc-aws") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (hackage-uri "aws" version)) (sha256 (base32 - "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r")))) + "0kfdj9hxjvziq1y74xj9mm17zcgwywpvp9c0i6gfd5malf4qxgg0")))) (build-system haskell-build-system) (properties '((upstream-name . "aws"))) (arguments `(#:tests? #f ; Tests require AWS credentials. - #:configure-flags (list "-fNetworkBSD") ; Use network-bsd. - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "aws.cabal" - (("(base16-bytestring)\\s+==\\s+0\\.1\\.\\*" all dep) - dep) - (("(base64-bytestring)\\s+==\\s+1\\.0\\.\\*" all dep) - dep))))))) + #:configure-flags (list "-fNetworkBSD"))) ; Use network-bsd. (inputs (list ghc-aeson ghc-attoparsec @@ -728,20 +694,19 @@ Web Services.") (define-public ghc-base16-bytestring (package (name "ghc-base16-bytestring") - (version "1.0.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base16-bytestring" version)) - (sha256 - (base32 - "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0")))) + (version "1.0.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "base16-bytestring" version)) + (sha256 + (base32 + "1167f9jaivnabn6kg2gc421ac9njb67fr4v0adbj3qph7qa92nhx")))) (build-system haskell-build-system) (properties '((upstream-name . "base16-bytestring"))) - (native-inputs - (list ghc-hunit ghc-quickcheck ghc-test-framework - ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "https://github.com/bos/base16-bytestring") + (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (home-page "http://github.com/haskell/base16-bytestring") (synopsis "Fast base16 (hex) encoding and decoding for ByteStrings") (description "This package provides a Haskell library for working with base16-encoded @@ -751,17 +716,19 @@ data quickly and efficiently, using the ByteString type.") (define-public ghc-base64-bytestring (package (name "ghc-base64-bytestring") - (version "1.1.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base64-bytestring" version)) - (sha256 - (base32 "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391")))) + (version "1.2.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "base64-bytestring" version)) + (sha256 + (base32 + "1ja9vkgnpkzaw8gz6sm5jmgha6wg3m1j281m0nv1w9yyxlqfvy7v")))) (build-system haskell-build-system) (properties '((upstream-name . "base64-bytestring"))) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. - (home-page "https://github.com/bos/base64-bytestring") + (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (home-page "https://github.com/haskell/base64-bytestring") (synopsis "Base64 encoding and decoding for ByteStrings") (description "This library provides fast base64 encoding and decoding for Haskell @code{ByteString}s.") @@ -770,46 +737,41 @@ Haskell @code{ByteString}s.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.11.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base-compat" version)) - (sha256 - (base32 - "1nyvkaij4m01jndw72xl8931czz1xp6jpnynpajabys2ahabb9jk")))) + (version "0.12.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "base-compat" version)) + (sha256 + (base32 + "1gah466nd6hkj716gwljfh0g270iaqy2rq2a1vw3di2s7a4dqam6")))) (build-system haskell-build-system) (properties '((upstream-name . "base-compat"))) - (outputs '("out" "static" "doc")) - (native-inputs - (list ghc-quickcheck ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/base-compat") + (home-page "http://hackage.haskell.org/package/base-compat") (synopsis "Haskell compiler compatibility library") - (description "This library provides functions available in later versions + (description + "This library provides functions available in later versions of base to a wider range of compilers, without requiring the use of CPP pragmas in your code.") - (license license:bsd-3))) + (license license:expat))) (define-public ghc-base-compat-batteries (package (name "ghc-base-compat-batteries") - (version "0.11.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base-compat-batteries" version)) - (sha256 - (base32 - "08rh9nlm9ir28fm42xim06ga8qwdqdcvkbb5ckz99bwnmajndq1i")))) + (version "0.12.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "base-compat-batteries" version)) + (sha256 + (base32 + "16gbqng8556wqcvrmj3dmqxh9sxp7z6ixgv0j5sy017r0wp0ksgd")))) (build-system haskell-build-system) (properties '((upstream-name . "base-compat-batteries"))) - (inputs - (list ghc-base-compat)) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) - (home-page "https://hackage.haskell.org/package/base-compat-batteries") + (inputs (list ghc-base-compat)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (home-page "http://hackage.haskell.org/package/base-compat-batteries") (synopsis "base-compat with extra batteries") - (description "This library provides functions available in later + (description + "This library provides functions available in later versions of @code{base} to a wider range of compilers, without requiring you to use CPP pragmas in your code. This package provides the same API as the @code{base-compat} library, but depends on compatibility @@ -820,18 +782,16 @@ than @code{base-compat}, which has no dependencies.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.12") - (source - (origin - (method url-fetch) - (uri (hackage-uri "basement" version)) - (sha256 - (base32 - "12zsnxkgv86im2prslk6ddhy0zwpawwjc1h4ff63kpxp2xdl7i2k")))) + (version "0.0.15") + (source (origin + (method url-fetch) + (uri (hackage-uri "basement" version)) + (sha256 + (base32 + "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn")))) (build-system haskell-build-system) (properties '((upstream-name . "basement"))) - (outputs '("out" "static" "doc")) - (home-page "https://github.com/haskell-foundation/foundation") + (home-page "https://github.com/haskell-foundation/foundation#readme") (synopsis "Basic primitives for Foundation starter pack") (description "This package contains basic primitives for the Foundation set of @@ -841,42 +801,48 @@ packages.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.8.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base-orphans" version)) - (sha256 - (base32 - "1lw1jhrrsdq7x9wr2bwkxq9mscidcad0n30kh9gfk8kgifl5xh9k")))) + (version "0.8.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "base-orphans" version)) + (sha256 + (base32 + "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8")))) (build-system haskell-build-system) (properties '((upstream-name . "base-orphans"))) - (native-inputs - (list ghc-quickcheck ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/base-orphans") + (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) + (home-page "https://github.com/haskell-compat/base-orphans#readme") (synopsis "Orphan instances for backwards compatibility") - (description "This package defines orphan instances that mimic instances + (description + "This package defines orphan instances that mimic instances available in later versions of base to a wider (older) range of compilers.") - (license license:bsd-3))) + (license license:expat))) + +(define-public ghc-base-orphans-bootstrap + (package + (inherit ghc-base-orphans) + (name "ghc-base-orphans-bootstrap") + (arguments '(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) (define-public ghc-base-prelude (package (name "ghc-base-prelude") - (version "1.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "base-prelude" version)) - (sha256 - (base32 - "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs")))) + (version "1.6.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "base-prelude" version)) + (sha256 + (base32 + "0rbx6k85svqrkw5ixp2xal8bg6xrz729g7rrhkgsr3ixv38k943j")))) (build-system haskell-build-system) (properties '((upstream-name . "base-prelude"))) - (outputs '("out" "static" "doc")) (home-page "https://github.com/nikita-volkov/base-prelude") (synopsis "The most complete prelude formed solely from the Haskell's base package") - (description "This Haskell package aims to reexport all the non-conflicting + (description + "This Haskell package aims to reexport all the non-conflicting and most general definitions from the \"base\" package. This includes APIs for applicatives, arrows, monoids, foldables, traversables, @@ -980,26 +946,18 @@ storing and transmitting loosely structured data.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.11") - (source - (origin - (method url-fetch) - (uri (hackage-uri "bifunctors" version)) - (sha256 - (base32 - "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb")))) + (version "5.5.14") + (source (origin + (method url-fetch) + (uri (hackage-uri "bifunctors" version)) + (sha256 + (base32 + "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak")))) (build-system haskell-build-system) (properties '((upstream-name . "bifunctors"))) - (inputs - (list ghc-base-orphans - ghc-comonad - ghc-th-abstraction - ghc-transformers-compat - ghc-tagged - ghc-semigroups)) - (native-inputs - (list ghc-hspec hspec-discover ghc-quickcheck)) - (home-page "https://github.com/ekmett/bifunctors/") + (inputs (list ghc-base-orphans ghc-comonad ghc-th-abstraction ghc-tagged)) + (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-compat hspec-discover)) + (home-page "http://github.com/ekmett/bifunctors/") (synopsis "Bifunctors for Haskell") (description "This package provides bifunctors for Haskell.") (license license:bsd-3))) @@ -1094,19 +1052,14 @@ interoperate with code that uses the new implementation.") "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23")))) (build-system haskell-build-system) (properties '((upstream-name . "blaze-markup"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "blaze-markup.cabal" - (("tasty >= 1\\.0 && < 1\\.1") - "tasty >= 1.0 && < 1.2"))))))) (inputs (list ghc-blaze-builder)) (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "1hn694kk615prqdn7bfzl0wvbw8bksxk4cxwmx8yhwpl0cq3fiwa"))) (home-page "https://jaspervdj.be/blaze") (synopsis "Fast markup combinator library for Haskell") (description "This library provides core modules of a markup combinator @@ -1123,12 +1076,23 @@ library for Haskell.") (uri (hackage-uri "bloomfilter" version)) (sha256 (base32 - "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")))) + "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")) + (patches (search-patches "ghc-bloomfilter-ghc9.2.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "bloomfilter"))) (native-inputs (list ghc-quickcheck ghc-random ghc-test-framework ghc-test-framework-quickcheck2)) + (arguments + `(#:cabal-revision ("2" + "1hi6hwvhv7lxqv0l6hv2854g1rvc52zcmr3ldvnaan1l1b666867") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "bloomfilter.cabal" + (("\\b(base)\\s+[^,]+" all dep) + dep))))))) (home-page "https://github.com/bos/bloomfilter") (synopsis "Pure and impure Bloom filter implementations") (description "This package provides both mutable and immutable Bloom @@ -1201,37 +1165,38 @@ system.") (define-public ghc-bytes (package - (name "ghc-bytes") - (version "0.17.1") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "bytes" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s")))) - (build-system haskell-build-system) - (properties '((upstream-name . "bytes"))) - (inputs (list ghc-binary-orphans - ghc-cereal - ghc-hashable - ghc-scientific - ghc-transformers-compat - ghc-unordered-containers - ghc-void)) - (synopsis "Serialization between @code{binary} and @code{cereal}") - (description "This package provides a simple compatibility shim that lets -you work with both @code{binary} and @code{cereal} with one chunk of -serialization code.") - (home-page "https://hackage.haskell.org/package/bytes") - (license license:bsd-3))) - -(define-public ghc-bytestring-builder - (package - (name "ghc-bytestring-builder") - (version "0.10.8.2.0") + (name "ghc-bytes") + (version "0.17.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "bytes" version)) + (sha256 + (base32 + "06kqqk19qjhrwdqi6pyd1lwqfnj2sw3b3s49lc5vr2fmv8gg8mdw")))) + (build-system haskell-build-system) + (properties '((upstream-name . "bytes"))) + (inputs (list ghc-binary-orphans + ghc-cereal + ghc-hashable + ghc-transformers-compat + ghc-unordered-containers + ghc-scientific + ghc-void)) + (arguments + `(#:cabal-revision ("1" + "0frs6ag93kmg2fw3vd686czx8g7h9qmdn1ip6wdk96d94ap0fz9i"))) + (home-page "https://github.com/ekmett/bytes") + (synopsis "Serialization between @code{binary} and @code{cereal}") + (description + "This package provides a simple compatibility shim that lets +you work with both @code{binary} and @code{cereal} with one chunk of +serialization code.") + (license license:bsd-3))) + +(define-public ghc-bytestring-builder + (package + (name "ghc-bytestring-builder") + (version "0.10.8.2.0") (source (origin (method url-fetch) @@ -1249,6 +1214,7 @@ debuting in bytestring-0.10.4.0, which should be shipping with GHC 7.8. Compatibility package for older packages.") (license license:bsd-3))) +;; XXX: Incompatible with base (define-public ghc-bytestring-handle (package (name "ghc-bytestring-handle") @@ -1259,12 +1225,19 @@ Compatibility package for older packages.") (uri (hackage-uri "bytestring-handle" version)) (sha256 (base32 - "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) + "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")) + (patches (search-patches "ghc-bytestring-handle-ghc9.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "bytestring-handle"))) (arguments `(#:cabal-revision - ("2" "1x1sy3dz2ph9v6jk22wmcv5gk2bka5fv4s68i8q0j9m9pk085w37"))) + ("2" "1x1sy3dz2ph9v6jk22wmcv5gk2bka5fv4s68i8q0j9m9pk085w37") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "bytestring-handle.cabal" + (("base >= 4\\.2 && < 4\\.15") "base"))))))) (inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) @@ -1276,24 +1249,22 @@ Compatibility package for older packages.") (define-public ghc-bytestring-lexing (package (name "ghc-bytestring-lexing") - (version "0.5.0.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "bytestring-lexing" version)) - (sha256 - (base32 - "1p7i2haix4m11an3djaq65cnd293hzwqy4cd2i8jxzcl248pk6iy")))) + (version "0.5.0.9") + (source (origin + (method url-fetch) + (uri (hackage-uri "bytestring-lexing" version)) + (sha256 + (base32 + "14nx7sfs75g57mlfiwgzm5sc3wm4va58zryjp27m5lmfdp30873c")))) (build-system haskell-build-system) (properties '((upstream-name . "bytestring-lexing"))) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-smallcheck)) - (home-page "http://code.haskell.org/~wren/") + (native-inputs (list ghc-tasty ghc-tasty-smallcheck ghc-tasty-quickcheck)) + (home-page "https://wrengr.org/software/hackage.html") (synopsis "Parse and produce literals from strict or lazy bytestrings") (description "This package provides tools to parse and produce literals efficiently from strict or lazy bytestrings.") - (license license:bsd-2))) + (license license:bsd-3))) (define-public ghc-bzlib-conduit (package @@ -1339,7 +1310,9 @@ streaming compression and decompression.") (list ghc-test-framework ghc-test-framework-hunit ghc-hunit ghc-shelly)) (arguments - `(#:phases + `(#:cabal-revision + ("1" "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2") + #:phases (modify-phases %standard-phases ;; The tarball on Hackage does not ship these tests. See ;; https://github.com/haskell/c2hs/issues/269 @@ -1378,20 +1351,19 @@ imported with the correct Haskell types.") (define-public ghc-cairo (package (name "ghc-cairo") - (version "0.13.8.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cairo" version)) - (sha256 - (base32 - "1hpkyhrlg1d24s34kq6d379z8l8fvznm98wpq37haqjma4nl25hk")))) + (version "0.13.8.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "cairo" version)) + (sha256 + (base32 + "1sq2imy359vnbny610n7655a4z5a8fgdxanys4f5nw84246hc2yl")))) (build-system haskell-build-system) (properties '((upstream-name . "cairo"))) - (inputs - (list ghc-utf8-string cairo)) - (native-inputs - (list ghc-gtk2hs-buildtools pkg-config)) + (inputs (list ghc-utf8-string cairo)) + (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) + (arguments + `(#:extra-directories ("cairo"))) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Cairo vector graphics library") (description @@ -1403,17 +1375,17 @@ documents, amongst others.") (define-public ghc-call-stack (package (name "ghc-call-stack") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "call-stack" version)) - (sha256 - (base32 - "0ski7ihdxah7x4x07qgkjljg8hzqs9d6aa5k4cmr40bzp3i8s3mq")))) + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "call-stack" version)) + (sha256 + (base32 + "0yxq6v37kcmgv6rrna4g1ipr8mhkgf00ng2p359ybxq46j5cy2s3")))) (build-system haskell-build-system) (properties '((upstream-name . "call-stack"))) - (native-inputs (list ghc-nanospec)) + ;(arguments (list #:tests? #f)) + (native-inputs (list ghc-nanospec-bootstrap)) (home-page "https://github.com/sol/call-stack#readme") (synopsis "Use GHC call-stacks in a backward compatible way") (description "This package provides a compatibility layer for using GHC @@ -1461,37 +1433,29 @@ the resulting type will be insensitive to cases.") (define-public ghc-cassava (package (name "ghc-cassava") - (version "0.5.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cassava" version)) - (sha256 - (base32 - "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk")))) + (version "0.5.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "cassava" version)) + (sha256 + (base32 + "1gp954w05bj83z4i6isq2qxi1flqwppsgxxrp1f75mrs8cglbj5l")))) (build-system haskell-build-system) (properties '((upstream-name . "cassava"))) - (inputs - (list ghc-attoparsec - ghc-hashable - ghc-scientific - ghc-unordered-containers - ghc-vector - ghc-only - ghc-text-short - ghc-bytestring-builder)) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-quickcheck-instances - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2)) - (arguments - `(#:cabal-revision - ("4" - "19rkq41r5vj8drnj850b1wqnc54mxpw0x5z54brq0nvyww5f8ai8") - #:configure-flags '("--flags=-bytestring--lt-0_10_4"))) + (inputs (list ghc-attoparsec + ghc-hashable + ghc-scientific + ghc-unordered-containers + ghc-vector + ghc-only + ghc-bytestring-builder + ghc-nats)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-quickcheck-instances + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) (home-page "https://github.com/haskell-hvr/cassava") (synopsis "CSV parsing and encoding library") (description @@ -1532,7 +1496,9 @@ very simple example of encoding CSV data: @verbatim >>> Data.Csv.encode [(\"John\",27),(\"Jane\",28)] -\"John,27\r\nJane,28\r\n\" +\"John,27 +Jane,28 +\" @end verbatim ") (license license:bsd-3))) @@ -1564,29 +1530,30 @@ provides for better error messages at the expense of some speed.") (define-public ghc-cborg (package (name "ghc-cborg") - (version "0.2.5.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cborg" version)) - (sha256 - (base32 - "08da498bpbnl5c919m45mjm7sr78nn6qs7xyl0smfgd06wwm65xf")))) + (version "0.2.8.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "cborg" version)) + (sha256 + (base32 + "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f")))) (build-system haskell-build-system) (properties '((upstream-name . "cborg"))) - (inputs - (list ghc-half ghc-primitive)) - (native-inputs - (list ghc-aeson - ghc-base64-bytestring - ghc-base16-bytestring - ghc-fail - ghc-quickcheck - ghc-scientific - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-vector)) + (inputs (list ghc-half ghc-primitive)) + (native-inputs (list ghc-base-orphans + ghc-aeson + ghc-base64-bytestring + ghc-base16-bytestring + ghc-quickcheck + ghc-random + ghc-scientific + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-vector)) + (arguments + `(#:cabal-revision ("1" + "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6"))) (home-page "https://hackage.haskell.org/package/cborg") (synopsis "Concise Binary Object Representation") (description @@ -1609,51 +1576,48 @@ command-line utility for working with CBOR data.") (define-public ghc-cborg-json (package (name "ghc-cborg-json") - (version "0.2.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cborg-json" version)) - (sha256 - (base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b")))) + (version "0.2.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "cborg-json" version)) + (sha256 + (base32 + "1m3w0yyp6xb07fx04g5c52pb0b46vpkgpi32w1c8bz867x2p7hsq")))) (build-system haskell-build-system) (properties '((upstream-name . "cborg-json"))) + (inputs (list ghc-aeson + ghc-aeson-pretty + ghc-unordered-containers + ghc-scientific + ghc-vector + ghc-cborg)) (arguments - `(#:cabal-revision - ("3" "1sn2f9nfjcbr0n62n4kklbdi3pzpwrcy7ilg7m3v41nwrk53ifwy"))) - (inputs - (list ghc-aeson - ghc-aeson-pretty - ghc-unordered-containers - ghc-scientific - ghc-vector - ghc-cborg)) + `(#:cabal-revision ("1" + "0zzn2p6yl9mqw7agm5w7iiz105078gv66vxr8bqazilgssqk5wyg"))) (home-page "https://github.com/well-typed/cborg") (synopsis "Library for encoding JSON as CBOR") - (description - "This package implements the bijection between JSON and CBOR + (description "This package implements the bijection between JSON and CBOR defined in the CBOR specification, RFC 7049.") (license license:bsd-3))) (define-public ghc-cereal (package (name "ghc-cereal") - (version "0.5.8.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cereal" version)) - (sha256 - (base32 - "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id")))) + (version "0.5.8.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "cereal" version)) + (sha256 + (base32 + "0shg3q933cvf18j1gmxill48d4sl4mvxj2qkj6yya9hvcqh5544r")))) (build-system haskell-build-system) (properties '((upstream-name . "cereal"))) - (native-inputs - (list ghc-quickcheck ghc-fail ghc-test-framework - ghc-test-framework-quickcheck2)) - (home-page "https://hackage.haskell.org/package/cereal") + (native-inputs (list ghc-quickcheck ghc-test-framework + ghc-test-framework-quickcheck2)) + (home-page "https://github.com/GaloisInc/cereal") (synopsis "Binary serialization library") - (description "This package provides a binary serialization library, + (description + "This package provides a binary serialization library, similar to @code{binary}, that introduces an @code{isolate} primitive for parser isolation, and labeled blocks for better error messages.") (license license:bsd-3))) @@ -1682,6 +1646,7 @@ parser isolation, and labeled blocks for better error messages.") @code{Sources}, @code{Sinks}, and @code{Conduits}.") (license license:bsd-3))) +;; XXX: bytestring <0.11, time >=1.5 && <1.10 (define-public ghc-cgi (package (name "ghc-cgi") @@ -1699,6 +1664,14 @@ parser isolation, and labeled blocks for better error messages.") (list ghc-exceptions ghc-multipart ghc-network-uri ghc-network)) (native-inputs (list ghc-doctest ghc-quickcheck)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cgi.cabal" + (("\\b(bytestring|time)\\s+[^,]+" all dep) + dep))))))) (home-page "https://github.com/cheecheeo/haskell-cgi") (synopsis "Library for writing CGI programs") @@ -1709,19 +1682,17 @@ parser isolation, and labeled blocks for better error messages.") (define-public ghc-charset (package (name "ghc-charset") - (version "0.3.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "charset" version)) - (sha256 - (base32 - "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks")))) + (version "0.3.9") + (source (origin + (method url-fetch) + (uri (hackage-uri "charset" version)) + (sha256 + (base32 + "12wrphd5j1asb3n6awbph4n695mfmnzk6yzggrp387hx960qfkyb")))) (build-system haskell-build-system) (properties '((upstream-name . "charset"))) - (inputs - (list ghc-semigroups ghc-unordered-containers)) - (home-page "https://github.com/ekmett/charset") + (inputs (list ghc-unordered-containers ghc-semigroups)) + (home-page "http://github.com/ekmett/charset") (synopsis "Fast unicode character sets for Haskell") (description "This package provides fast unicode character sets for Haskell, based on complemented PATRICIA tries.") @@ -1730,26 +1701,21 @@ Haskell, based on complemented PATRICIA tries.") (define-public ghc-chart (package (name "ghc-chart") - (version "1.9.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "Chart" version)) - (sha256 - (base32 - "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry")))) + (version "1.9.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "Chart" version)) + (sha256 + (base32 + "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im")))) (build-system haskell-build-system) (properties '((upstream-name . "Chart"))) - (arguments - `(#:cabal-revision - ("2" "04mmsm54mdqcrypvgawhhbwjscmky3j7g5841bc71c0q6d33h2k4"))) - (inputs - (list ghc-old-locale - ghc-lens - ghc-colour - ghc-data-default-class - ghc-operational - ghc-vector)) + (inputs (list ghc-old-locale + ghc-lens + ghc-colour + ghc-data-default-class + ghc-operational + ghc-vector)) (home-page "https://github.com/timbod7/haskell-chart/wiki") (synopsis "Library for generating 2D charts and plots") (description @@ -1771,8 +1737,8 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (build-system haskell-build-system) (properties '((upstream-name . "Chart-cairo"))) (arguments - `(#:cabal-revision - ("2" "0z93znn3dpgj80iiz3a67m90x0j9ljr0jd1ws9jkzj7rk88014gp"))) + `(#:cabal-revision ("3" + "1d48i6y0lzj066swdb3x56jipxwlx1szwn7j43d50hxmcfjrsgc9"))) (inputs (list ghc-old-locale ghc-cairo @@ -1791,23 +1757,19 @@ backend for the Charts library.") (define-public ghc-chasingbottoms (package (name "ghc-chasingbottoms") - (version "1.3.1.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ChasingBottoms" version)) - (sha256 - (base32 - "1flr56hd8ny0ddlv1agi0ikdjv5wgx0aba6xqdsn3nv6dyw9nbf3")))) + (version "1.3.1.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "ChasingBottoms" version)) + (sha256 + (base32 + "1vy9yq07p95qiap1pcp2bbbn1mqvp3spyrswpdz0qfcn06656650")))) (build-system haskell-build-system) (properties '((upstream-name . "ChasingBottoms"))) - (inputs - (list ghc-quickcheck ghc-random ghc-syb)) - (home-page "https://hackage.haskell.org/package/ChasingBottoms") + (inputs (list ghc-quickcheck ghc-random ghc-syb)) + (home-page "http://hackage.haskell.org/package/ChasingBottoms") (synopsis "Testing of partial and infinite values in Haskell") (description - ;; FIXME: There should be a @comma{} in the uref text, but it is not - ;; rendered properly. "This is a library for testing code involving bottoms or infinite values. For the underlying theory and a larger example involving use of QuickCheck, see the article @@ -1954,20 +1916,20 @@ classy-prelude.") (define-public ghc-clock (package (name "ghc-clock") - (version "0.8.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "clock" version)) - (sha256 - (base32 "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b")))) + (version "0.8.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "clock" version)) + (sha256 + (base32 + "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44")))) (build-system haskell-build-system) (properties '((upstream-name . "clock"))) - (inputs - (list ghc-tasty ghc-tasty-quickcheck)) - (home-page "https://hackage.haskell.org/package/clock") + (native-inputs (list ghc-tasty ghc-tasty-quickcheck)) + (home-page "https://github.com/corsis/clock") (synopsis "High-resolution clock for Haskell") - (description "A package for convenient access to high-resolution clock and + (description + "A package for convenient access to high-resolution clock and timer functions of different operating systems via a unified API.") (license license:bsd-3))) @@ -2009,21 +1971,18 @@ sources, and does not require prior installation of the C library.") (define-public ghc-cmark-gfm (package (name "ghc-cmark-gfm") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "cmark-gfm" version)) - (sha256 - (base32 - "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f")))) + (version "0.2.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "cmark-gfm" version)) + (sha256 + (base32 + "0la4sd0cmv3zmn0kygbd77dknyh55h0b0qx5jg883hqnvnhaq721")))) (build-system haskell-build-system) (properties '((upstream-name . "cmark-gfm"))) - (native-inputs - (list ghc-hunit)) + (native-inputs (list ghc-hunit)) (home-page "https://github.com/kivikakk/cmark-gfm-hs") - (synopsis - "Fast, accurate GitHub Flavored Markdown parser and renderer") + (synopsis "Fast, accurate GitHub Flavored Markdown parser and renderer") (description "This package provides Haskell bindings for libcmark-gfm, the reference parser for GitHub Flavored Markdown, a fully specified variant of Markdown. @@ -2189,22 +2148,18 @@ Python.") (define-public ghc-concurrent-output (package (name "ghc-concurrent-output") - (version "1.10.12") - (source - (origin - (method url-fetch) - (uri (hackage-uri "concurrent-output" version)) - (sha256 - (base32 - "081wpag1d5znr0ynrjvkc14xl816m88vz9hgfm3g3sp6ak7s3y47")))) + (version "1.10.16") + (source (origin + (method url-fetch) + (uri (hackage-uri "concurrent-output" version)) + (sha256 + (base32 + "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh")))) (build-system haskell-build-system) (properties '((upstream-name . "concurrent-output"))) - (inputs - (list ghc-async ghc-exceptions ghc-ansi-terminal ghc-terminal-size)) - (home-page - "https://hackage.haskell.org/package/concurrent-output") - (synopsis - "Ungarble output from several threads or commands") + (inputs (list ghc-async ghc-ansi-terminal ghc-terminal-size)) + (home-page "http://hackage.haskell.org/package/concurrent-output") + (synopsis "Ungarble output from several threads or commands") (description "Lets multiple threads and external processes concurrently output to the console, without it getting all garbled up. @@ -2254,35 +2209,35 @@ space as enumerator/iteratee and pipes.") (define-public ghc-conduit-algorithms (package (name "ghc-conduit-algorithms") - (version "0.0.11.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "conduit-algorithms" version)) - (sha256 - (base32 - "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i")))) + (version "0.0.13.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "conduit-algorithms" version)) + (sha256 + (base32 + "1i5jq66xylcnk3yhv2m6lhyqfdrwr94w8v67jzwlvja15jv7mj9v")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit-algorithms"))) - (inputs - (list ghc-async - ghc-bzlib-conduit - ghc-conduit - ghc-conduit-combinators - ghc-conduit-extra - ghc-conduit-zstd - ghc-exceptions - ghc-lzma-conduit - ghc-monad-control - ghc-pqueue - ghc-resourcet - ghc-stm-conduit - ghc-streaming-commons - ghc-unliftio-core - ghc-vector)) - (native-inputs - (list ghc-hunit ghc-test-framework ghc-test-framework-hunit - ghc-test-framework-th)) + (inputs (list ghc-async + ghc-bzlib-conduit + ghc-conduit + ghc-conduit-combinators + ghc-conduit-extra + ghc-conduit-zstd + ghc-fingertree + ghc-lzma-conduit + ghc-monad-control + ghc-resourcet + ghc-stm-conduit + ghc-streaming-commons + ghc-unliftio-core + ghc-vector)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-tasty-th)) (home-page "https://github.com/luispedro/conduit-algorithms#readme") (synopsis "Conduit-based algorithms") (description @@ -2328,35 +2283,27 @@ as well as a convenient Conduit module.") (define-public ghc-conduit-extra (package (name "ghc-conduit-extra") - (version "1.3.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "conduit-extra" version)) - (sha256 - (base32 - "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a")))) + (version "1.3.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "conduit-extra" version)) + (sha256 + (base32 + "0lzip3af77wxf3a3vilfymqhd26gkvabx2fkj22w74nq960c6l49")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit-extra"))) - (inputs - (list ghc-conduit - ghc-exceptions - ghc-monad-control - ghc-transformers-base - ghc-typed-process - ghc-async - ghc-attoparsec - ghc-blaze-builder - ghc-network - ghc-primitive - ghc-resourcet - ghc-streaming-commons - ghc-hspec - ghc-bytestring-builder - ghc-quickcheck)) - (native-inputs - (list hspec-discover)) - (home-page "https://github.com/snoyberg/conduit") + (inputs (list ghc-conduit + ghc-async + ghc-attoparsec + ghc-network + ghc-primitive + ghc-resourcet + ghc-streaming-commons + ghc-unliftio-core + ghc-typed-process + hspec-discover)) + (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-base)) + (home-page "http://github.com/snoyberg/conduit") (synopsis "Conduit adapters for common libraries") (description "The @code{conduit} package itself maintains relative small dependencies. @@ -2395,25 +2342,17 @@ interface}.") (define-public ghc-config-ini (package (name "ghc-config-ini") - (version "0.2.4.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "config-ini" version)) - (sha256 - (base32 "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf")))) + (version "0.2.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "config-ini" version)) + (sha256 + (base32 + "07vgpydzd44ayhq9c3q1335vphw384z8baf0wd0mnarr48yfaz3g")))) (build-system haskell-build-system) (properties '((upstream-name . "config-ini"))) - (arguments - ;; XXX The tests fail to compile: “The constructor ‘I1.Ini’ should have 2 - ;; arguments, but has been given 1”. - `(#:tests? #f - #:cabal-revision - ("2" "0iwraaa0y1b3xdsg760j1wpylkqshky0k2djcg0k4s97lrwqpbcz"))) - (native-inputs - (list ghc-doctest ghc-hedgehog ghc-ini ghc-microlens)) - (inputs - (list ghc-megaparsec ghc-unordered-containers)) + (inputs (list ghc-unordered-containers ghc-megaparsec)) + (native-inputs (list ghc-ini ghc-hedgehog ghc-doctest ghc-microlens)) (home-page "https://github.com/aisamanra/config-ini") (synopsis "Monadic Haskell DSL for parsing simple INI configuration files") (description @@ -2496,28 +2435,25 @@ the choice of SSL/TLS, and SOCKS.") (define-public ghc-constraints (package (name "ghc-constraints") - (version "0.13") - (source - (origin - (method url-fetch) - (uri (hackage-uri "constraints" version)) - (sha256 - (base32 - "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj")))) + (version "0.13.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "constraints" version)) + (sha256 + (base32 + "0d248szyp70k1qlivsimk0j5vz9hdx1alhismry5v35qyinr91j1")))) (build-system haskell-build-system) (properties '((upstream-name . "constraints"))) - (inputs - (list ghc-hashable ghc-semigroups ghc-transformers-compat - ghc-type-equality)) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://github.com/ekmett/constraints/") + (inputs (list ghc-hashable ghc-transformers-compat ghc-type-equality + ghc-semigroups-bootstrap)) + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "http://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") (description "GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}. They stopped crashing the compiler in GHC 7.6. This package provides a vocabulary for working with them.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-contravariant (package @@ -2543,18 +2479,16 @@ a vocabulary for working with them.") (define-public ghc-contravariant-extras (package (name "ghc-contravariant-extras") - (version "0.3.5.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "contravariant-extras" version)) - (sha256 - (base32 - "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9")))) + (version "0.3.5.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "contravariant-extras" version)) + (sha256 + (base32 + "0r4bnl4gi6zd46h6fjkr33hw37rjxwwr00m08vgbzgkdp853g1ba")))) (build-system haskell-build-system) (properties '((upstream-name . "contravariant-extras"))) - (inputs - (list ghc-contravariant ghc-template-haskell-compat-v0208)) + (inputs (list ghc-contravariant ghc-template-haskell-compat-v0208)) (home-page "https://github.com/nikita-volkov/contravariant-extras") (synopsis "Extras for the @code{ghc-contravariant} Haskell package") (description "This Haskell package provides extras for the @@ -2591,19 +2525,18 @@ Free Monads, MPC'08} (define-public ghc-convertible (package (name "ghc-convertible") - (version "1.1.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "convertible" version)) - (sha256 - (base32 - "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9")))) + (version "1.1.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "convertible" version)) + (sha256 + (base32 + "1vwc6h1z88xkw4bq3js8x9x86jnk3amdskyksca77p0kwiqbs7lr")))) (build-system haskell-build-system) (properties '((upstream-name . "convertible"))) - (inputs - (list ghc-old-time ghc-old-locale)) - (home-page "https://hackage.haskell.org/package/convertible") + (inputs (list ghc-old-time)) + (native-inputs (list ghc-quickcheck)) + (home-page "http://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description "This package provides a typeclass with a single function that is @@ -2684,20 +2617,16 @@ Accessor to access state in transformers State monad.") (define-public ghc-data-clist (package (name "ghc-data-clist") - (version "0.1.2.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "data-clist" version)) - (sha256 - (base32 "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m")))) + (version "0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "data-clist" version)) + (sha256 + (base32 + "04mj0d1yp0l27v2my51w9q5zpdrdhp29fdyvmwqgxxp8f6yiwfhw")))) (build-system haskell-build-system) (properties '((upstream-name . "data-clist"))) - (native-inputs - (list ghc-quickcheck)) - (arguments - `(#:cabal-revision - ("1" "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy"))) + (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/sw17ch/data-clist") (synopsis "Simple, functional, bidirectional circular list type") (description @@ -2845,6 +2774,9 @@ package.") (build-system haskell-build-system) (properties '((upstream-name . "data-fix"))) (inputs (list ghc-hashable)) + (arguments + `(#:cabal-revision ("3" + "0z77i9y86wlc13396akl8qxq39rwpkhhcs5fadzk47bwn7v1gsmx"))) (home-page "https://github.com/spell-music/data-fix") (synopsis "Fixpoint data types") (description @@ -2898,42 +2830,38 @@ It includes hashing functions for all basic Haskell98 types.") (define-public ghc-dbus (package (name "ghc-dbus") - (version "1.2.17") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "dbus" version)) - (sha256 - (base32 - "0iyfnkxcnm1vl379ry88fqxgn2y8q6ilsvpic6ciassnyv5pcbrv")))) + (version "1.2.27") + (source (origin + (method url-fetch) + (uri (hackage-uri "dbus" version)) + (sha256 + (base32 + "0lkk9hd78h2ilvi0bj5jqq5q5lwyxzdlknwvckhwyxnlf3y6dz8z")))) (build-system haskell-build-system) (properties '((upstream-name . "dbus"))) - (inputs - (list ghc-cereal - ghc-conduit - ghc-exceptions - ghc-lens - ghc-network - ghc-random - ghc-split - ghc-th-lift - ghc-vector - ghc-xml-conduit - ghc-xml-types)) - (native-inputs - (list ghc-extra - ghc-quickcheck - ghc-resourcet - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) - ;; FIXME - Some tests try to talk to network. - (arguments `(#:tests? #f)) - (home-page "https://github.com/rblaze/haskell-dbus") + (inputs (list ghc-cereal + ghc-conduit + ghc-lens + ghc-network + ghc-random + ghc-split + ghc-th-lift + ghc-vector + ghc-xml-conduit + ghc-xml-types)) + (native-inputs (list ghc-extra + ghc-quickcheck + ghc-resourcet + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ;; dbus-daemon spawned by testsuite. + dbus)) + (arguments (list #:tests? #f)) ; Network tests fail to connect. + (home-page "https://github.com/rblaze/haskell-dbus#readme") (synopsis "Client library for the D-Bus IPC system") (description - "D-Bus is a simple, message-based protocol for inter-process + "D-Bus is a simple, message-based protocol for inter-process communication, which allows applications to interact with other parts of the machine and the user's session using remote procedure calls. D-Bus is a essential part of the modern Linux desktop, where @@ -2980,8 +2908,8 @@ value.") (build-system haskell-build-system) (properties '((upstream-name . "deepseq-generics"))) (arguments - `(#:cabal-revision - ("6" "1qwnpdjsrqzn18pjmvv9aqz3l12fbdcimf62wkj33yfh69rx4s42"))) + `(#:cabal-revision ("8" + "0dcv4kf2g4xyacjpci9kql1gm706lkzhcyz9ks9jkbdvyvs8lf90"))) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) (home-page "https://github.com/hvr/deepseq-generics") @@ -3020,58 +2948,34 @@ providing an @code{rnf} implementation.") related modules split from the statistics library.") (license license:bsd-2))) -(define-public ghc-descriptive - (package - (name "ghc-descriptive") - (version "0.9.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "descriptive" version)) - (sha256 - (base32 - "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237")))) - (build-system haskell-build-system) - (properties '((upstream-name . "descriptive"))) - (inputs - (list ghc-aeson ghc-bifunctors ghc-scientific ghc-vector)) - (native-inputs - (list ghc-hunit ghc-hspec)) - (home-page - "https://github.com/chrisdone/descriptive") - (synopsis - "Self-describing consumers/parsers: forms, cmd-line args, JSON, etc.") - (description - "This package provides datatypes and functions for creating consumers -and parsers with useful semantics.") - (license license:bsd-3))) - (define-public ghc-diagrams-core (package (name "ghc-diagrams-core") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "diagrams-core" version)) - (sha256 - (base32 - "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn")))) + (version "1.5.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "diagrams-core" version)) + (sha256 + (base32 + "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn")))) (build-system haskell-build-system) (properties '((upstream-name . "diagrams-core"))) - (inputs - (list ghc-unordered-containers - ghc-semigroups - ghc-monoid-extras - ghc-dual-tree - ghc-lens - ghc-linear - ghc-adjunctions - ghc-distributive - ghc-profunctors)) - (home-page "https://archives.haskell.org/projects.haskell.org/diagrams/") + (inputs (list ghc-unordered-containers + ghc-semigroups + ghc-monoid-extras + ghc-dual-tree + ghc-lens + ghc-linear + ghc-adjunctions + ghc-distributive + ghc-profunctors)) + (arguments + `(#:cabal-revision ("1" + "1gahbyv00xyr4pcmpq4g95jyh7844fp8z0g9l2ybifv4s73vdrym"))) + (home-page "https://diagrams.github.io") (synopsis "Core libraries for diagrams embedded domain-specific language") - (description "This package provides the core modules underlying + (description + "This package provides the core modules underlying diagrams, an embedded domain-specific language for compositional, declarative drawing.") (license license:bsd-3))) @@ -3079,49 +2983,46 @@ declarative drawing.") (define-public ghc-diagrams-lib (package (name "ghc-diagrams-lib") - (version "1.4.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "diagrams-lib" version)) - (sha256 - (base32 - "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy")))) + (version "1.4.5.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "diagrams-lib" version)) + (sha256 + (base32 + "1vx51g9znb4a9bf20pjd9zr98wmh39avk2i06217p0iidcw8whz6")))) (build-system haskell-build-system) (properties '((upstream-name . "diagrams-lib"))) - (inputs - (list ghc-semigroups - ghc-monoid-extras - ghc-dual-tree - ghc-diagrams-core - ghc-diagrams-solve - ghc-active - ghc-colour - ghc-data-default-class - ghc-fingertree - ghc-intervals - ghc-lens - ghc-tagged - ghc-optparse-applicative - ghc-juicypixels - ghc-hashable - ghc-linear - ghc-adjunctions - ghc-distributive - ghc-fsnotify - ghc-unordered-containers - ghc-profunctors - ghc-exceptions - ghc-cereal)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck - ghc-numeric-extras)) + (inputs (list ghc-semigroups + ghc-monoid-extras + ghc-dual-tree + ghc-diagrams-core + ghc-diagrams-solve + ghc-active + ghc-colour + ghc-data-default-class + ghc-fingertree + ghc-intervals + ghc-lens + ghc-tagged + ghc-optparse-applicative + ghc-juicypixels + ghc-hashable + ghc-linear + ghc-adjunctions + ghc-distributive + ghc-fsnotify + ghc-unordered-containers + ghc-profunctors + ghc-cereal)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck + ghc-quickcheck ghc-numeric-extras)) (arguments - `(#:cabal-revision - ("1" "1c7kpnbvxwdcmk5znqyig3l6s986ppj168ck5v72dfbp8cjvwa8i"))) - (home-page "https://archives.haskell.org/projects.haskell.org/diagrams/") + `(#:cabal-revision ("1" + "14lxvlxdzkrhdgblgglr5k0rwak0yl4gzawqkfla04mkg6hkh5bb"))) + (home-page "http://diagrams.github.io") (synopsis "Embedded domain-specific language for declarative graphics") - (description "Diagrams is a flexible, extensible embedded + (description + "Diagrams is a flexible, extensible embedded domain-specific language (EDSL) for creating graphics of many types. Graphics can be created in arbitrary vector spaces and rendered with multiple backends. This package provides a standard library of @@ -3159,33 +3060,31 @@ and cyclic tridiagonal linear systems.") (define-public ghc-diagrams-svg (package (name "ghc-diagrams-svg") - (version "1.4.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "diagrams-svg" version)) - (sha256 - (base32 - "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8")))) + (version "1.4.3.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "diagrams-svg" version)) + (sha256 + (base32 + "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237")))) (build-system haskell-build-system) (properties '((upstream-name . "diagrams-svg"))) - (inputs - (list ghc-base64-bytestring - ghc-colour - ghc-diagrams-core - ghc-diagrams-lib - ghc-monoid-extras - ghc-svg-builder - ghc-juicypixels - ghc-split - ghc-lens - ghc-hashable - ghc-optparse-applicative - ghc-semigroups)) + (inputs (list ghc-base64-bytestring + ghc-colour + ghc-diagrams-core + ghc-diagrams-lib + ghc-monoid-extras + ghc-svg-builder + ghc-juicypixels + ghc-split + ghc-lens + ghc-hashable + ghc-optparse-applicative + ghc-semigroups)) (arguments - `(#:cabal-revision - ("4" "0irjf0g1barr06fy409r0ld2hypihrhh6n80ig3487xxny6gfzs0"))) - (home-page "https://archives.haskell.org/projects.haskell.org/diagrams/") + `(#:cabal-revision ("4" + "026mkj9fz64rdrap25mp8cwdrzwj90h35qg9kkn078fac93aaq10"))) + (home-page "https://diagrams.github.io/") (synopsis "Scalable Vector Grpahics backend for the diagrams framework") (description "This package provides a modular backend for rendering diagrams created with the diagrams embedded domain-specific @@ -3217,19 +3116,18 @@ members are shared.") (define-public ghc-diff (package (name "ghc-diff") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (hackage-uri "Diff" version)) (sha256 (base32 - "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j")))) + "0w166w5jksiqad7xf2ldjl2ykap0xf08byrl92qwp6r1qym4lppx")))) (build-system haskell-build-system) (properties '((upstream-name . "Diff"))) - (native-inputs - (list ghc-quickcheck ghc-test-framework - ghc-test-framework-quickcheck2)) - (home-page "https://hub.darcs.net/sterlingclover/Diff") + (native-inputs (list ghc-quickcheck ghc-test-framework + ghc-test-framework-quickcheck2)) + (home-page "http://hackage.haskell.org/package/Diff") (synopsis "O(ND) diff algorithm in Haskell") (description "This package provides an implementation of the standard diff algorithm, @@ -3272,7 +3170,7 @@ disk space usage.") (list ghc-tagged ghc-base-orphans ghc-transformers-compat ghc-semigroups ghc-generic-deriving)) (native-inputs - (list cabal-doctest ghc-doctest ghc-hspec hspec-discover)) + (list ghc-doctest ghc-hspec hspec-discover)) (home-page "https://github.com/ekmett/distributive/") (synopsis "Distributive functors for Haskell") (description "This package provides distributive functors for Haskell. @@ -3304,28 +3202,27 @@ Writer monad), where list append quickly becomes too expensive.") (define-public ghc-doctemplates (package (name "ghc-doctemplates") - (version "0.9") - (source - (origin - (method url-fetch) - (uri (hackage-uri "doctemplates" version)) - (sha256 - (base32 - "048h8ka849h1f0xxwkasjbrrwq03rfz2m7aqg5xc5286kp02w9ns")))) + (version "0.10.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "doctemplates" version)) + (sha256 + (base32 + "0as0sc4x4ch5z233dqlb8xqg97xbfbzw2dqsz9rfq8rw10v9yx57")))) (build-system haskell-build-system) (properties '((upstream-name . "doctemplates"))) - (inputs - (list ghc-aeson - ghc-doclayout - ghc-hsyaml - ghc-safe - ghc-scientific - ghc-text-conversions - ghc-unordered-containers - ghc-vector)) - (native-inputs - (list ghc-glob ghc-tasty ghc-tasty-golden ghc-tasty-hunit - ghc-temporary)) + (inputs (list ghc-safe + ghc-text-conversions + ghc-aeson + ghc-hsyaml + ghc-doclayout + ghc-vector + ghc-scientific)) + (native-inputs (list ghc-glob ghc-tasty ghc-tasty-golden ghc-tasty-hunit + ghc-temporary)) + (arguments + `(#:cabal-revision ("1" + "17r6ig72bzqd59p11sjaf9y27pm4yig1a1s1igs57s88cy47qz05"))) (home-page "https://github.com/jgm/doctemplates#readme") (synopsis "Pandoc-style document templates") (description @@ -3335,31 +3232,29 @@ Writer monad), where list append quickly becomes too expensive.") (define-public ghc-doctest (package (name "ghc-doctest") - (version "0.17") - (source - (origin - (method url-fetch) - (uri (hackage-uri "doctest" version)) - (sha256 - (base32 - "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz")))) + (version "0.20.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "doctest" version)) + (sha256 + (base32 + "00jbpqvcqxx1nmf41li947d9d3ifwchzzp37mlag68hgnza6z9a4")))) (build-system haskell-build-system) (properties '((upstream-name . "doctest"))) - (arguments `(#:tests? #f)) ; FIXME: missing test framework - (inputs - (list ghc-base-compat ghc-code-page ghc-paths ghc-syb)) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-hspec - ghc-mockery - ghc-setenv - ghc-silently - ghc-stringbuilder)) - (home-page - "https://github.com/sol/doctest#readme") + (inputs (list ghc-base-compat ghc-code-page ghc-paths ghc-syb)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-hspec + ghc-hspec-core + ghc-mockery + ghc-setenv + ghc-silently + ghc-stringbuilder + hspec-discover)) + (home-page "https://github.com/sol/doctest#readme") (synopsis "Test interactive Haskell examples") - (description "The doctest program checks examples in source code comments. + (description + "The doctest program checks examples in source code comments. It is modeled after doctest for Python, see @uref{https://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) @@ -3389,21 +3284,23 @@ monadic interface for building graphs.") (define-public ghc-double-conversion (package (name "ghc-double-conversion") - (version "2.0.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "double-conversion" version)) - (sha256 - (base32 - "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) - (build-system haskell-build-system) - (properties '((upstream-name . "double-conversion"))) - (native-inputs - (list ghc-hunit ghc-test-framework ghc-test-framework-hunit - ghc-test-framework-quickcheck2)) - (home-page "https://github.com/bos/double-conversion") - (synopsis "Fast conversion between double precision floating point and text") + (version "2.0.4.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "double-conversion" version)) + (sha256 + (base32 + "0r7c1801gzdm5x1flmpx8ajxygbc9dl7sgdj0xn3bpm71wgvrf4s")))) + (build-system haskell-build-system) + (properties '((upstream-name . "double-conversion"))) + (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (arguments + `(#:cabal-revision ("2" + "1mpnx4m2pg5crfz9k8wamh5mgsha0np3ynnllrmglmwh54gvfjj3"))) + (home-page "https://github.com/haskell/double-conversion") + (synopsis + "Fast conversion between double precision floating point and text") (description "This package provides a library that performs fast, accurate conversion between double precision floating point and text.") @@ -3412,28 +3309,21 @@ between double precision floating point and text.") (define-public ghc-dual-tree (package (name "ghc-dual-tree") - (version "0.2.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "dual-tree" version)) - (sha256 - (base32 - "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg")))) + (version "0.2.3.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "dual-tree" version)) + (sha256 + (base32 + "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh")))) (build-system haskell-build-system) (properties '((upstream-name . "dual-tree"))) - (arguments - `(#:tests? #f ; TODO: ghc-testing-feat does not build. - #:cabal-revision - ("1" "1babd7ybsgk73x57yl35q0n1i7mbbqmv4am710kq1hzg3in4g9dv"))) - (inputs - (list ghc-semigroups ghc-newtype-generics ghc-monoid-extras)) -; (native-inputs -; `(("ghc-quickcheck" ,ghc-quickcheck) -; ("ghc-testing-feat" ,ghc-testing-feat))) - (home-page "https://hackage.haskell.org/package/dual-tree") + (inputs (list ghc-semigroups ghc-monoid-extras)) + (native-inputs (list ghc-quickcheck ghc-testing-feat)) + (home-page "http://hackage.haskell.org/package/dual-tree") (synopsis "Rose trees with cached and accumulating monoidal annotations") - (description "Rose (@math{n}-ary) trees with both upwards- (i.e. + (description + "Rose (@math{n}-ary) trees with both upwards- (i.e. cached) and downwards-traveling (i.e. accumulating) monoidal annotations. This is used as the core data structure underlying the @url{https://archives.haskell.org/projects.haskell.org/diagrams/, @@ -3568,33 +3458,19 @@ but is otherwise agnostic to: (define-public ghc-either (package (name "ghc-either") - (version "5.0.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "either" version)) - (sha256 - (base32 - "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2")))) + (version "5.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "either" version)) + (sha256 + (base32 + "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z")))) (build-system haskell-build-system) (properties '((upstream-name . "either"))) - (arguments - `(#:cabal-revision - ("1" "03bgnq55lc6f1nx4p662gidfsyyfm3xm4fi84h77wnsppxrpa5j1"))) - (inputs `(("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-free" ,ghc-free) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-manodrandom" ,ghc-monadrandom) - ("ghc-mmorph" ,ghc-mmorph) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-transformers-base" ,ghc-transformers-base))) - (native-inputs - (list ghc-quickcheck ghc-test-framework - ghc-test-framework-quickcheck2)) - (home-page "https://github.com/ekmett/either") + (inputs (list ghc-bifunctors ghc-profunctors ghc-semigroupoids)) + (native-inputs (list ghc-test-framework ghc-test-framework-quickcheck2 + ghc-quickcheck)) + (home-page "http://github.com/ekmett/either/") (synopsis "Provides an either monad transformer for Haskell") (description "This Haskell package provides an either monad transformer.") (license license:bsd-3))) @@ -3602,20 +3478,18 @@ but is otherwise agnostic to: (define-public ghc-email-validate (package (name "ghc-email-validate") - (version "2.3.2.15") - (source - (origin - (method url-fetch) - (uri (hackage-uri "email-validate" version)) - (sha256 - (base32 - "0n67wss6k8lhwfkybkhsa04bbdfdv541sacbxlylkx2hqpj5r5gh")))) + (version "2.3.2.18") + (source (origin + (method url-fetch) + (uri (hackage-uri "email-validate" version)) + (sha256 + (base32 + "11bi5y5qmri62nl34nl5pv4zs59bjpjknw560yw5ds62gsi2sjcp")))) (build-system haskell-build-system) (properties '((upstream-name . "email-validate"))) - (inputs - (list ghc-attoparsec ghc-hspec ghc-quickcheck ghc-doctest)) - (home-page - "https://github.com/Porges/email-validate-hs") + (inputs (list ghc-attoparsec)) + (native-inputs (list ghc-hspec ghc-quickcheck ghc-doctest)) + (home-page "https://github.com/Porges/email-validate-hs") (synopsis "Email address validator for Haskell") (description "This Haskell package provides a validator that can validate an email @@ -3653,18 +3527,17 @@ asynchronous exceptions.") (define-public ghc-equivalence (package (name "ghc-equivalence") - (version "0.3.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "equivalence" version)) - (sha256 - (base32 "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp")))) + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "equivalence" version)) + (sha256 + (base32 + "13q0lklm58n0l7bx0d4k1cw1i2il8hpdjp76lb79ix8lv7cxd2jr")))) (build-system haskell-build-system) (properties '((upstream-name . "equivalence"))) - (inputs - (list ghc-stmonadtrans ghc-transformers-compat ghc-fail - ghc-quickcheck)) + (inputs (list ghc-stmonadtrans ghc-transformers-compat ghc-fail)) + (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/pa-ba/equivalence") (synopsis "Maintaining an equivalence relation implemented as union-find") (description @@ -3735,6 +3608,9 @@ This package provides an orphan instance.") (inputs (list ghc-exceptions ghc-transformers-compat ghc-unexceptionalio ghc-safe)) + (arguments + `(#:cabal-revision ("4" + "0sji6ny86f4j9ch1cyf2p1mcr5b2ighvw4bb9rssvypxb6k2r68f"))) (home-page "https://github.com/gabriel439/haskell-errors-library") (synopsis "Error handling library for Haskell") (description "This library encourages an error-handling style that @@ -3744,44 +3620,41 @@ directly uses the type system, rather than out-of-band exceptions.") (define-public ghc-esqueleto (package (name "ghc-esqueleto") - (version "3.5.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "esqueleto" version)) - (sha256 - (base32 - "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz")))) + (version "3.5.8.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "esqueleto" version)) + (sha256 + (base32 + "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v")))) (build-system haskell-build-system) (properties '((upstream-name . "esqueleto"))) - (arguments - `(#:tests? #f)) ; TODO: Cannot connect to mysql server. - (inputs - (list ghc-aeson - ghc-attoparsec - ghc-blaze-html - ghc-conduit - ghc-monad-logger - ghc-persistent - ghc-resourcet - ghc-tagged - ghc-unliftio - ghc-unordered-containers - openssl - zlib)) - (native-inputs - (list ghc-hspec-core - ghc-hspec - ghc-mysql - ghc-mysql-simple - ghc-persistent-mysql - ghc-persistent-postgresql - ghc-persistent-sqlite - ghc-postgresql-simple - ghc-quickcheck)) + (inputs (list ghc-aeson + ghc-attoparsec + ghc-blaze-html + ghc-conduit + ghc-monad-logger + ghc-persistent + ghc-resourcet + ghc-tagged + ghc-unliftio + ghc-unordered-containers + openssl + zlib)) + (native-inputs (list ghc-hspec + ghc-hspec-core + ghc-mysql + ghc-mysql-simple + ghc-persistent-mysql + ghc-persistent-postgresql + ghc-persistent-sqlite + ghc-postgresql-simple + ghc-quickcheck)) + (arguments (list #:tests? #f)) ; Needs a running MySQLd. (home-page "https://github.com/bitemyapp/esqueleto") (synopsis "Type-safe embedded domain specific language for SQL queries") - (description "This library provides a type-safe embedded domain specific + (description + "This library provides a type-safe embedded domain specific language (EDSL) for SQL queries that works with SQL backends as provided by @code{ghc-persistent}. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the @@ -3791,22 +3664,26 @@ generated SQL and optimize it for your backend.") (define-public ghc-exactprint (package (name "ghc-exactprint") - (version "0.6.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ghc-exactprint" version)) - (sha256 - (base32 - "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw")))) + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "ghc-exactprint" version)) + (sha256 + (base32 + "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-exactprint"))) - (inputs - (list ghc-paths ghc-syb ghc-free)) - (native-inputs - (list ghc-hunit ghc-diff ghc-silently ghc-filemanip)) - (home-page - "https://hackage.haskell.org/package/ghc-exactprint") + (inputs (list ghc-ordered-containers + ghc-data-default + ghc-paths + ghc-syb + ghc-free + ghc-fail)) + (native-inputs (list ghc-hunit ghc-diff ghc-silently ghc-filemanip)) + (arguments + `(#:cabal-revision ("1" + "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"))) + (home-page "http://hackage.haskell.org/package/ghc-exactprint") (synopsis "ExactPrint for GHC") (description "Using the API Annotations available from GHC 7.10.2, this library @@ -3884,22 +3761,21 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.9") - (source - (origin - (method url-fetch) - (uri (hackage-uri "extra" version)) - (sha256 - (base32 - "17fzmxwrv0w7inhq7kia36prc2nsx845r9v56sihqvr17fk2cvpn")))) + (version "1.7.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "extra" version)) + (sha256 + (base32 + "0g5h8fp0nq4k9asiknw0bhvb10zpfnsixfp0n3xz0rc83pnajwg5")))) (build-system haskell-build-system) (properties '((upstream-name . "extra"))) - (inputs - (list ghc-clock ghc-semigroups ghc-quickcheck - ghc-quickcheck-instances)) - (home-page "https://github.com/ndmitchell/extra") + (inputs (list ghc-clock)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-instances)) + (home-page "https://github.com/ndmitchell/extra#readme") (synopsis "Extra Haskell functions") - (description "This library provides extra functions for the standard + (description + "This library provides extra functions for the standard Haskell libraries. Most functions are simple additions, filling out missing functionality. A few functions are available in later versions of GHC, but this package makes them available back to GHC 7.2.") @@ -3933,21 +3809,19 @@ when used with GHC versions which already provide the (define-public ghc-fast-logger (package (name "ghc-fast-logger") - (version "3.0.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "fast-logger" version)) - (sha256 - (base32 - "1mbnah6n8lig494523czcd95dfn01f438qai9pf20wpa2gdbz4x6")))) + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "fast-logger" version)) + (sha256 + (base32 + "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3")))) (build-system haskell-build-system) (properties '((upstream-name . "fast-logger"))) - (inputs - (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat)) - (native-inputs - (list hspec-discover ghc-hspec)) - (home-page "https://hackage.haskell.org/package/fast-logger") + (inputs (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat + ghc-bytestring-builder hspec-discover)) + (native-inputs (list ghc-hspec)) + (home-page "https://github.com/kazu-yamamoto/logger") (synopsis "Fast logging system") (description "This library provides a fast logging system for Haskell.") (license license:bsd-3))) @@ -3955,37 +3829,35 @@ when used with GHC versions which already provide the (define-public ghc-feed (package (name "ghc-feed") - (version "1.3.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "feed" version)) - (sha256 - (base32 - "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk")))) + (version "1.3.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "feed" version)) + (sha256 + (base32 + "0marh7qmggq1z5339nid3gil7k786d3yk79b0rwfkxxaxmr41xd8")))) (build-system haskell-build-system) (properties '((upstream-name . "feed"))) - (arguments `(#:tests? #f)) ; TODO: Fail. - (inputs - (list ghc-base-compat - ghc-old-locale - ghc-old-time - ghc-safe - ghc-time-locale-compat - ghc-utf8-string - ghc-xml-conduit - ghc-xml-types)) - (native-inputs - (list ghc-doctest-driver-gen - ghc-doctest - ghc-hunit - ghc-markdown-unlit - ghc-syb - ghc-test-framework - ghc-test-framework-hunit)) - (home-page "https://github.com/bergmark/feed") + (inputs (list ghc-base-compat + ghc-old-locale + ghc-old-time + ghc-safe + ghc-time-locale-compat + ghc-utf8-string + ghc-xml-types + ghc-xml-conduit)) + (native-inputs (list ghc-hunit + ghc-markdown-unlit + ghc-syb + ghc-test-framework + ghc-test-framework-hunit + ghc-doctest + ghc-doctest-driver-gen)) + (arguments (list #:tests? #f)) ; Must be installed before testing. + (home-page "https://github.com/haskell-party/feed") (synopsis "Haskell package for handling various syndication formats") - (description "This Haskell package includes tools for generating and + (description + "This Haskell package includes tools for generating and consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (license license:bsd-3))) @@ -4004,15 +3876,14 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (build-system haskell-build-system) (properties '((upstream-name . "fgl"))) (arguments - `(#:phases + `(#:cabal-revision ("1" + "0d5b88j42a3f50b7kbksszvwvcgr59f8pcg3p6cvzq9f4n7y51s7") + #:phases (modify-phases %standard-phases (add-before 'configure 'update-constraints (lambda _ (substitute* "fgl.cabal" - (("QuickCheck >= 2\\.8 && < 2\\.13") - "QuickCheck >= 2.8 && < 2.14") - (("hspec >= 2\\.1 && < 2\\.7") - "hspec >= 2.1 && < 2.8"))))))) + (("hspec >= 2\\.1 && < 2\\.8") "hspec"))))))) (inputs (list ghc-hspec ghc-quickcheck)) (home-page "https://web.engr.oregonstate.edu/~erwig/fgl/haskell") @@ -4039,6 +3910,13 @@ encourages inductive, recursive definitions of graph algorithms.") (properties '((upstream-name . "fgl-arbitrary"))) (inputs (list ghc-fgl ghc-quickcheck ghc-hspec)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl-arbitrary.cabal" + (("hspec >= 2\\.1 && < 2\\.8") "hspec"))))))) (home-page "https://hackage.haskell.org/package/fgl-arbitrary") (synopsis "QuickCheck support for fgl") (description @@ -4091,24 +3969,31 @@ directories. It includes code for pattern matching, finding files, modifying file contents, and more.") (license license:bsd-3))) +;; Deprecated. (define-public ghc-filepath-bytestring (package (name "ghc-filepath-bytestring") - (version "1.4.2.1.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "filepath-bytestring" version)) - (sha256 - (base32 - "0qrrvbjpjsk75ghqrdqzwqg7wjgm3rr9kk7p04ax98ilv90pm0ip")))) + (version "1.4.2.1.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "filepath-bytestring" version)) + (sha256 + (base32 + "0i8j724fz8h1bcqvlvp3sxmgyrvx2sim74cvzkpc9m05yn9p27sq")))) (build-system haskell-build-system) (properties '((upstream-name . "filepath-bytestring"))) - (native-inputs - (list ghc-quickcheck)) - (home-page "https://hackage.haskell.org/package/filepath-bytestring") + (native-inputs (list ghc-quickcheck)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "filepath-bytestring.cabal" + (("filepath >= 1\\.4\\.2 && <= 1\\.4\\.2\\.1") "filepath"))))))) + (home-page "http://hackage.haskell.org/package/filepath-bytestring") (synopsis "Library for manipulating RawFilePaths in a cross-platform way") - (description "This package provides a drop-in replacement for the standard + (description + "This package provides a drop-in replacement for the standard @code{filepath} library, operating on @code{RawFilePath} values rather than @code{FilePath} values to get the speed benefits of using @code{ByteStrings}.") (license license:bsd-3))) @@ -4138,22 +4023,22 @@ an executable.") (define-public ghc-fingertree (package (name "ghc-fingertree") - (version "0.1.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "fingertree" version)) - (sha256 - (base32 - "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm")))) + (version "0.1.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "fingertree" version)) + (sha256 + (base32 + "0wdzpli8bpgk8lrsp105zb0y5gn1r2029laclvhz264bza93q9pk")))) (build-system haskell-build-system) (properties '((upstream-name . "fingertree"))) - (native-inputs - (list ghc-hunit ghc-quickcheck ghc-test-framework - ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "https://hackage.haskell.org/package/fingertree") + (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (home-page "http://hackage.haskell.org/package/fingertree") (synopsis "Generic finger-tree structure") - (description "This library provides finger trees, a general sequence + (description + "This library provides finger trees, a general sequence representation with arbitrary annotations, for use as a base for implementations of various collection types. It includes examples, as described in section 4 of Ralf Hinze and Ross Paterson, \"Finger trees: a @@ -4163,15 +4048,16 @@ simple general-purpose data structure\".") (define-public ghc-finite-typelits (package (name "ghc-finite-typelits") - (version "0.1.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "finite-typelits" version)) - (sha256 - (base32 "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj")))) + (version "0.1.6.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "finite-typelits" version)) + (sha256 + (base32 + "0f047dywlxiz3pl3rq6maym9wpwjwl4zjqfwlwnj0yiv7dmlaiih")))) (build-system haskell-build-system) (properties '((upstream-name . "finite-typelits"))) + (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/mniip/finite-typelits") (synopsis "Finitely many values, indexed by type-level naturals") (description @@ -4225,31 +4111,30 @@ completely unverified though.") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.4.12") - (source - (origin - (method url-fetch) - (uri (hackage-uri "foldl" version)) - (sha256 - (base32 - "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag")))) + (version "1.4.13") + (source (origin + (method url-fetch) + (uri (hackage-uri "foldl" version)) + (sha256 + (base32 + "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw")))) (build-system haskell-build-system) (properties '((upstream-name . "foldl"))) - (outputs '("out" "static" "doc")) - (inputs (list ghc-comonad - ghc-contravariant - ghc-hashable + (inputs (list ghc-random ghc-primitive + ghc-vector + ghc-unordered-containers + ghc-hashable + ghc-contravariant ghc-profunctors - ghc-random ghc-semigroupoids - ghc-semigroups - ghc-unordered-containers - ghc-vector)) + ghc-comonad + ghc-semigroups)) (native-inputs (list ghc-doctest)) - (home-page "https://github.com/Gabriel439/Haskell-Foldl-Library") + (home-page "http://hackage.haskell.org/package/foldl") (synopsis "Composable, streaming, and efficient left folds for Haskell") - (description "This Haskell library provides strict left folds that stream + (description + "This Haskell library provides strict left folds that stream in constant memory, and you can combine folds using @code{Applicative} style to derive new folds. Derived folds still traverse the container just once and are often as efficient as hand-written folds.") @@ -4258,27 +4143,15 @@ and are often as efficient as hand-written folds.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.26.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "foundation" version)) - (sha256 - (base32 - "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d")))) + (version "0.0.29") + (source (origin + (method url-fetch) + (uri (hackage-uri "foundation" version)) + (sha256 + (base32 + "1hbkh6a3g6wsj2z48pjimd7djkm82mdxfwc24bnmmzag8amrp0rl")))) (build-system haskell-build-system) (properties '((upstream-name . "foundation"))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; This test is broken. For details, see - ;; https://github.com/haskell-foundation/foundation/issues/530 - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "tests/Test/Foundation/Number.hs" - ((", testDividible proxy") "")) - #t))))) - (outputs '("out" "static" "doc")) (inputs (list ghc-basement)) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Alternative prelude with batteries and no dependencies") @@ -4297,37 +4170,33 @@ Foundation has the following goals: @item Numerical classes that better represent mathematical things (no more all-in-one @code{Num}); @item I/O system with less lazy IO. -@end enumerate\n") +@end enumerate +") (license license:bsd-3))) (define-public ghc-free (package (name "ghc-free") - (version "5.1.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "free" version)) - (sha256 - (base32 - "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j")))) - (build-system haskell-build-system) + (version "5.1.10") + (source (origin + (method url-fetch) + (uri (hackage-uri "free" version)) + (sha256 + (base32 + "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj")))) + (build-system haskell-build-system) (properties '((upstream-name . "free"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-prelude-extras - ghc-profunctors - ghc-exceptions - ghc-bifunctors - ghc-comonad - ghc-distributive - ghc-semigroupoids - ghc-semigroups - ghc-transformers-base - ghc-transformers-compat)) - (home-page "https://github.com/ekmett/free/") + (inputs (list ghc-comonad + ghc-distributive + ghc-indexed-traversable + ghc-semigroupoids + ghc-th-abstraction + ghc-transformers-base + ghc-profunctors)) + (home-page "http://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") - (description "This library provides free monads, which are useful for many + (description + "This library provides free monads, which are useful for many tree-like structures and domain specific languages. If @code{f} is a @code{Functor} then the free @code{Monad} on @code{f} is the type of trees whose nodes are labeled with the constructors of @code{f}. The word \"free\" @@ -4367,22 +4236,19 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.14.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "generic-deriving" version)) - (sha256 - (base32 - "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7")))) + (version "1.14.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "generic-deriving" version)) + (sha256 + (base32 + "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6")))) (build-system haskell-build-system) (properties '((upstream-name . "generic-deriving"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-th-abstraction)) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/generic-deriving") + (inputs (list ghc-th-abstraction)) + ;(native-inputs (list ghc-hspec)) + (arguments (list #:tests? #f)) ;; Cannot resolve package cycle. + (home-page "https://github.com/dreixel/generic-deriving") (synopsis "Generalise the deriving mechanism to arbitrary classes") (description "This package provides functionality for generalising the deriving mechanism in Haskell to arbitrary classes.") @@ -4391,23 +4257,17 @@ deriving mechanism in Haskell to arbitrary classes.") (define-public ghc-generic-random (package (name "ghc-generic-random") - (version "1.2.0.0") + (version "1.5.0.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/generic-random/" - "generic-random-" version ".tar.gz")) + (uri (hackage-uri "generic-random" version)) (sha256 - (base32 "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv")))) + (base32 "02iczjf2xc4sxfi234nf6irfj5slvf3p5hpaxl8r5nc8hy052d6x")))) (build-system haskell-build-system) (properties `((upstream-name . "generic-random"))) (inputs (list ghc-quickcheck)) - (native-inputs - (list ghc-inspection-testing)) - (arguments - `(#:cabal-revision - ("1" "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4"))) + (native-inputs (list ghc-inspection-testing ghc-inspection-testing)) (home-page "https://github.com/lysxia/generic-random") (synopsis @@ -4429,83 +4289,47 @@ trivially terminating generator given explicitly (@code{genericArbitraryRec} and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (license license:expat))) -(define-public ghc-generic-random-1.3.0.1 - (package - (inherit ghc-generic-random) - (version "1.4.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "generic-random" version)) - (sha256 - (base32 "12rvb1dzrfjc46n9vdcw3yv773iih8vwhrac3hpzq70yp2z77jdw")))) - (arguments '()))) - (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.5.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "generics-sop" version)) - (sha256 - (base32 - "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1")))) + (version "0.5.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "generics-sop" version)) + (sha256 + (base32 + "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3")))) (build-system haskell-build-system) (properties '((upstream-name . "generics-sop"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-sop-core ghc-th-abstraction)) - (home-page "https://github.com/well-typed/generics-sop") + (inputs (list ghc-sop-core ghc-th-abstraction)) + (arguments + `(#:cabal-revision ("1" + "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8"))) + (home-page "http://hackage.haskell.org/package/generics-sop") (synopsis "Generic Programming using True Sums of Products for Haskell") - (description "This Haskell package supports the definition of generic + (description + "This Haskell package supports the definition of generic functions. Datatypes are viewed in a uniform, structured way: the choice between constructors is represented using an n-ary sum, and the arguments of each constructor are represented using an n-ary product.") (license license:bsd-3))) -(define-public ghc-geniplate-mirror - (package - (name "ghc-geniplate-mirror") - (version "0.7.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "geniplate-mirror" version)) - (sha256 - (base32 "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb")))) - (build-system haskell-build-system) - (properties '((upstream-name . "geniplate-mirror"))) - (home-page "https://github.com/danr/geniplate") - (synopsis "Use Template Haskell to generate Uniplate-like functions") - (description - "Use Template Haskell to generate Uniplate-like functions. This is a -maintained mirror of the @uref{https://hackage.haskell.org/package/geniplate, -geniplate} package, written by Lennart Augustsson.") - (license license:bsd-3))) - (define-public ghc-genvalidity (package (name "ghc-genvalidity") - (version "0.11.0.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "genvalidity" version)) - (sha256 - (base32 - "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j")))) + (version "1.1.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "genvalidity" version)) + (sha256 + (base32 + "08xvbgzhi9f2s3g81zzd8yhrn66mr84m0dvp478nrbck19jdg5sq")))) (build-system haskell-build-system) (properties '((upstream-name . "genvalidity"))) - (inputs - (list ghc-quickcheck ghc-validity)) - (native-inputs - (list ghc-hspec hspec-discover ghc-hspec-core)) - (home-page - "https://github.com/NorfairKing/validity") - (synopsis - "Testing utilities for the @code{validity} library") + (inputs (list ghc-quickcheck ghc-random ghc-validity)) + (native-inputs (list ghc-hspec ghc-hspec-core hspec-discover)) + (home-page "https://github.com/NorfairKing/validity#readme") + (synopsis "Testing utilities for the @code{validity} library") (description "This package provides testing utilities that are useful in conjunction with the @code{Validity} typeclass.") @@ -4514,28 +4338,19 @@ with the @code{Validity} typeclass.") (define-public ghc-genvalidity-property (package (name "ghc-genvalidity-property") - (version "0.5.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "genvalidity-property" version)) - (sha256 - (base32 - "0cvzc4z4771vpycwfgcj0yswyglzl6cl1h2wrfhs224nrcmk5a7z")))) + (version "1.0.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "genvalidity-property" version)) + (sha256 + (base32 + "1nxcdq04rkckrb3v49pjx378n5s828k24x7hix6manyxqmd3hplw")))) (build-system haskell-build-system) (properties '((upstream-name . "genvalidity-property"))) - (inputs - (list ghc-quickcheck - ghc-genvalidity - ghc-hspec - hspec-discover - ghc-pretty-show - ghc-validity)) - (native-inputs (list ghc-doctest)) - (home-page - "https://github.com/NorfairKing/validity") - (synopsis - "Standard properties for functions on @code{Validity} types") + (inputs (list ghc-quickcheck ghc-genvalidity ghc-hspec ghc-pretty-show + ghc-validity hspec-discover)) + (home-page "https://github.com/NorfairKing/validity#readme") + (synopsis "Standard properties for functions on @code{Validity} types") (description "This package supplements the @code{Validity} typeclass with standard properties for functions operating on them.") @@ -4589,16 +4404,19 @@ info for more informative bug reports.") (define-public ghc-glob (package (name "ghc-glob") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (hackage-uri "Glob" version)) (sha256 (base32 - "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a")))) + "1h3kh46qds4nqvixm4myy1kb5slg53f44hfn8aymrlr7hjn75xka")))) (build-system haskell-build-system) (properties '((upstream-name . "Glob"))) + (arguments + `(#:cabal-revision + ("3" "1080rd5073g87rfm5whimb72b75105lqanybrbsfi14gmvndnbfx"))) (inputs (list ghc-dlist ghc-semigroups ghc-transformers-compat)) (native-inputs @@ -4613,21 +4431,20 @@ matching patterns against file paths.") (define-public ghc-gluraw (package (name "ghc-gluraw") - (version "2.0.0.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "GLURaw" version)) - (sha256 - (base32 - "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) + (version "2.0.0.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "GLURaw" version)) + (sha256 + (base32 + "1b3rnva77k9naw5bl573bqgmsq7n9i8rrrvfvhbjcndqgmzhkini")))) (build-system haskell-build-system) (properties '((upstream-name . "GLURaw"))) - (inputs - (list ghc-openglraw)) - (home-page "https://wiki.haskell.org/Opengl") + (inputs (list ghc-openglraw)) + (home-page "http://www.haskell.org/haskellwiki/Opengl") (synopsis "Raw Haskell bindings GLU") - (description "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL + (description + "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer interface.") (license license:bsd-3))) @@ -4657,32 +4474,18 @@ programs.") (define-public ghc-gnuplot (package (name "ghc-gnuplot") - (version "0.5.6.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "gnuplot" version)) - (sha256 - (base32 "1rfq94lnsyjr8y9p5r56jpllv3p8rvh9xxzjji016b6r5adi8cnb")))) + (version "0.5.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "gnuplot" version)) + (sha256 + (base32 + "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3")))) (build-system haskell-build-system) (properties '((upstream-name . "gnuplot"))) - (inputs - (list ghc-temporary - ghc-utility-ht - ghc-data-accessor-transformers - ghc-data-accessor - ghc-semigroups - gnuplot)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-path-to-gnuplot - (lambda* (#:key inputs #:allow-other-keys) - (let ((gnuplot (assoc-ref inputs "gnuplot"))) - (substitute* "os/generic/Graphics/Gnuplot/Private/OS.hs" - (("(gnuplotName = ).*$" all cmd) - (string-append cmd "\"" gnuplot "/bin/gnuplot\""))))))))) - (home-page "https://wiki.haskell.org/Gnuplot") + (inputs (list ghc-temporary ghc-utility-ht ghc-data-accessor-transformers + ghc-data-accessor ghc-semigroups)) + (home-page "http://www.haskell.org/haskellwiki/Gnuplot") (synopsis "2D and 3D plots using gnuplot") (description "This package provides a Haskell module for creating 2D and 3D plots using gnuplot.") @@ -4710,6 +4513,9 @@ programs.") (native-inputs (list ghc-hspec graphviz ghc-fgl-arbitrary ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("2" + "110yp1h2jrswllnx2ks772g10v9h4vqxc07b33wfaksyim9769bp"))) (home-page "https://hackage.haskell.org/package/graphviz") (synopsis "Bindings to Graphviz for graph visualisation") (description @@ -4752,20 +4558,17 @@ monoid with invertibility.") (define-public ghc-gtk2hs-buildtools (package (name "ghc-gtk2hs-buildtools") - (version "0.13.8.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "gtk2hs-buildtools" version)) - (sha256 - (base32 - "102x753jbc90lfm9s0ng5kvm0risqwpar331xwsd752as0bms142")))) + (version "0.13.8.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "gtk2hs-buildtools" version)) + (sha256 + (base32 + "0fcm0v32hm9j908nyziia16ahb181y9hqppsy18clx2prvj480rv")))) (build-system haskell-build-system) (properties '((upstream-name . "gtk2hs-buildtools"))) - (inputs - (list ghc-random ghc-hashtables)) - (native-inputs - (list ghc-alex ghc-happy)) + (inputs (list ghc-random ghc-hashtables)) + (native-inputs (list ghc-alex ghc-happy)) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") (description @@ -4780,42 +4583,37 @@ tools are not needed to actually run Gtk2Hs programs.") (define-public ghc-hackage-security (package (name "ghc-hackage-security") - (version "0.6.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hackage-security" version)) - (sha256 - (base32 - "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli")))) + (version "0.6.2.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "hackage-security" version)) + (sha256 + (base32 + "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj")))) (build-system haskell-build-system) (properties '((upstream-name . "hackage-security"))) - (arguments - `(#:cabal-revision - ("8" "1xpzcdpfz0agbv75sadsylq6r8pq7zr0pyzbzrz0nz130yixsv5f") - #:tests? #f)) ; Tests fail because of framework updates. - (inputs - (list ghc-base16-bytestring - ghc-base64-bytestring - ghc-cryptohash-sha256 - ghc-ed25519 - ghc-lukko - ghc-network - ghc-network-uri - ghc-tar - ghc-zlib)) - (native-inputs - (list ghc-aeson - ghc-quickcheck - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-temporary - ghc-unordered-containers - ghc-vector)) + (inputs (list ghc-base16-bytestring + ghc-base64-bytestring + ghc-ed25519 + ghc-cryptohash-sha256 + ghc-tar + ghc-zlib + ghc-lukko + ghc-cabal-syntax + ghc-network-uri + ghc-network)) + (native-inputs (list ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-quickcheck + ghc-aeson + ghc-vector + ghc-unordered-containers + ghc-temporary)) (home-page "https://github.com/haskell/hackage-security") (synopsis "Hackage security library") - (description "This Hackage security library provides both server and + (description + "This Hackage security library provides both server and client utilities for securing @uref{http://hackage.haskell.org/, the Hackage package server}. It is based on @uref{http://theupdateframework.com/, The Update Framework}, a set of @@ -4827,14 +4625,14 @@ Tor project}.") (define-public ghc-haddock (package (name "ghc-haddock") - (version "2.24.2") + (version "2.26.0") (source (origin (method url-fetch) (uri (hackage-uri "haddock" version)) (sha256 (base32 - "1ha4hrnidwkmwalqwd1ixa2933as5n4sj1lvz0cx89a3png7r930")))) + "0jqp37pbz4zjqc3dm0jkcsdqsh2ql9ygnr06m75bbk330yqchnl3")))) (build-system haskell-build-system) (properties '((upstream-name . "haddock"))) (arguments @@ -4860,20 +4658,28 @@ Tor project}.") (define-public ghc-haddock-api (package (name "ghc-haddock-api") - (version "2.24.2") + (version "2.26.0") (source (origin (method url-fetch) (uri (hackage-uri "haddock-api" version)) (sha256 (base32 - "1jj2csi85nlywsyvnbwhclfdz27j2kyfbhrl9cm7av0243br9vg1")))) + "0ris5m61vig5nh5y2ddm98midl3v51vzgfgvsfyhm3nwk5hif6ay")))) (build-system haskell-build-system) (properties '((upstream-name . "haddock-api"))) (inputs (list ghc-paths ghc-haddock-library)) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "haddock-api.cabal" + (("haddock-library \\^>= 1\\.9\\.0") "haddock-library") + (("hspec \\^>= 2.8") "hspec"))))))) (home-page "https://www.haskell.org/haddock/") (synopsis "API for documentation-generation tool Haddock") (description "This package provides an API to Haddock, the @@ -4893,7 +4699,16 @@ documentation-generation tool for Haskell libraries.") "15ak06q8yp11xz1hwr0sg2jqi3r78p1n89ik05hicqvxl3awf1pq")))) (build-system haskell-build-system) (properties '((upstream-name . "haddock-library"))) - (arguments `(#:tests? #f)) ; TODO: optparse-applicative ==0.15.*, tree-diff ==0.1.* + (arguments + `(#:cabal-revision ("3" + "1fnfcr3gvdjrya0czr3k2sqv4xmmvyv66yni2mckfppra93mcglg") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "haddock-library.cabal" + (("(base-compat|hspec|optparse-applicative|tree-diff)\\s+[^,]+" all dep) + dep))))))) (native-inputs (list ghc-base-compat ghc-hspec @@ -4999,24 +4814,22 @@ Happy works in a similar way to the yacc tool for C.") (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.3.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hashable" version)) - (sha256 - (base32 - "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2")))) + (version "1.4.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "hashable" version)) + (sha256 + (base32 + "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1")))) (build-system haskell-build-system) (properties '((upstream-name . "hashable"))) - (arguments - `(#:tests? #f ; TODO: Tests require random<1.2 - #:cabal-revision - ("2" "16va8hx4ynw0n5s2warhs13ilj7hrs5fcdn140h1fiix480as36n"))) - (native-inputs - (list ghc-test-framework ghc-test-framework-hunit - ghc-test-framework-quickcheck2 ghc-hunit ghc-quickcheck)) - (home-page "https://github.com/tibbe/hashable") + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-random + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (home-page "http://github.com/haskell-unordered-containers/hashable") (synopsis "Class for types that can be converted to a hash value") (description "This package defines a class, @code{Hashable}, for types that can be @@ -5035,55 +4848,29 @@ combine hash values.") (native-inputs '()) (properties '((hidden? #t))))) -(define-public ghc-hashable-time - (package - (name "ghc-hashable-time") - (version "0.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hashable-time" version)) - (sha256 - (base32 - "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh")))) - (build-system haskell-build-system) - (properties '((upstream-name . "hashable-time"))) - (arguments - `(#:cabal-revision - ("1" "151gxiprdlj3masa95vvrxal9nwa72n3p1y15xyj4hp7mvvl4s2l"))) - (inputs - (list ghc-hashable ghc-time-compat)) - (home-page "https://hackage.haskell.org/package/hashable-time") - (synopsis "Hashable instances for Data.Time") - (description - "This package provides @code{Hashable} instances for types in -@code{Data.Time}.") - (license license:bsd-3))) - (define-public ghc-hashtables (package (name "ghc-hashtables") - (version "1.2.4.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hashtables" version)) - (sha256 - (base32 "0vgggm7bqq55zmqj6qji89bfj3k1rdkikkfhyg81vsqf0f3bzhqa")))) + (version "1.3.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hashtables" version)) + (sha256 + (base32 + "1hsrihk948xfpy14qrhar50b41kp60i1rx8bkadjg1xb4bml0gbg")))) (build-system haskell-build-system) (properties '((upstream-name . "hashtables"))) - (inputs - (list ghc-hashable ghc-primitive ghc-vector)) - (native-inputs - (list ghc-mwc-random - ghc-quickcheck - ghc-hunit - ghc-test-framework - ghc-test-framework-quickcheck2 - ghc-test-framework-hunit)) - (home-page "https://github.com/gregorycollins/hashtables") + (inputs (list ghc-hashable ghc-primitive ghc-vector)) + (native-inputs (list ghc-mwc-random + ghc-quickcheck + ghc-hunit + ghc-test-framework + ghc-test-framework-quickcheck2 + ghc-test-framework-hunit)) + (home-page "http://github.com/gregorycollins/hashtables") (synopsis "Haskell Mutable hash tables in the ST monad") - (description "This package provides a Haskell library including a + (description + "This package provides a Haskell library including a couple of different implementations of mutable hash tables in the ST monad, as well as a typeclass abstracting their common operations, and a set of wrappers to use the hash tables in the IO monad.") @@ -5092,23 +4879,31 @@ a set of wrappers to use the hash tables in the IO monad.") (define-public ghc-haskeline (package (name "ghc-haskeline") - (version "0.8.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "haskeline" version)) - (sha256 - (base32 - "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb")))) + (version "0.8.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "haskeline" version)) + (sha256 + (base32 + "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc")))) (build-system haskell-build-system) (properties '((upstream-name . "haskeline"))) - (inputs (list ghc-exceptions)) - (native-inputs (list ghc-hunit)) - ;; FIXME: Tests failing - (arguments `(#:tests? #f)) + (native-inputs (list ghc-hunit which)) + (arguments + (list + #:tests? #f ; Cannot run binary haskeline-examples-Test, which is just + ; built, even with PATH and LD_LIBRARY_PATH set. + #:cabal-revision + '("3" "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-which + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/Unit.hs" + (("\"which\"") + (string-append "\"" (search-input-file inputs "/bin/which") "\"")))))))) (home-page "https://github.com/judah/haskeline") - (synopsis - "Command-line interface for user input, written in Haskell") + (synopsis "Command-line interface for user input, written in Haskell") (description "Haskeline provides a user interface for line input in command-line programs. This library is similar in purpose to readline, but since it is @@ -5121,43 +4916,38 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (define-public ghc-haskell-lexer (package (name "ghc-haskell-lexer") - (version "1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "haskell-lexer" version)) - (sha256 - (base32 "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii")))) + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "haskell-lexer" version)) + (sha256 + (base32 + "0jgkv1api3w7i9j5z01h7qdx2i9cp93h54hp9hj1bw9hk9bdmvn8")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-lexer"))) - (home-page "https://hackage.haskell.org/package/haskell-lexer") + (home-page "https://github.com/yav/haskell-lexer") (synopsis "Fully compliant Haskell 98 lexer") - (description - "This package provides a fully compliant Haskell 98 lexer.") - (license license:bsd-3))) + (description "This package provides a fully compliant Haskell 98 lexer.") + (license license:expat))) (define-public ghc-haskell-src (package (name "ghc-haskell-src") - (version "1.0.3.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "haskell-src" version)) - (sha256 - (base32 - "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746")))) + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "haskell-src" version)) + (sha256 + (base32 + "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src"))) + (inputs (list ghc-happy ghc-syb)) (arguments - `(#:cabal-revision - ("4" "0cyqdw77clzz7mq0b4c0jg2d1kdz9xii41268w2psmqmfpyn29pc"))) - (inputs - (list ghc-happy ghc-syb)) - (home-page - "https://hackage.haskell.org/package/haskell-src") - (synopsis - "Support for manipulating Haskell source code") + `(#:cabal-revision ("1" + "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"))) + (home-page "http://hackage.haskell.org/package/haskell-src") + (synopsis "Support for manipulating Haskell source code") (description "The @code{haskell-src} package provides support for manipulating Haskell source code. The package provides a lexer, parser and pretty-printer, and a @@ -5218,23 +5008,20 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.7") + (version "0.8.11") (source (origin (method url-fetch) (uri (hackage-uri "haskell-src-meta" version)) (sha256 (base32 - "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in")))) + "1wks0xb7ah2gj9n0ffbcaskjihy45l99qkf2h9k13cyfvqkzp9rw")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src-meta"))) - (inputs - (list ghc-haskell-src-exts ghc-syb ghc-th-orphans)) - (native-inputs - (list ghc-hunit ghc-tasty ghc-tasty-hunit)) - (home-page "https://hackage.haskell.org/package/haskell-src-meta") + (inputs (list ghc-haskell-src-exts ghc-syb ghc-th-orphans)) + (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit)) + (home-page "http://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") - (description - "This package provides tools to parse Haskell sources to the + (description "This package provides tools to parse Haskell sources to the template-haskell abstract syntax.") (license license:bsd-3))) @@ -5253,7 +5040,7 @@ template-haskell abstract syntax.") (properties '((upstream-name . "hasktags"))) (arguments `(#:cabal-revision - ("1" "0q39ssdgm6lcmqj92frjvr53i34divx53zli0qar39mx8ka1l8ml"))) + ("2" "0f3v6k3bvsczz0z5i09286c0i74wz782vayzyp5lndqvrx3b4g0x"))) (inputs (list ghc-system-filepath ghc-optparse-applicative)) (native-inputs @@ -5314,52 +5101,25 @@ descriptions.") (define-public ghc-hindent (package (name "ghc-hindent") - (version "5.3.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hindent" version)) - (sha256 - (base32 - "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7")))) + (version "5.3.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "hindent" version)) + (sha256 + (base32 + "1pc20iza3v0ljzbx6cycm1j1kbmz8h95xwfq47fd6zfmsrx9w6vn")))) (build-system haskell-build-system) (properties '((upstream-name . "hindent"))) - (arguments - `(#:modules ((guix build haskell-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%haskell-build-system-modules - (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'emacs-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (elisp-file "elisp/hindent.el") - (dest (string-append out "/share/emacs/site-lisp")) - (emacs (search-input-file inputs "/bin/emacs"))) - (make-file-writable elisp-file) - (emacs-substitute-variables elisp-file - ("hindent-process-path" - (string-append out "/bin/hindent"))) - (install-file elisp-file dest) - (emacs-generate-autoloads "hindent" dest))))))) - (inputs - (list ghc-haskell-src-exts - ghc-monad-loops - ghc-utf8-string - ghc-exceptions - ghc-yaml - ghc-unix-compat - ghc-path - ghc-path-io - ghc-optparse-applicative)) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-diff" ,ghc-diff) - ("emacs" ,emacs-minimal))) - (home-page - "https://github.com/commercialhaskell/hindent") + (inputs (list ghc-haskell-src-exts + ghc-monad-loops + ghc-utf8-string + ghc-yaml + ghc-unix-compat + ghc-path + ghc-path-io + ghc-optparse-applicative)) + (native-inputs (list ghc-hspec ghc-diff)) + (home-page "https://github.com/mihaimaruseac/hindent") (synopsis "Extensible Haskell pretty printer") (description "This package provides automatic formatting for Haskell files. Both a @@ -5390,47 +5150,47 @@ accessed or modified.") (define-public ghc-hledger-lib (package (name "ghc-hledger-lib") - (version "1.21") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hledger-lib" version)) - (sha256 - (base32 - "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y")))) + (version "1.27.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hledger-lib" version)) + (sha256 + (base32 + "0w2jnpyfc6pp3n5fzdjd78hdh9vv9w98xwd2j6dw98rm6hlapwhb")))) (build-system haskell-build-system) (properties '((upstream-name . "hledger-lib"))) - (inputs - (list ghc-aeson - ghc-aeson-pretty - ghc-ansi-terminal - ghc-base-compat-batteries - ghc-blaze-markup - ghc-call-stack - ghc-cassava - ghc-cassava-megaparsec - ghc-cmdargs - ghc-data-default - ghc-decimal - ghc-extra - ghc-file-embed - ghc-glob - ghc-hashtables - ghc-megaparsec - ghc-old-time - ghc-parser-combinators - ghc-pretty-simple - ghc-regex-tdfa - ghc-safe - ghc-tabular - ghc-tasty - ghc-tasty-hunit - ghc-timeit - ghc-uglymemo - ghc-unordered-containers - ghc-utf8-string)) + (inputs (list ghc-decimal + ghc-glob + ghc-aeson + ghc-aeson-pretty + ghc-ansi-terminal + ghc-blaze-markup + ghc-breakpoint + ghc-call-stack + ghc-cassava + ghc-cassava-megaparsec + ghc-cmdargs + ghc-data-default + ghc-doclayout + ghc-extra + ghc-file-embed + ghc-hashtables + ghc-megaparsec + ghc-microlens + ghc-microlens-th + ghc-parser-combinators + ghc-pretty-simple + ghc-regex-tdfa + ghc-safe + ghc-tabular + ghc-tasty + ghc-tasty-hunit + ghc-timeit + ghc-uglymemo + ghc-unordered-containers + ghc-utf8-string)) (native-inputs (list ghc-doctest)) - (home-page "https://hledger.org") + (home-page "http://hledger.org") (synopsis "Reusable library providing the core functionality of hledger") (description "A reusable library containing hledger's core functionality. @@ -5574,10 +5334,11 @@ determine the hostname.") "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) (build-system haskell-build-system) (properties '((upstream-name . "hourglass"))) + (arguments (list #:tests? #f)) ; Tests incompatible with newer versions. (inputs (list ghc-old-locale)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) + ;(native-inputs + ; (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) (home-page "https://github.com/vincenthz/hs-hourglass") (synopsis "Simple time-related library for Haskell") (description @@ -5591,38 +5352,35 @@ representations of current time.") (define-public ghc-hpack (package (name "ghc-hpack") - (version "0.34.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hpack" version)) - (sha256 - (base32 - "0gmm6jgi1sgyilphww6apq1x04grqznm7xhyb7g1rj5j7my40ws2")))) + (version "0.35.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hpack" version)) + (sha256 + (base32 + "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g")))) (build-system haskell-build-system) (properties '((upstream-name . "hpack"))) - (inputs - (list ghc-aeson - ghc-bifunctors - ghc-cryptonite - ghc-glob - ghc-http-client - ghc-http-client-tls - ghc-http-types - ghc-infer-license - ghc-scientific - ghc-unordered-containers - ghc-vector - ghc-yaml)) - (native-inputs - (list ghc-hspec - ghc-hunit - ghc-interpolate - ghc-mockery - ghc-quickcheck - ghc-temporary - hspec-discover)) - (home-page "https://github.com/sol/hpack") + (inputs (list ghc-glob + ghc-aeson + ghc-bifunctors + ghc-cryptonite + ghc-http-client + ghc-http-client-tls + ghc-http-types + ghc-infer-license + ghc-scientific + ghc-unordered-containers + ghc-vector + ghc-yaml)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-hspec + ghc-interpolate + ghc-mockery + ghc-temporary + hspec-discover)) + (home-page "https://github.com/sol/hpack#readme") (synopsis "Tools for an alternative Haskell package format") (description "Hpack is a format for Haskell packages. It is an alternative to the @@ -5692,8 +5450,8 @@ MODS-format XML intermediate.") (build-system haskell-build-system) (properties '((upstream-name . "hslogger"))) (arguments - `(#:cabal-revision - ("3" "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"))) + `(#:cabal-revision ("6" + "0xiqjl646kxynsccc2q1q91sch7pfx3274yl2745fsqhpb115df1"))) (inputs (list ghc-network ghc-old-locale)) (native-inputs @@ -5709,29 +5467,29 @@ handler built in.") (define-public ghc-hslua (package (name "ghc-hslua") - (version "1.3.0.2") + (version "2.2.1") (source (origin (method url-fetch) (uri (hackage-uri "hslua" version)) (sha256 (base32 - "0p39xm0mmxzs5x6aim11qkb7npn0d9h7li2kwfhry0dijd1vm18i")))) + "1q587cjwb29jsf71hhmra6djr2sycbx2hr0rhwlgvb8ax699vkv3")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua"))) - (arguments - `(#:configure-flags '("-fsystem-lua") - #:extra-directories ("lua"))) - (inputs - (list lua ghc-base-compat)) - (native-inputs - (list ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-quickcheck - ghc-quickcheck-instances - ghc-fail - ghc-semigroups)) - (home-page "https://hackage.haskell.org/package/hslua") + (inputs (list ghc-hslua-aeson + ghc-hslua-core + ghc-hslua-classes + ghc-hslua-marshalling + ghc-hslua-objectorientation + ghc-hslua-packaging)) + (native-inputs (list ghc-lua + ghc-lua-arbitrary + ghc-quickcheck + ghc-quickcheck-instances + ghc-tasty-hslua + ghc-tasty + ghc-tasty-hunit)) + (home-page "https://hslua.org/") (synopsis "Lua language interpreter embedding in Haskell") (description "The Scripting.Lua module is a wrapper of the Lua language interpreter as @@ -5741,23 +5499,22 @@ described in @url{https://www.lua.org/}.") (define-public ghc-hslua-module-system (package (name "ghc-hslua-module-system") - (version "0.2.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-system" version)) - (sha256 - (base32 - "0hk2splyasbplnggknjhlb423axc5b32xq8aq8zal4vvwlqhzvf1")))) + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-system" version)) + (sha256 + (base32 + "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-system"))) - (inputs - (list ghc-hslua ghc-temporary)) - (native-inputs - (list ghc-tasty ghc-tasty-lua ghc-tasty-hunit)) - (home-page "https://github.com/hslua/hslua-module-system") + (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling + ghc-temporary)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) + (home-page "https://github.com/hslua/hslua") (synopsis "Lua module wrapper around Haskell's System module") - (description "This library provides access to system information and + (description + "This library provides access to system information and functionality to Lua scripts via Haskell's @code{System} module. Intended usage for this package is to preload it by adding the loader function to @code{package.preload}. Note that the Lua @code{package} library must have @@ -5767,21 +5524,18 @@ already been loaded before the loader can be added.") (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") - (version "0.3.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-text" version)) - (sha256 - (base32 - "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl")))) + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-text" version)) + (sha256 + (base32 + "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-text"))) - (inputs - (list ghc-hslua)) - (native-inputs - (list ghc-tasty ghc-tasty-lua ghc-tasty-hunit)) - (home-page "https://github.com/hslua/hslua-module-text") + (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) + (home-page "https://github.com/hslua/hslua") (synopsis "Lua module for text") (description "This package provides a UTF-8 aware subset of Lua's @code{string} module @@ -5792,28 +5546,23 @@ for Haskell. The functions provided by this module are @code{upper}, (define-public ghc-hsyaml (package (name "ghc-hsyaml") - (version "0.2.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "HsYAML" version)) - (sha256 - (base32 - "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0")))) + (version "0.2.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "HsYAML" version)) + (sha256 + (base32 + "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6")))) (build-system haskell-build-system) (properties '((upstream-name . "HsYAML"))) + (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-quickcheck)) (arguments - `(#:tests? #f ; TODO: Loops. - #:cabal-revision - ("2" "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc"))) -; (native-inputs -; `(("ghc-hsyaml" ,ghc-hsyaml) -; ("ghc-quickcheck" ,ghc-quickcheck) -; ("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + `(#:cabal-revision ("1" + "0jmbgrjywcblrd8k6zzv2b5givdz83f479y15v5gs0r93z25xpmv"))) (home-page "https://github.com/haskell-hvr/HsYAML") (synopsis "Pure Haskell YAML 1.2 parser") - (description "This library provides a + (description + "This library provides a @url{http://yaml.org/spec/1.2/spec.html, YAML 1.2} parser implementation for Haskell. Its features include: @@ -5843,34 +5592,31 @@ for user-defined custom schemas). (define-public ghc-http-api-data (package (name "ghc-http-api-data") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "http-api-data" version)) - (sha256 - (base32 - "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl")))) + (version "0.4.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "http-api-data" version)) + (sha256 + (base32 + "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz")))) (build-system haskell-build-system) (properties '((upstream-name . "http-api-data"))) (inputs (list ghc-attoparsec ghc-attoparsec-iso8601 + ghc-base-compat ghc-cookie ghc-hashable ghc-http-types + ghc-tagged ghc-time-compat ghc-unordered-containers ghc-uuid-types)) - (native-inputs - (list cabal-doctest - ghc-nats - ghc-hunit - ghc-hspec - ghc-quickcheck - ghc-quickcheck-instances - ghc-doctest - hspec-discover)) - (home-page "https://github.com/fizruk/http-api-data") + (native-inputs (list ghc-hunit ghc-hspec ghc-quickcheck + ghc-quickcheck-instances hspec-discover)) + (arguments + `(#:cabal-revision ("6" + "0q4rhz81r5v0z1mn7x9q0ldbfv1a2cp3dpw8s2j96halsq34l4zl"))) + (home-page "http://github.com/fizruk/http-api-data") (synopsis "Convert to/from HTTP API data like URL pieces, headers and query parameters") (description "This Haskell package defines typeclasses used for converting @@ -5968,19 +5714,18 @@ license from a given license file.") (define-public ghc-ini (package (name "ghc-ini") - (version "0.4.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ini" version)) - (sha256 - (base32 "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l")))) + (version "0.4.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "ini" version)) + (sha256 + (base32 + "0dp9c48vli8z6058yajnqg9hyf9swglk8ga4wcwl03aal7n8r7gp")))) (build-system haskell-build-system) (properties '((upstream-name . "ini"))) + (inputs (list ghc-attoparsec ghc-unordered-containers)) (native-inputs (list ghc-hspec)) - (inputs - (list ghc-attoparsec ghc-unordered-containers)) - (home-page "https://github.com/chrisdone/ini") + (home-page "https://github.com/andreasabel/ini") (synopsis "Haskell library to easily handle configuration files in the INI format") (description @@ -5991,23 +5736,24 @@ read and write configuration files in the simple INI format.") (define-public ghc-inline-c (package (name "ghc-inline-c") - (version "0.9.1.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "inline-c" version)) - (sha256 - (base32 - "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i")))) + (version "0.9.1.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "inline-c" version)) + (sha256 + (base32 + "06az494fp2nh6fnibq28yw8jsrpj4jq1swyx53a328qv04cbhrym")))) (build-system haskell-build-system) (properties '((upstream-name . "inline-c"))) - (inputs - (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers - ghc-unordered-containers ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-raw-strings-qq ghc-regex-posix - ghc-split)) - (home-page "https://hackage.haskell.org/package/inline-c") + (inputs (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers + ghc-unordered-containers ghc-vector)) + (native-inputs (list ghc-quickcheck + ghc-hspec + ghc-quickcheck + ghc-raw-strings-qq + ghc-regex-posix + ghc-split)) + (home-page "http://hackage.haskell.org/package/inline-c") (synopsis "Write Haskell source files including C code inline") (description "inline-c lets you seamlessly call C libraries and embed high-performance @@ -6019,21 +5765,18 @@ minimal overhead. No FFI required.") (define-public ghc-inline-c-cpp (package (name "ghc-inline-c-cpp") - (version "0.4.0.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "inline-c-cpp" version)) - (sha256 - (base32 - "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0")))) + (version "0.5.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "inline-c-cpp" version)) + (sha256 + (base32 + "0m14nb9brpnh2cgq8gg6182mdcmn45hf734la68dnhq23sn63lpx")))) (build-system haskell-build-system) (properties '((upstream-name . "inline-c-cpp"))) - (inputs - (list ghc-inline-c ghc-safe-exceptions)) - (native-inputs - (list ghc-hspec)) - (home-page "https://hackage.haskell.org/package/inline-c-cpp") + (inputs (list ghc-inline-c ghc-safe-exceptions)) + (native-inputs (list ghc-hspec ghc-vector)) + (home-page "http://hackage.haskell.org/package/inline-c-cpp") (synopsis "Lets you embed C++ code into Haskell") (description "This package provides utilities to inline C++ code into Haskell using @@ -6053,7 +5796,6 @@ minimal overhead. No FFI required.") "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv")))) (build-system haskell-build-system) (properties '((upstream-name . "integer-logarithms"))) - (arguments `(#:tests? #f)) ; TODO: Needs tasty<1.4 (native-inputs (list ghc-quickcheck ghc-smallcheck @@ -6061,6 +5803,17 @@ minimal overhead. No FFI required.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-tasty-smallcheck)) + (arguments + `(#:cabal-revision ("3" + "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym") + #:phases + (modify-phases %standard-phases + ;; Needs tasty<1.4 + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "integer-logarithms.cabal" + (("(tasty)\\s+[^,]+" all dep) + dep))))))) (home-page "https://github.com/Bodigrim/integer-logarithms") (synopsis "Integer logarithms") (description @@ -6153,32 +5906,32 @@ which represets a closed, convex set of floating point values.") (define-public ghc-invariant (package (name "ghc-invariant") - (version "0.5.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "invariant" version)) - (sha256 - (base32 - "1jlp0gbfjsx7k08275djh8m3v4rpg8llw5gdkg9s9qfx0lc0mymr")))) + (version "0.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "invariant" version)) + (sha256 + (base32 + "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm")))) (build-system haskell-build-system) (properties '((upstream-name . "invariant"))) - (inputs - (list ghc-bifunctors - ghc-comonad - ghc-contravariant - ghc-profunctors - ghc-semigroups - ghc-statevar - ghc-tagged - ghc-th-abstraction - ghc-transformers-compat - ghc-unordered-containers)) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) + (inputs (list ghc-bifunctors + ghc-comonad + ghc-contravariant + ghc-profunctors + ghc-statevar + ghc-tagged + ghc-th-abstraction + ghc-transformers-compat + ghc-unordered-containers)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37"))) (home-page "https://github.com/nfrisby/invariant-functors") (synopsis "Haskell98 invariant functors") - (description "Haskell98 invariant functors (also known as exponential + (description + "Haskell98 invariant functors (also known as exponential functors). For more information, see Edward Kmett's article @uref{http://comonad.com/reader/2008/rotten-bananas/, Rotten Bananas}.") (license license:bsd-2))) @@ -6186,31 +5939,24 @@ functors). For more information, see Edward Kmett's article (define-public ghc-io-streams (package (name "ghc-io-streams") - (version "1.5.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "io-streams" version)) - (sha256 - (base32 - "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny")))) + (version "1.5.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "io-streams" version)) + (sha256 + (base32 + "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk")))) (build-system haskell-build-system) (properties '((upstream-name . "io-streams"))) - (inputs - (list ghc-attoparsec - ghc-bytestring-builder - ghc-network - ghc-primitive - ghc-vector - ghc-zlib-bindings)) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-zlib)) - (home-page "https://hackage.haskell.org/package/io-streams") + (inputs (list ghc-attoparsec ghc-primitive ghc-vector ghc-zlib-bindings + ghc-network)) + (native-inputs (list ghc-zlib + ghc-hunit + ghc-quickcheck + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2)) + (home-page "http://hackage.haskell.org/package/io-streams") (synopsis "Simple and composable stream I/O") (description "This library contains simple and easy-to-use primitives for I/O using streams.") @@ -6230,8 +5976,8 @@ primitives for I/O using streams.") (build-system haskell-build-system) (properties '((upstream-name . "io-streams-haproxy"))) (arguments - `(#:cabal-revision - ("3" "02k9halblgnynlm781ahc81yxla8z7cck1gikm8555v78rf5hv7x"))) + `(#:cabal-revision ("6" + "024aw98q1x3fb1xq07qki3z446w6lk5gyjl13shy0dbrd5aafh92"))) (inputs (list ghc-attoparsec ghc-io-streams ghc-network)) (native-inputs @@ -6248,23 +5994,22 @@ through a forwarding proxy that is configured to speak this protocol.") (define-public ghc-iproute (package (name "ghc-iproute") - (version "1.7.11") - (source - (origin - (method url-fetch) - (uri (hackage-uri "iproute" version)) - (sha256 - (base32 - "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90")))) + (version "1.7.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "iproute" version)) + (sha256 + (base32 + "0qvb4d7nw8f6j4s09cnpn6z1rdwcwknwklfrhsgivg7wg4aisxgi")))) (build-system haskell-build-system) (properties '((upstream-name . "iproute"))) - (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, - ; exported by ghc-byteorder. Doctest issue. - (inputs - (list ghc-appar ghc-byteorder ghc-network ghc-safe)) - (home-page "https://www.mew.org/~kazu/proj/iproute/") + (inputs (list ghc-appar ghc-byteorder ghc-network ghc-semigroups)) + (native-inputs (list ghc-doctest ghc-hspec ghc-quickcheck ghc-safe + hspec-discover)) + (home-page "http://www.mew.org/~kazu/proj/iproute/") (synopsis "IP routing table") - (description "IP Routing Table is a tree of IP ranges to search one of + (description + "IP Routing Table is a tree of IP ranges to search one of them on the longest match base. It is a kind of TRIE with one way branching removed. Both IPv4 and IPv6 are supported.") (license license:bsd-3))) @@ -6272,24 +6017,26 @@ removed. Both IPv4 and IPv6 are supported.") (define-public ghc-ipynb (package (name "ghc-ipynb") - (version "0.1.0.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ipynb" version)) - (sha256 - (base32 - "0qky4l5aaiq7ypwbxh0mr7s572290fi596f18dg68qpyzc49a9kx")))) + (version "0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "ipynb" version)) + (sha256 + (base32 + "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s")))) (build-system haskell-build-system) (properties '((upstream-name . "ipynb"))) - (inputs - (list ghc-unordered-containers ghc-base64-bytestring ghc-aeson - ghc-semigroups)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit ghc-microlens-aeson ghc-microlens)) - (home-page "https://hackage.haskell.org/package/ipynb") + (inputs (list ghc-unordered-containers ghc-base64-bytestring ghc-aeson + ghc-semigroups)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-microlens-aeson + ghc-microlens)) + (arguments + `(#:cabal-revision ("1" + "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"))) + (home-page "http://hackage.haskell.org/package/ipynb") (synopsis "Data structure for working with Jupyter notebooks") - (description "This library defines a data structure for representing + (description + "This library defines a data structure for representing Jupyter notebooks, along with @code{ToJSON} and @code{FromJSON} instances for conversion to and from JSON .ipynb files.") (license license:bsd-3))) @@ -6346,18 +6093,16 @@ Notation, JSON} is a lightweight data-interchange format.") (define-public ghc-juicypixels (package (name "ghc-juicypixels") - (version "3.3.6") + (version "3.3.7") (source (origin (method url-fetch) (uri (hackage-uri "JuicyPixels" version)) (sha256 (base32 - "1f8giivsqxma19ax78dr7j4gir12iyfqn2mlsd27zzl8dn7dy6w1")))) + "1rrvapzcj0q8sigxq1zq2k4h88i1r2hyca4p7pkqa1b4pk6vhdny")))) (build-system haskell-build-system) (properties '((upstream-name . "JuicyPixels"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-zlib ghc-vector ghc-primitive)) + (inputs (list ghc-zlib ghc-vector ghc-primitive)) (home-page "https://github.com/Twinside/Juicy.Pixels") (synopsis "Picture loading and serialization library") (description @@ -6368,29 +6113,29 @@ TIFF and GIF formats.") (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") - (version "5.2.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "kan-extensions" version)) - (sha256 - (base32 - "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml")))) + (version "5.2.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "kan-extensions" version)) + (sha256 + (base32 + "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r")))) (build-system haskell-build-system) (properties '((upstream-name . "kan-extensions"))) - (inputs - (list ghc-adjunctions - ghc-comonad - ghc-contravariant - ghc-distributive - ghc-free - ghc-invariant - ghc-semigroupoids - ghc-tagged - ghc-transformers-compat)) - (home-page "https://github.com/ekmett/kan-extensions/") + (inputs (list ghc-adjunctions + ghc-comonad + ghc-contravariant + ghc-distributive + ghc-invariant + ghc-free + ghc-profunctors + ghc-semigroupoids + ghc-tagged + ghc-transformers-compat)) + (home-page "http://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") - (description "This library provides Kan extensions, Kan lifts, various + (description + "This library provides Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (license license:bsd-3))) @@ -6483,73 +6228,67 @@ with @code{wc} (for a web service).") (define-public ghc-lens (package (name "ghc-lens") - (version "4.19.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lens" version)) - (sha256 - (base32 - "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j")))) + (version "5.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "lens" version)) + (sha256 + (base32 + "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc")))) (build-system haskell-build-system) (properties '((upstream-name . "lens"))) + (inputs (list ghc-assoc + ghc-base-orphans + ghc-bifunctors + ghc-call-stack + ghc-comonad + ghc-contravariant + ghc-distributive + ghc-free + ghc-hashable + ghc-indexed-traversable + ghc-indexed-traversable-instances + ghc-kan-extensions + ghc-parallel + ghc-profunctors + ghc-reflection + ghc-semigroupoids + ghc-strict + ghc-tagged + ghc-th-abstraction + ghc-these + ghc-transformers-compat + ghc-unordered-containers + ghc-vector)) + (native-inputs (list ghc-quickcheck + ghc-test-framework + ghc-test-framework-quickcheck2 + ghc-hunit + ghc-test-framework + ghc-test-framework-hunit + ghc-simple-reflect)) (arguments - `(#:tests? #f ; TODO: Needs vector<0.12.2 - #:cabal-revision - ("6" "1k08my9rh1il3ibiyhljxkgndfgk143pn5a6nyzjnckw3la09myl"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-base-orphans - ghc-bifunctors - ghc-distributive - ghc-exceptions - ghc-free - ghc-kan-extensions - ghc-parallel - ghc-reflection - ghc-semigroupoids - ghc-vector - ghc-call-stack - ghc-comonad - ghc-contravariant - ghc-hashable - ghc-profunctors - ghc-semigroups - ghc-tagged - ghc-transformers-compat - ghc-unordered-containers - ghc-void - ghc-generic-deriving - ghc-nats - ghc-simple-reflect - hlint)) - (native-inputs - (list cabal-doctest - ghc-doctest - ghc-hunit - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-quickcheck)) - (home-page "https://github.com/ekmett/lens/") + `(#:cabal-revision ("1" + "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"))) + (home-page "http://github.com/ekmett/lens/") (synopsis "Lenses, Folds and Traversals") - (description "This library provides @code{Control.Lens}. The combinators + (description + "This library provides @code{Control.Lens}. The combinators in @code{Control.Lens} provide a highly generic toolbox for composing families of getters, folds, isomorphisms, traversals, setters and lenses and their indexed variants.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-lens-family-core (package (name "ghc-lens-family-core") - (version "2.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lens-family-core" version)) - (sha256 - (base32 - "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r")))) + (version "2.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "lens-family-core" version)) + (sha256 + (base32 + "1dkkd33wh2ykgis92dpshjxz6d2d41dvjj4zz6b7mdy8frr9jnhv")))) (build-system haskell-build-system) (properties '((upstream-name . "lens-family-core"))) (home-page @@ -6576,19 +6315,16 @@ lenses and traversals for those who require Haskell 98.") (define-public ghc-libffi (package (name "ghc-libffi") - (version "0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "libffi" version)) - (sha256 - (base32 - "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28")))) + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "libffi" version)) + (sha256 + (base32 + "1w9ssmjx521f4lmaynmh1zargl2zmfvvpq2bldsvnwldfdgikbkn")))) (build-system haskell-build-system) (properties '((upstream-name . "libffi"))) - (native-inputs (list pkg-config)) - (inputs (list libffi)) - (home-page "https://hackage.haskell.org/package/libffi") + (home-page "http://haskell.org/haskellwiki/Library/libffi") (synopsis "Haskell binding to libffi") (description "A binding to libffi, allowing C functions of types only known at runtime @@ -6622,22 +6358,21 @@ Music Player Daemon.") (define-public ghc-lib-parser (package (name "ghc-lib-parser") - (version "8.10.7.20210828") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ghc-lib-parser" version)) - (sha256 - (base32 - "178v4f7q9ndqmlhg2vhlk6ifm3ilajlrz8iw84vggzs7rp0fnlx0")))) + (version "9.2.5.20221107") + (source (origin + (method url-fetch) + (uri (hackage-uri "ghc-lib-parser" version)) + (sha256 + (base32 + "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser"))) (outputs '("out" "static" "doc")) ; documentation is 39M - (native-inputs - (list ghc-alex ghc-happy)) + (native-inputs (list ghc-alex ghc-happy)) (home-page "https://github.com/digital-asset/ghc-lib") (synopsis "The GHC API, decoupled from GHC versions") - (description "This library implements the GHC API. It is like the + (description + "This library implements the GHC API. It is like the compiler-provided @code{ghc} package, but it can be loaded on many compiler versions.") (license license:bsd-3))) @@ -6701,29 +6436,27 @@ LibYAML C library.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.10.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lifted-async" version)) - (sha256 - (base32 - "0j4f5471qfxkxy84ri87bcvp30ikh4m30imcggwn8m5v8igp218d")))) + (version "0.10.2.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "lifted-async" version)) + (sha256 + (base32 + "1kq96cp9czf358gykai2vcmynnd7zivqja4pb3f8bif9ypln9vai")))) (build-system haskell-build-system) (properties '((upstream-name . "lifted-async"))) - (inputs - (list ghc-async - ghc-lifted-base - ghc-transformers-base - ghc-monad-control - ghc-constraints - ghc-hunit - ghc-tasty - ghc-tasty-expected-failure - ghc-tasty-hunit - ghc-tasty-th)) + (inputs (list ghc-async ghc-lifted-base ghc-transformers-base + ghc-monad-control ghc-constraints)) + (native-inputs (list ghc-hunit + ghc-tasty + ghc-tasty-expected-failure + ghc-tasty-hunit + ghc-tasty-th + ghc-tasty-hunit + ghc-tasty-th)) (home-page "https://github.com/maoe/lifted-async") - (synopsis "Run lifted IO operations asynchronously and wait for their results") + (synopsis + "Run lifted IO operations asynchronously and wait for their results") (description "This package provides IO operations from @code{async} package lifted to any instance of @code{MonadBase} or @code{MonadBaseControl}.") @@ -6758,40 +6491,35 @@ Kaseorg.") (define-public ghc-linear (package (name "ghc-linear") - (version "1.21.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "linear" version)) - (sha256 - (base32 - "0ax6prmc7b53w0lz5ddc40wrjj9bm7wldpp57283gx9hdf8qrb35")))) + (version "1.21.10") + (source (origin + (method url-fetch) + (uri (hackage-uri "linear" version)) + (sha256 + (base32 + "1d3s1p4imkifn7dccqci2qiwcg99x22kf250hzh4fh4xghi361xr")))) (build-system haskell-build-system) (properties '((upstream-name . "linear"))) - (inputs - (list ghc-adjunctions - ghc-base-orphans - ghc-bytes - ghc-cereal - ghc-distributive - ghc-hashable - ghc-lens - ghc-reflection - ghc-semigroups - ghc-semigroupoids - ghc-tagged - ghc-transformers-compat - ghc-unordered-containers - ghc-vector - ghc-void)) - (native-inputs - (list cabal-doctest - ghc-doctest - ghc-simple-reflect - ghc-test-framework - ghc-test-framework-hunit - ghc-hunit)) - (home-page "https://github.com/ekmett/linear/") + (inputs (list ghc-adjunctions + ghc-base-orphans + ghc-bytes + ghc-cereal + ghc-distributive + ghc-hashable + ghc-indexed-traversable + ghc-lens + ghc-random + ghc-reflection + ghc-semigroups + ghc-semigroupoids + ghc-tagged + ghc-transformers-compat + ghc-unordered-containers + ghc-vector + ghc-void)) + (native-inputs (list ghc-simple-reflect ghc-test-framework + ghc-test-framework-hunit ghc-hunit)) + (home-page "http://github.com/ekmett/linear/") (synopsis "Linear algebra library for Haskell") (description "This package provides types and combinators for linear algebra on free @@ -6801,28 +6529,21 @@ vector spaces.") (define-public ghc-listlike (package (name "ghc-listlike") - (version "4.7.6") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "ListLike" version)) - (sha256 - (base32 - "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd")))) + (version "4.7.8") + (source (origin + (method url-fetch) + (uri (hackage-uri "ListLike" version)) + (sha256 + (base32 + "1l9pfjy7gh7xqnzflixp37d6lsppmlffzmmq75xn9r8ij3r2jycs")))) (build-system haskell-build-system) (properties '((upstream-name . "ListLike"))) - (inputs - (list ghc-vector - ghc-dlist - ghc-fmlist - ghc-hunit - ghc-quickcheck - ghc-random - ghc-utf8-string)) - (home-page "https://github.com/JohnLato/listlike") + (inputs (list ghc-vector ghc-dlist ghc-fmlist ghc-utf8-string)) + (native-inputs (list ghc-hunit ghc-quickcheck ghc-random)) + (home-page "http://github.com/ddssff/listlike") (synopsis "Generic support for list-like structures") - (description "The ListLike module provides a common interface to the + (description + "The ListLike module provides a common interface to the various Haskell types that are list-like. Predefined interfaces include standard Haskell lists, Arrays, ByteStrings, and lazy ByteStrings. Custom types can easily be made ListLike instances as well. @@ -6832,105 +6553,54 @@ ByteString, for types that support input and output, and for types that can handle infinite lists.") (license license:bsd-3))) -(define-public ghc-llvm-hs-pure - (package - (name "ghc-llvm-hs-pure") - (version "9.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "llvm-hs-pure" version)) - (sha256 - (base32 - "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf")))) - (build-system haskell-build-system) - (properties '((upstream-name . "llvm-hs-pure"))) - (inputs - (list ghc-attoparsec ghc-fail ghc-unordered-containers)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) - (home-page "https://github.com/llvm-hs/llvm-hs/") - (synopsis "Pure Haskell LLVM functionality (no FFI)") - (description "llvm-hs-pure is a set of pure Haskell types and functions -for interacting with LLVM. It includes an algebraic datatype (ADT) to represent -LLVM IR. The llvm-hs package builds on this one with FFI bindings to LLVM, but -llvm-hs-pure does not require LLVM to be available.") - (license license:bsd-3))) - -(define-public ghc-llvm-hs - (package - (name "ghc-llvm-hs") - (version "9.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "llvm-hs" version)) - (sha256 - (base32 - "0723xgh45h9cyxmmjsvxnsp8bpn1ljy4qgh7a7vqq3sj9d6wzq00")))) - (build-system haskell-build-system) - (properties '((upstream-name . "llvm-hs"))) - (inputs - (list ghc-attoparsec ghc-exceptions ghc-utf8-string ghc-llvm-hs-pure - llvm-9)) - (native-inputs - (list ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-quickcheck - ghc-temporary - ghc-pretty-show - ghc-temporary)) - (home-page "https://github.com/llvm-hs/llvm-hs/") - (synopsis "General purpose LLVM bindings for Haskell") - (description "llvm-hs is a set of Haskell bindings for LLVM. Unlike other -current Haskell bindings, it uses an algebraic datatype (ADT) to represent LLVM -IR, and so offers two advantages: it handles almost all of the stateful -complexities of using the LLVM API to build IR; and it supports moving IR not -only from Haskell into LLVM C++ objects, but the other direction - from LLVM C++ -into Haskell.") - (license license:bsd-3))) - (define-public ghc-logging-facade (package (name "ghc-logging-facade") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (hackage-uri "logging-facade" version)) (sha256 (base32 - "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) + "0rn12j77gn3p84khrmbn5kq6fyj44i3z1hrdm29apikp7csv65ib")))) (build-system haskell-build-system) (properties '((upstream-name . "logging-facade"))) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/logging-facade") + ;(arguments (list #:tests? #f)) + (inputs (list ghc-call-stack)) + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "https://github.com/sol/logging-facade#readme") (synopsis "Simple logging abstraction that allows multiple back-ends") (description "This package provides a simple logging abstraction that allows multiple back-ends.") (license license:expat))) +(define-public ghc-logging-facade-bootstrap + (package + (inherit ghc-logging-facade) + (name "ghc-logging-facade-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-logict (package (name "ghc-logict") - (version "0.7.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "logict" version)) - (sha256 - (base32 - "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7")))) + (version "0.8.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "logict" version)) + (sha256 + (base32 + "0mpv50ifb3x9vfmgi1p9piwcgz8d19x0wdj789wxyhxwjpr6v4py")))) (build-system haskell-build-system) (properties '((upstream-name . "logict"))) (inputs (list ghc-fail)) - (native-inputs - (list ghc-async ghc-tasty ghc-tasty-hunit)) - (home-page "http://code.haskell.org/~dolio/") + (native-inputs (list ghc-async ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/Bodigrim/logict#readme") (synopsis "Backtracking logic-programming monad") - (description "This library provides a continuation-based, backtracking, + (description + "This library provides a continuation-based, backtracking, logic programming monad. An adaptation of the two-continuation implementation found in the paper \"Backtracking, Interleaving, and Terminating Monad Transformers\" available @uref{http://okmij.org/ftp/papers/LogicT.pdf, @@ -6940,28 +6610,24 @@ online}.") (define-public ghc-lucid (package (name "ghc-lucid") - (version "2.9.12.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lucid" version)) - (sha256 - (base32 - "0nky4pqxd6828kg3js90ks6r3hxs5x48ibfz37pw2dr7y1nygq21")))) + (version "2.11.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "lucid" version)) + (sha256 + (base32 + "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw")))) (build-system haskell-build-system) (properties '((upstream-name . "lucid"))) - (inputs - (list ghc-blaze-builder ghc-hashable ghc-mmorph - ghc-unordered-containers)) - (native-inputs - (list ghc-hunit ghc-hspec ghc-bifunctors)) + (inputs (list ghc-blaze-builder ghc-hashable ghc-mmorph)) + (native-inputs (list ghc-hunit ghc-hspec ghc-bifunctors)) (arguments - `(#:cabal-revision - ("1" - "1xllyf26ypk37k807g5v6fl1449mhpvk18dljmqgwj723n0v8rpj"))) + `(#:cabal-revision ("1" + "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d"))) (home-page "https://github.com/chrisdone/lucid") (synopsis "Haskell DSL for rendering HTML") - (description "Clear to write, read and edit Haskell DSL for HTML. + (description + "Clear to write, read and edit Haskell DSL for HTML. @itemize @bullet @item @@ -6976,23 +6642,17 @@ Same combinator can be used for attributes and elements (define-public ghc-lzma (package (name "ghc-lzma") - (version "0.0.0.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lzma" version)) - (sha256 - (base32 - "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) + (version "0.0.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "lzma" version)) + (sha256 + (base32 + "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382")))) (build-system haskell-build-system) (properties '((upstream-name . "lzma"))) - (arguments - '(#:tests? #f ; requires older versions of QuickCheck and tasty. - #:cabal-revision - ("6" "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip"))) - (native-inputs - (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit - ghc-tasty-quickcheck)) + (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit + ghc-tasty-quickcheck)) (home-page "https://github.com/hvr/lzma") (synopsis "LZMA/XZ compression and decompression") (description @@ -7004,26 +6664,23 @@ monadic incremental interface is provided as well.") (define-public ghc-lzma-conduit (package (name "ghc-lzma-conduit") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lzma-conduit" version)) - (sha256 - (base32 - "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb")))) + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "lzma-conduit" version)) + (sha256 + (base32 + "1pmvmchrg429b2yk485x0066lxcr37cbyczlyp3ala2iaq8hm61z")))) (build-system haskell-build-system) (properties '((upstream-name . "lzma-conduit"))) - (inputs - (list ghc-conduit ghc-lzma ghc-resourcet)) - (native-inputs - (list ghc-base-compat - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-hunit - ghc-quickcheck)) - (home-page "https://github.com/alphaHeavy/lzma-conduit") + (inputs (list ghc-conduit ghc-lzma ghc-resourcet)) + (native-inputs (list ghc-base-compat + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2 + ghc-hunit + ghc-quickcheck)) + (home-page "http://github.com/alphaHeavy/lzma-conduit") (synopsis "Conduit interface for lzma/xz compression") (description "This package provides a @code{Conduit} interface for the LZMA @@ -7054,16 +6711,18 @@ than its name.") (define-public ghc-managed (package (name "ghc-managed") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (hackage-uri "managed" version)) - (sha256 - (base32 - "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38")))) + (version "1.0.9") + (source (origin + (method url-fetch) + (uri (hackage-uri "managed" version)) + (sha256 + (base32 + "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd")))) (build-system haskell-build-system) (properties '((upstream-name . "managed"))) + (arguments + `(#:cabal-revision ("3" + "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664"))) (home-page "https://hackage.haskell.org/package/managed") (synopsis "Monad for managed values") (description @@ -7144,20 +6803,16 @@ functions are often useful in statistical and numerical computing.") (define-public ghc-megaparsec (package (name "ghc-megaparsec") - (version "9.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "megaparsec" version)) - (sha256 - (base32 - "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j")))) + (version "9.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "megaparsec" version)) + (sha256 + (base32 + "0d52dbcz9nlqkkfqfs9kck5kmvkfzf3628z4ik4gr7hbbkjh72x4")))) (build-system haskell-build-system) (properties '((upstream-name . "megaparsec"))) - (inputs - (list ghc-case-insensitive ghc-parser-combinators ghc-scientific)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-hspec-expectations hspec-discover)) + (inputs (list ghc-case-insensitive ghc-parser-combinators ghc-scientific)) (home-page "https://github.com/mrkkrp/megaparsec") (synopsis "Monadic parser combinators") (description @@ -7169,19 +6824,20 @@ speed, flexibility, and quality of parse errors.") (define-public ghc-memory (package (name "ghc-memory") - (version "0.15.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (hackage-uri "memory" version)) (sha256 (base32 - "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3")))) + "0yl3ivvn7i9wbx910b7bzj9c3g0jjjk91j05wj74qb5zx2yyf9rk")))) (build-system haskell-build-system) (properties '((upstream-name . "memory"))) - (inputs - (list ghc-basement ghc-foundation)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) + (inputs (list ghc-basement)) + (native-inputs (list ghc-foundation)) + (arguments + `(#:cabal-revision ("1" + "1gybf726kz17jm1am0rphi0srmyqyza45y6jdqbq0b8sspm8kggb"))) (home-page "https://github.com/vincenthz/hs-memory") (synopsis "Memory abstractions for Haskell") (description @@ -7240,14 +6896,14 @@ stripped. As the result, this package has no dependencies.") (define-public ghc-microlens-aeson (package (name "ghc-microlens-aeson") - (version "2.3.1") + (version "2.5.0") (source (origin (method url-fetch) (uri (hackage-uri "microlens-aeson" version)) (sha256 (base32 - "074mzpk7av6i0xf7xy42jpzgljlmyw805md1vz4sqy85m99f0ikr")))) + "0h5q0b2b4y28llhq28mb28kpdv2iifz0qkbbhmrwrz2bs6arr3d2")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-aeson"))) (inputs @@ -7269,20 +6925,20 @@ microlens.") (define-public ghc-microlens-ghc (package (name "ghc-microlens-ghc") - (version "0.4.13") - (source - (origin - (method url-fetch) - (uri (hackage-uri "microlens-ghc" version)) - (sha256 - (base32 - "1r6x788br3f9rksj0dmk1nyh5mfvd9zzasclf1mi3rxhb7c0j926")))) + (version "0.4.13.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "microlens-ghc" version)) + (sha256 + (base32 + "1258p84jj4kv6l71ijwjzpvzvqxxsqbvs5vrksi24mlf29gaxqi0")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-ghc"))) (inputs (list ghc-microlens)) - (home-page "https://github.com/monadfix/microlens") + (home-page "http://github.com/monadfix/microlens") (synopsis "Use @code{microlens} with GHC libraries like @code{array}") - (description "This library provides everything that @code{microlens} + (description + "This library provides everything that @code{microlens} provides plus instances to make @code{each}, @code{at}, and @code{ix} usable with arrays, @code{ByteString}, and containers. This package is a part of the @uref{http://hackage.haskell.org/package/microlens, @@ -7293,21 +6949,18 @@ microlens} family; see the readme (define-public ghc-microlens-mtl (package (name "ghc-microlens-mtl") - (version "0.2.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "microlens-mtl" version)) - (sha256 - (base32 - "0ijy7xyd5lbc3calhcrhy8czkf3fjcxrv68p7kd2a5b352rfi7fp")))) + (version "0.2.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "microlens-mtl" version)) + (sha256 + (base32 + "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-mtl"))) - (inputs - (list ghc-microlens ghc-transformers-compat)) - (home-page "https://github.com/monadfix/microlens") - (synopsis - "@code{microlens} support for Reader/Writer/State from mtl") + (inputs (list ghc-microlens ghc-transformers-compat)) + (home-page "http://github.com/monadfix/microlens") + (synopsis "@code{microlens} support for Reader/Writer/State from mtl") (description "This package contains functions (like @code{view} or @code{+=}) which work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the @@ -7319,25 +6972,23 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (define-public ghc-microlens-platform (package (name "ghc-microlens-platform") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "microlens-platform" version)) - (sha256 - (base32 - "0yf0z0glq2d6mpclzswc64h9w2cck4fd8l8ffm89pyb0a5n8m4c7")))) + (version "0.4.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "microlens-platform" version)) + (sha256 + (base32 + "0z8snyzy18kqj32fb89mzgscjrg6w2z0jkkj4b9vl2jvbps0gkg6")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-platform"))) - (inputs - (list ghc-hashable - ghc-microlens - ghc-microlens-ghc - ghc-microlens-mtl - ghc-microlens-th - ghc-unordered-containers - ghc-vector)) - (home-page "https://github.com/monadfix/microlens") + (inputs (list ghc-hashable + ghc-microlens + ghc-microlens-ghc + ghc-microlens-mtl + ghc-microlens-th + ghc-unordered-containers + ghc-vector)) + (home-page "http://github.com/monadfix/microlens") (synopsis "Feature-complete microlens") (description "This package exports a module which is the recommended starting point @@ -7361,23 +7012,22 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.3.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "microlens-th" version)) - (sha256 - (base32 - "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c")))) + (version "0.4.3.11") + (source (origin + (method url-fetch) + (uri (hackage-uri "microlens-th" version)) + (sha256 + (base32 + "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-th"))) (inputs (list ghc-microlens ghc-th-abstraction)) (native-inputs (list ghc-tagged)) - (home-page - "https://github.com/aelve/microlens") + (home-page "http://github.com/monadfix/microlens") (synopsis "Automatic generation of record lenses for @code{ghc-microlens}") - (description "This Haskell package lets you automatically generate lenses + (description + "This Haskell package lets you automatically generate lenses for data types; code was extracted from the lens package, and therefore generated lenses are fully compatible with ones generated by lens (and can be used both from lens and microlens).") @@ -7386,36 +7036,26 @@ used both from lens and microlens).") (define-public ghc-missingh (package (name "ghc-missingh") - (version "1.4.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "MissingH" version)) - (sha256 - (base32 - "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw")))) + (version "1.5.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "MissingH" version)) + (sha256 + (base32 + "0c92fdv32nq51kfdizi3lpxmnvscsgk6marfzaycd7k05aka8byb")))) (build-system haskell-build-system) (properties '((upstream-name . "MissingH"))) + (inputs (list ghc-hslogger + ghc-old-locale + ghc-old-time + ghc-regex-compat + ghc-network-bsd + ghc-network)) + (native-inputs (list ghc-hunit)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "MissingH.cabal" - (("(random)\\s+[^,]+" all dep) - dep))))))) - (inputs - (list ghc-network - ghc-hunit - ghc-regex-compat - ghc-hslogger - ghc-random - ghc-old-time - ghc-old-locale)) - (native-inputs - (list ghc-errorcall-eq-instance ghc-quickcheck ghc-hunit)) - ;; ‘Official’ redirects to a 404. - (home-page "https://github.com/haskell-hvr/missingh") + `(#:cabal-revision ("2" + "11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l"))) + (home-page "http://hackage.haskell.org/package/MissingH") (synopsis "Large utility library") (description "MissingH is a library of all sorts of utility functions for Haskell @@ -7447,19 +7087,20 @@ do on-demand loading.") (define-public ghc-mmorph (package (name "ghc-mmorph") - (version "1.1.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "mmorph" version)) - (sha256 - (base32 - "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6")))) + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "mmorph" version)) + (sha256 + (base32 + "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1")))) (build-system haskell-build-system) (properties '((upstream-name . "mmorph"))) - (inputs - (list ghc-transformers-compat)) - (home-page "https://hackage.haskell.org/package/mmorph") + (inputs (list ghc-transformers-compat ghc-fail)) + (arguments + `(#:cabal-revision ("3" + "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz"))) + (home-page "http://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description "This library provides monad morphism utilities, most commonly used for @@ -7488,6 +7129,16 @@ manipulating monad transformer stacks.") "The mockery package provides support functions for automated testing.") (license license:expat))) +(define-public ghc-mockery-bootstrap + (package + (inherit ghc-mockery) + (name "ghc-mockery-bootstrap") + (arguments `(#:tests? #f)) + (inputs (modify-inputs (package-inputs ghc-mockery) + (replace "ghc-logging-facade" ghc-logging-facade-bootstrap))) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-monad-control (package (name "ghc-monad-control") @@ -7514,31 +7165,33 @@ a subset of @code{MonadBase} into which generic control operations such as (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.36") - (source - (origin - (method url-fetch) - (uri (hackage-uri "monad-logger" version)) - (sha256 - (base32 - "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh")))) + (version "0.3.37") + (source (origin + (method url-fetch) + (uri (hackage-uri "monad-logger" version)) + (sha256 + (base32 + "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106")))) (build-system haskell-build-system) (properties '((upstream-name . "monad-logger"))) - (inputs (list ghc-transformers-compat - ghc-stm-chans - ghc-lifted-base - ghc-resourcet - ghc-conduit + (inputs (list ghc-conduit ghc-conduit-extra ghc-fast-logger - ghc-transformers-base + ghc-lifted-base ghc-monad-control ghc-monad-loops - ghc-blaze-builder - ghc-exceptions)) - (home-page "https://github.com/kazu-yamamoto/logger") + ghc-resourcet + ghc-stm-chans + ghc-transformers-base + ghc-transformers-compat + ghc-unliftio-core)) + (arguments + `(#:cabal-revision ("3" + "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"))) + (home-page "https://github.com/snoyberg/monad-logger#readme") (synopsis "Provides a class of monads which can log messages for Haskell") - (description "This Haskell package uses a monad transformer approach + (description + "This Haskell package uses a monad transformer approach for logging. This package provides Template Haskell functions for determining source @@ -7635,6 +7288,9 @@ and other added capabilities layered on top of the @code{Par} monad.") (properties '((upstream-name . "MonadRandom"))) (inputs (list ghc-transformers-compat ghc-primitive ghc-fail ghc-random)) + (arguments + `(#:cabal-revision ("2" + "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr"))) (home-page "https://github.com/byorgey/MonadRandom") (synopsis "Random-number generation monad for Haskell") (description "This Haskell package provides support for computations @@ -7693,21 +7349,20 @@ data structures as non-empty.") (define-public ghc-monoid-extras (package (name "ghc-monoid-extras") - (version "0.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "monoid-extras" version)) - (sha256 - (base32 - "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1")))) + (version "0.6.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "monoid-extras" version)) + (sha256 + (base32 + "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw")))) (build-system haskell-build-system) (properties '((upstream-name . "monoid-extras"))) - (inputs - (list ghc-groups ghc-semigroupoids)) - (home-page "https://hackage.haskell.org/package/monoid-extras") + (inputs (list ghc-groups ghc-semigroupoids)) + (home-page "http://hackage.haskell.org/package/monoid-extras") (synopsis "Various extra monoid-related definitions and utilities") - (description "This package provides various extra monoid-related + (description + "This package provides various extra monoid-related definitions and utilities, such as monoid actions, monoid coproducts, semi-direct products, \"deletable\" monoids, \"split\" monoids, and \"cut\" monoids.") @@ -7769,16 +7424,16 @@ the top of your file to get all of the ExceptT instances in scope.") (define-public ghc-murmur-hash (package (name "ghc-murmur-hash") - (version "0.1.0.9") - (source - (origin - (method url-fetch) - (uri (hackage-uri "murmur-hash" version)) - (sha256 - (base32 "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9")))) + (version "0.1.0.10") + (source (origin + (method url-fetch) + (uri (hackage-uri "murmur-hash" version)) + (sha256 + (base32 + "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9")))) (build-system haskell-build-system) (properties '((upstream-name . "murmur-hash"))) - (home-page "https://github.com/nominolo/murmur-hash") + (home-page "http://github.com/nominolo/murmur-hash") (synopsis "MurmurHash2 implementation for Haskell") (description "This package provides an implementation of MurmurHash2, a good, fast, @@ -7890,26 +7545,20 @@ ncurses.") (define-public ghc-network (package (name "ghc-network") - (version "3.1.1.1") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "network" version)) - (sha256 - (base32 - "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp")))) + (version "3.1.2.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "network" version)) + (sha256 + (base32 + "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz")))) (build-system haskell-build-system) (properties '((upstream-name . "network"))) - ;; The regression tests depend on an unpublished module. - (arguments `(#:tests? #f)) - (native-inputs - (list ghc-hunit ghc-doctest ghc-test-framework - ghc-test-framework-hunit)) + (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck + ghc-doctest hspec-discover)) (home-page "https://github.com/haskell/network") (synopsis "Low-level networking interface") - (description - "This package provides a low-level networking interface.") + (description "This package provides a low-level networking interface.") (license license:bsd-3))) (define-public ghc-network-bsd @@ -7960,19 +7609,19 @@ byte order.") (define-public ghc-network-info (package (name "ghc-network-info") - (version "0.2.0.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "network-info" version)) - (sha256 - (base32 - "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "network-info" version)) + (sha256 + (base32 + "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv")))) (build-system haskell-build-system) (properties '((upstream-name . "network-info"))) - (home-page "https://github.com/jystic/network-info") + (home-page "http://github.com/jacobstanley/network-info") (synopsis "Access the local computer's basic network configuration") - (description "This Haskell library provides simple read-only access to the + (description + "This Haskell library provides simple read-only access to the local computer's networking configuration. It is currently capable of getting a list of all the network interfaces and their respective IPv4, IPv6 and MAC addresses.") @@ -8008,26 +7657,22 @@ sending UDP datagrams over multicast (class D) addresses.") (define-public ghc-network-uri (package (name "ghc-network-uri") - (version "2.6.4.1") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "network-uri" version)) - (sha256 - (base32 - "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap")))) + (version "2.6.4.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "network-uri" version)) + (sha256 + (base32 + "0a3jg6aykwm1yw32nh137hi6r86w2640xwl1p18352bf29rqj64w")))) (build-system haskell-build-system) (properties '((upstream-name . "network-uri"))) - (inputs - (list ghc-th-compat)) - (native-inputs - (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit - ghc-tasty-quickcheck)) - (home-page - "https://github.com/haskell/network-uri") + (inputs (list ghc-th-compat)) + (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit + ghc-tasty-quickcheck ghc-quickcheck)) + (home-page "https://github.com/haskell/network-uri") (synopsis "Library for URI manipulation") - (description "This package provides an URI manipulation interface. In + (description + "This package provides an URI manipulation interface. In @code{network-2.6} the @code{Network.URI} module was split off from the @code{network} package into this package.") (license license:bsd-3))) @@ -8035,21 +7680,23 @@ sending UDP datagrams over multicast (class D) addresses.") (define-public ghc-newtype-generics (package (name "ghc-newtype-generics") - (version "0.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "newtype-generics" version)) - (sha256 - (base32 - "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa")))) + (version "0.6.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "newtype-generics" version)) + (sha256 + (base32 + "0km7cp041bgdgrxrbrawz611mcylxp943880a2yg228a09961b51")))) (build-system haskell-build-system) (properties '((upstream-name . "newtype-generics"))) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://github.com/sjakobi/newtype-generics") + (native-inputs (list ghc-hspec hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0xgc7sxs1p3qibgwbikjdrhn47j7m4gk5x1wrv9hncks6hd6hsyf"))) + (home-page "http://github.com/sjakobi/newtype-generics") (synopsis "Typeclass and set of functions for working with newtypes") - (description "The @code{Newtype} typeclass represents the packing and + (description + "The @code{Newtype} typeclass represents the packing and unpacking of a newtype, and allows you to operate under that newtype with functions such as @code{ala}. Generics support was added in version 0.4, making this package a full replacement for the original newtype package, @@ -8132,19 +7779,19 @@ standard library.") (define-public ghc-objectname (package (name "ghc-objectname") - (version "1.1.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ObjectName" version)) - (sha256 - (base32 - "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) + (version "1.1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "ObjectName" version)) + (sha256 + (base32 + "0xdkfc97salzj5s3fvmwk4k0097dcd8c4xcr5ghhv9mz0wcxm9gz")))) (build-system haskell-build-system) (properties '((upstream-name . "ObjectName"))) - (home-page "https://hackage.haskell.org/package/ObjectName") + (home-page "https://github.com/svenpanne/ObjectName") (synopsis "Helper library for Haskell OpenGL") - (description "This tiny package contains the class ObjectName, which + (description + "This tiny package contains the class ObjectName, which corresponds to the general notion of explicitly handled identifiers for API objects, e.g. a texture object name in OpenGL or a buffer object name in OpenAL.") @@ -8241,8 +7888,8 @@ traditionally so named type-wrapper for attaching typeclass instances.") (build-system haskell-build-system) (properties '((upstream-name . "OpenGL"))) (arguments - `(#:cabal-revision - ("1" "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741"))) + `(#:cabal-revision ("2" + "1nhlswxgxn8l1ysjq3fp3w5pvx6651d33036i8dlbqygzrn6iwmh"))) (inputs (list ghc-objectname ghc-gluraw ghc-statevar ghc-openglraw)) (home-page "https://wiki.haskell.org/Opengl") @@ -8255,23 +7902,24 @@ version 1.3).") (define-public ghc-openglraw (package (name "ghc-openglraw") - (version "3.3.4.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "OpenGLRaw" version)) - (sha256 - (base32 - "0gmsmysqzpm13qnyq4vvqxm4dzw25nayfd9wi5x645pympm6jqbm")))) + (version "3.3.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "OpenGLRaw" version)) + (sha256 + (base32 + "07nk0rgm6jcxz6yshwhv5lj5frs6371w3hdjxwa4biws2kmbs6hj")))) (build-system haskell-build-system) (properties '((upstream-name . "OpenGLRaw"))) + (inputs (list ghc-fixed ghc-half glu)) (arguments - `(#:extra-directories ("glu"))) - (inputs - (list ghc-half ghc-fixed glu)) - (home-page "https://wiki.haskell.org/Opengl") + `(#:extra-directories ("glu") + #:cabal-revision ("1" + "15abvqkxc08lx9d44323izccfp7bqfiljnd587zn80vdvmkzs6zc"))) + (home-page "http://www.haskell.org/haskellwiki/Opengl") (synopsis "Raw Haskell bindings for the OpenGL graphics system") - (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 + (description + "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API, intended as a basis for a nicer interface. OpenGLRaw offers access to all necessary functions, tokens and types plus a general @@ -8285,20 +7933,19 @@ found at runtime, a userError is thrown.") (define-public ghc-operational (package (name "ghc-operational") - (version "0.2.4.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "operational" version)) - (sha256 - (base32 - "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i")))) + (version "0.2.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "operational" version)) + (sha256 + (base32 + "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2")))) (build-system haskell-build-system) (properties '((upstream-name . "operational"))) - (inputs - (list ghc-random)) + (inputs (list ghc-random)) (home-page "http://wiki.haskell.org/Operational") - (synopsis "Implementation of difficult monads made easy with operational semantics") + (synopsis + "Implementation of difficult monads made easy with operational semantics") (description "This library makes it easy to implement monads with tricky control flow. This is useful for: writing web applications in a sequential style, @@ -8388,23 +8035,17 @@ easily work with command-line options.") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.16.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "optparse-applicative" version)) - (sha256 - (base32 - "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2")))) + (version "0.17.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "optparse-applicative" version)) + (sha256 + (base32 + "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2")))) (build-system haskell-build-system) (properties '((upstream-name . "optparse-applicative"))) - (arguments - `(#:cabal-revision - ("1" "0401ik87gm9gjpch6lmkczygp59na3f1j7bcs6mc2r929c2xgsqn"))) - (inputs - (list ghc-transformers-compat ghc-ansi-wl-pprint)) - (native-inputs - (list ghc-quickcheck)) + (inputs (list ghc-transformers-compat ghc-ansi-wl-pprint)) + (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/pcapriotti/optparse-applicative") (synopsis "Utilities and combinators for parsing command line options") (description "This package provides utilities and combinators for parsing @@ -8488,20 +8129,18 @@ require aeson (define-public ghc-text-conversions (package (name "ghc-text-conversions") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "text-conversions" version)) - (sha256 - (base32 "0kbxin1q8xj9sgdl185gncrdjwcfzndp8sl5qll8y93l60yq8dxi")))) + (version "0.3.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "text-conversions" version)) + (sha256 + (base32 + "0pbjlzsjd3m8np5p6iq7zb0bx6n40d8jha76r8s07s4wg2x0yxy8")))) (build-system haskell-build-system) (properties '((upstream-name . "text-conversions"))) - (inputs - (list ghc-base16-bytestring ghc-base64-bytestring ghc-errors)) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://github.com/cjdev/text-conversions#readme") + (inputs (list ghc-base16-bytestring ghc-base64-bytestring)) + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "https://github.com/cjdev/text-conversions") (synopsis "Safe conversions between textual types") (description "Safe conversions between textual types") (license license:isc))) @@ -8509,27 +8148,24 @@ require aeson (define-public ghc-text-short (package (name "ghc-text-short") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "text-short" version)) - (sha256 - (base32 - "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz")))) + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "text-short" version)) + (sha256 + (base32 + "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3")))) (build-system haskell-build-system) (properties '((upstream-name . "text-short"))) (inputs (list ghc-hashable)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit - ghc-quickcheck-instances)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) (arguments - `(#:tests? #f ; TODO: Needs tasty<1.3 - #:cabal-revision - ("3" "1wjy98ihhipzr34b310sgjjq3cc12aydhckbrgr21kxkzwglm4nv"))) - (home-page "https://hackage.haskell.org/package/text-short") + `(#:cabal-revision ("1" + "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"))) + (home-page "http://hackage.haskell.org/package/text-short") (synopsis "Memory-efficient representation of Unicode text strings") - (description "This package provides the @code{ShortText} type which + (description + "This package provides the @code{ShortText} type which is suitable for keeping many short strings in memory. This is similar to how @code{ShortByteString} relates to @code{ByteString}. @@ -8543,19 +8179,17 @@ plus the length of the UTF-8 encoded payload.") (define-public ghc-text-zipper (package (name "ghc-text-zipper") - (version "0.11") - (source - (origin - (method url-fetch) - (uri (hackage-uri "text-zipper" version)) - (sha256 - (base32 "07l1pyx93gv95cn1wh1di129axhm9sqsn4znykliacv60ld854ys")))) + (version "0.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "text-zipper" version)) + (sha256 + (base32 + "00k7d6qfznhp6l2ihw3pppkn580pwd7ac7wx9vidil4y9hjagaw6")))) (build-system haskell-build-system) (properties '((upstream-name . "text-zipper"))) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) - (inputs - (list ghc-vector)) + (inputs (list ghc-vector)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) (home-page "https://github.com/jtdaugherty/text-zipper/") (synopsis "Text editor zipper library") (description @@ -8571,20 +8205,21 @@ Implementations using both of these examples are provided.") (define-public ghc-doclayout (package (name "ghc-doclayout") - (version "0.3.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "doclayout" version)) - (sha256 - (base32 "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp")))) + (version "0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "doclayout" version)) + (sha256 + (base32 + "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx")))) (build-system haskell-build-system) (properties '((upstream-name . "doclayout"))) - (inputs - (list ghc-safe ghc-emojis)) - (native-inputs - (list ghc-tasty ghc-tasty-golden ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-emojis ghc-safe)) + (native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-hunit + ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "0djwb7nrdablc0iy1qakrxpd4m7nn0w94vhb78il3jhjbj2ji179"))) (home-page "https://github.com/jgm/doclayout") (synopsis "Pretty-printing library for laying out text documents") (description @@ -8593,93 +8228,93 @@ with several features not present in pretty-printing libraries designed for code. It was designed for use in @code{Pandoc}.") (license license:bsd-3))) -(define-public ghc-pandoc +(define-public pandoc (package - (name "ghc-pandoc") - (version "2.14.0.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "pandoc" version)) - (sha256 - (base32 - "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2")))) + (name "pandoc") + (version "2.19.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "pandoc" version)) + (sha256 + (base32 + "0ia2gpl345lwymk38y89sgcqjci7sjmxbi228idg6nkaqfa3ds1n")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix test case. + (substitute* "test/writer.ms" + (("\\\\\\[u2212\\]") "-")))))) (build-system haskell-build-system) (properties '((upstream-name . "pandoc"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'find-library - (lambda _ - (substitute* "test/Tests/Command.hs" - (("= dynlibEnv") - (format #f "= [(\"LD_LIBRARY_PATH\" , \"~a/dist/build\")]" - (getcwd)))) - #t))))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-aeson - ghc-aeson-pretty - ghc-attoparsec - ghc-base64-bytestring - ghc-base-compat - ghc-blaze-html - ghc-blaze-markup - ghc-case-insensitive - ghc-citeproc - ghc-commonmark-extensions - ghc-commonmark - ghc-commonmark-pandoc - ghc-connection - ghc-data-default - ghc-doclayout - ghc-doctemplates - ghc-emojis - ghc-file-embed - ghc-glob - ghc-haddock-library - ghc-hslua - ghc-hslua-module-path - ghc-hslua-module-system - ghc-hslua-module-text - ghc-hsyaml - ghc-http-client - ghc-http-client-tls - ghc-http - ghc-http-types - ghc-ipynb - ghc-jira-wiki-markup - ghc-juicypixels - ghc-network - ghc-network-uri - ghc-pandoc-types - ghc-random - ghc-safe - ghc-scientific - ghc-sha - ghc-skylighting-core - ghc-skylighting - ghc-split - ghc-syb - ghc-tagsoup - ghc-temporary - ghc-texmath - ghc-text-conversions - ghc-unicode-collation - ghc-unicode-transforms - ghc-unordered-containers - ghc-xml-conduit - ghc-xml - ghc-zip-archive - ghc-zlib)) - (native-inputs - (list ghc-tasty - ghc-tasty-golden - ghc-tasty-hunit - ghc-tasty-lua - ghc-tasty-quickcheck - ghc-diff - ghc-quickcheck)) + (inputs (list ghc-glob + ghc-juicypixels + ghc-sha + ghc-aeson + ghc-aeson-pretty + ghc-attoparsec + ghc-blaze-html + ghc-blaze-markup + ghc-case-insensitive + ghc-citeproc + ghc-commonmark + ghc-commonmark-extensions + ghc-commonmark-pandoc + ghc-connection + ghc-data-default + ghc-doclayout + ghc-doctemplates + ghc-base64 + ghc-emojis + ghc-file-embed + ghc-gridtables + ghc-haddock-library + ghc-hslua-module-doclayout + ghc-hslua-module-path + ghc-hslua-module-system + ghc-hslua-module-text + ghc-hslua-module-version + ghc-http-client + ghc-http-client-tls + ghc-http-types + ghc-ipynb + ghc-jira-wiki-markup + ghc-lpeg + ghc-network + ghc-network-uri + ghc-pandoc-lua-marshal + ghc-pandoc-types + ghc-pretty-show + ghc-random + ghc-safe + ghc-scientific + ghc-skylighting + ghc-skylighting-core + ghc-split + ghc-syb + ghc-tagsoup + ghc-temporary + ghc-texmath + ghc-text-conversions + ghc-unicode-collation + ghc-unicode-transforms + ghc-xml + ghc-xml-conduit + ghc-xml-types + ghc-yaml + ghc-zip-archive + ghc-zlib + ghc-servant-server + ghc-wai + ghc-hslua + ghc-hslua-aeson + ghc-wai-extra + ghc-warp)) + (native-inputs (list ghc-diff + ghc-tasty + ghc-tasty-golden + ghc-tasty-hunit + ghc-tasty-lua + ghc-tasty-quickcheck)) (home-page "https://pandoc.org") (synopsis "Conversion between markup formats") (description @@ -8693,167 +8328,26 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -(define-public pandoc - (package - (inherit ghc-pandoc) - (name "pandoc") - (arguments - `(#:configure-flags - (list "-fstatic" - ;; Do not build trypandoc; this is the default but it's better to - ;; be explicit. - "-f-trypandoc" - ;; TODO: Without these we cannot link the Haskell libraries - ;; statically. It would be nice if we could also build the - ;; shared libraries. - "--disable-shared" - "--disable-executable-dynamic" - ;; That's where we place all static libraries - "--extra-lib-dirs=static-libs/" - "--ghc-option=-static") - #:modules ((guix build haskell-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'create-simple-paths-module - (lambda* (#:key outputs #:allow-other-keys) - (call-with-output-file "Paths_pandoc.hs" - (lambda (port) - (format port "\ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_pandoc (version,getDataDir,getDataFileName) where -import Prelude -import Data.Version (Version(..)) -import System.Info -version :: Version -version = Version [~a] [] - -datadir :: FilePath -datadir = \"~a/share/\" ++ - arch ++ \"-\" ++ - os ++ \"-\" ++ - compilerName ++ \"-~a/pandoc-~a\" - -getDataDir :: IO FilePath -getDataDir = return datadir - -getDataFileName :: FilePath -> IO FilePath -getDataFileName name = do - dir <- getDataDir - return (dir ++ \"/\" ++ name) -" - (string-map (lambda (chr) (if (eq? chr #\.) #\, chr)) - ,(package-version ghc-pandoc)) - (assoc-ref outputs "out") - ,(package-version ghc) - ,(package-version ghc-pandoc)))) - #t)) - (add-after 'unpack 'prepare-static-libraries - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p (string-append (getcwd) "/static-libs")) - (for-each - (lambda (input) - (when (or (string-prefix? "static-" (car input)) - (string-prefix? "ghc" (car input))) - (match (find-files (cdr input) "\\.a$") - ((and (first . rest) libs) - (for-each (lambda (lib) - (let ((target (string-append (getcwd) "/static-libs/" - (basename lib)))) - (unless (file-exists? target) - (symlink first target)))) - libs)) - (_ #f)))) - inputs) - #t)) - (delete 'check) - ;; Remove libraries. If you need them, install ghc-pandoc instead. - (add-after 'register 'delete-libraries - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))) - (add-after 'install 'post-install-check - (assoc-ref %standard-phases 'check))))) - (outputs '("out" "doc" "static")) - (inputs - (let* ((direct-inputs (package-inputs ghc-pandoc)) - (all-static-inputs - (map (lambda (pkg) - (list (string-append "static-" (package-name pkg)) - pkg "static")) - (delete-duplicates - (append (map cadr direct-inputs) - (filter (lambda (pkg) - (and - (string-prefix? "ghc-" (package-name pkg)) - (not (string=? "ghc-next" (package-name pkg))))) - (package-closure - (map cadr direct-inputs)))))))) - `(("zlib:static" ,zlib "static") - ,@all-static-inputs - ,@direct-inputs))) - (native-inputs - (let* ((direct-inputs (package-native-inputs ghc-pandoc)) - (all-static-inputs - (map (lambda (pkg) - (list (string-append "static-" (package-name pkg)) - pkg "static")) - (delete-duplicates - (append (map cadr direct-inputs) - (filter (lambda (pkg) - (and - (string-prefix? "ghc-" (package-name pkg)) - (not (string=? "ghc-next" (package-name pkg))))) - (package-closure - (map cadr direct-inputs)))))))) - `(,@all-static-inputs - ,@direct-inputs))))) +(define-public ghc-pandoc + (deprecated-package "ghc-pandoc" pandoc)) (define-public ghc-pandoc-types (package (name "ghc-pandoc-types") - (version "1.22.1") + (version "1.22.2.1") (source (origin (method url-fetch) (uri (hackage-uri "pandoc-types" version)) (sha256 (base32 - "0z2j306jsiriwhib0201hsllwyck7qcvqci5c25frwsmknr3mls2")))) + "17b5c4b9jmx2gca1wk9vlnvvlzdw21qiqc0bpikkkiv7kl99drsc")))) (build-system haskell-build-system) (properties '((upstream-name . "pandoc-types"))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; None of the directory names are actually used. By generating a - ;; simpler module without references to store names we avoid - ;; introducing references in the pandoc executable. - (add-after 'unpack 'create-simple-paths-module - (lambda _ - (call-with-output-file "Paths_pandoc_types.hs" - (lambda (port) - (format port "\ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoRebindableSyntax #-} -{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} -module Paths_pandoc_types (version) where -import Data.Version (Version(..)) -version :: Version -version = Version [~a] [] -" (string-map (lambda (chr) (if (eq? chr #\.) #\, chr)) ,version)))) - #t))))) - (inputs - (list ghc-syb ghc-aeson)) - (native-inputs - (list ghc-quickcheck - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-string-qq - ghc-hunit)) - (home-page "https://pandoc.org") + (inputs (list ghc-syb ghc-aeson ghc-quickcheck)) + (native-inputs (list ghc-test-framework ghc-test-framework-hunit + ghc-test-framework-quickcheck2 ghc-hunit + ghc-string-qq)) + (home-page "https://pandoc.org/") (synopsis "Types for representing a structured document") (description "This module defines the @code{Pandoc} data structure, which is used by @@ -8876,8 +8370,8 @@ building up, manipulating and serialising @code{Pandoc} structures.") (build-system haskell-build-system) (properties '((upstream-name . "parallel"))) (arguments - `(#:cabal-revision - ("3" "1lv3y3zrdfc09nsiqxg7mzcahgnqi6z9caspd4lvifhhfrqy2722"))) + `(#:cabal-revision ("5" + "1q45wzpf2sda0244l55gakl3g5zqhcb27m86nhl3vslcjc35mpbf"))) (home-page "https://hackage.haskell.org/package/parallel") (synopsis "Parallel programming library") (description @@ -8930,14 +8424,13 @@ is also parametric in the input stream type.") (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "parser-combinators" version)) - (sha256 - (base32 - "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3")))) + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "parser-combinators" version)) + (sha256 + (base32 + "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k")))) (build-system haskell-build-system) (properties '((upstream-name . "parser-combinators"))) (home-page "https://github.com/mrkkrp/parser-combinators") @@ -8950,28 +8443,26 @@ combinators.") (define-public ghc-parsers (package (name "ghc-parsers") - (version "0.12.10") - (source - (origin - (method url-fetch) - (uri (hackage-uri "parsers" version)) - (sha256 - (base32 - "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p")))) + (version "0.12.11") + (source (origin + (method url-fetch) + (uri (hackage-uri "parsers" version)) + (sha256 + (base32 + "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi")))) (build-system haskell-build-system) (properties '((upstream-name . "parsers"))) - (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy - ; -package attoparsec-0.13.0.1" - (inputs - (list ghc-base-orphans - ghc-attoparsec - ghc-scientific - ghc-semigroups - ghc-charset - ghc-unordered-containers)) - (home-page "https://github.com/ekmett/parsers/") + (inputs (list ghc-base-orphans + ghc-charset + ghc-scientific + ghc-unordered-containers + ghc-attoparsec + ghc-semigroups)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-instances)) + (home-page "http://github.com/ekmett/parsers/") (synopsis "Parsing combinators") - (description "This library provides convenient combinators for working + (description + "This library provides convenient combinators for working with and building parsing combinator libraries. Given a few simple instances, you get access to a large number of canned definitions. Instances exist for the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s @@ -8981,31 +8472,24 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (define-public ghc-path (package (name "ghc-path") - (version "0.8.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "path" version)) - (sha256 - (base32 - "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4")))) + (version "0.9.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "path" version)) + (sha256 + (base32 + "15xxsjdxxqxnh20iqhprbdyhldk2igl5gd4ld6hhk9nqgwqdcr0f")))) (build-system haskell-build-system) (properties '((upstream-name . "path"))) - (arguments - `(#:cabal-revision - ("1" "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja"))) - (inputs - (list ghc-aeson ghc-hashable)) - (native-inputs - (list ghc-hspec - ghc-quickcheck - ghc-genvalidity - ghc-genvalidity-hspec - ghc-genvalidity-property - ghc-hspec - ghc-validity)) - (home-page - "https://hackage.haskell.org/package/path") + (inputs (list ghc-aeson ghc-hashable)) + (native-inputs (list ghc-hspec + ghc-quickcheck + ghc-genvalidity + ghc-genvalidity-property + ghc-genvalidity-hspec + ghc-hspec + ghc-validity)) + (home-page "http://hackage.haskell.org/package/path") (synopsis "Support for well-typed paths") (description "This package introduces a type for paths upholding useful invariants.") @@ -9014,32 +8498,21 @@ invariants.") (define-public ghc-path-io (package (name "ghc-path-io") - (version "1.6.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "path-io" version)) - (sha256 - (base32 - "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n")))) - (build-system haskell-build-system) - (properties '((upstream-name . "path-io"))) - (arguments - `(#:cabal-revision - ("3" "0rsr9r2175lf7zcz2sns0mhxkvl21pm50sjidjq5v75nalrsw6rp"))) - (inputs - (list ghc-dlist - ghc-exceptions - ghc-path - ghc-transformers-base - ghc-unix-compat - ghc-temporary)) - (native-inputs - (list ghc-hspec)) - (home-page - "https://github.com/mrkkrp/path-io") + (version "1.7.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "path-io" version)) + (sha256 + (base32 + "1jr1inh3x0a42rdh4q0jipbw8jsprdza1j5xkzd7nxcq0a143g9l")))) + (build-system haskell-build-system) + (properties '((upstream-name . "path-io"))) + (inputs (list ghc-dlist ghc-path ghc-temporary ghc-unix-compat)) + (native-inputs (list ghc-hspec)) + (home-page "https://github.com/mrkkrp/path-io") (synopsis "Functions for manipulating well-typed paths") - (description "This package provides an interface to the @code{directory} + (description + "This package provides an interface to the @code{directory} package for users of @code{path}. It also implements some missing stuff like recursive scanning and copying of directories, working with temporary files/directories, and more.") @@ -9140,83 +8613,81 @@ syntax and semantics as Perl 5.") (define-public ghc-persistent (package (name "ghc-persistent") - (version "2.13.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "persistent" version)) - (sha256 - (base32 - "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k")))) + (version "2.13.3.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "persistent" version)) + (sha256 + (base32 + "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent"))) - (inputs - (list ghc-aeson - ghc-attoparsec - ghc-base64-bytestring - ghc-blaze-html - ghc-conduit - ghc-fast-logger - ghc-http-api-data - ghc-lift-type - ghc-monad-logger - ghc-path-pieces - ghc-resource-pool - ghc-resourcet - ghc-scientific - ghc-silently - ghc-th-lift-instances - ghc-unliftio-core - ghc-unliftio - ghc-unordered-containers - ghc-vector)) - (native-inputs - (list ghc-hspec ghc-quickcheck ghc-quickcheck-instances - ghc-shakespeare)) - (home-page "https://www.yesodweb.com/book/persistent") + (inputs (list ghc-conduit + ghc-aeson + ghc-attoparsec + ghc-base64-bytestring + ghc-blaze-html + ghc-fast-logger + ghc-http-api-data + ghc-lift-type + ghc-monad-logger + ghc-path-pieces + ghc-resource-pool + ghc-resourcet + ghc-scientific + ghc-silently + ghc-th-lift-instances + ghc-unliftio + ghc-unliftio-core + ghc-unordered-containers + ghc-vault + ghc-vector)) + (native-inputs (list ghc-hspec ghc-quickcheck ghc-quickcheck-instances + ghc-shakespeare)) + (arguments + `(#:cabal-revision ("3" + "0kyipwaspzah6f88s51d61kr8i9g05grm2g0lnnw28jp06nggg5d"))) + (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Type-safe, multi-backend data serialization for Haskell") - (description "This Haskell package allows Haskell programs to access data + (description + "This Haskell package allows Haskell programs to access data storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") (license license:expat))) (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.13.0.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "persistent-sqlite" version)) - (sha256 - (base32 - "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338")))) + (version "2.13.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "persistent-sqlite" version)) + (sha256 + (base32 + "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-sqlite"))) - (inputs - (list ghc-persistent - ghc-aeson - ghc-conduit - ghc-microlens-th - ghc-monad-logger - ghc-resource-pool - ghc-resourcet - ghc-unliftio-core - ghc-unordered-containers)) - (native-inputs - (list ghc-persistent-template - ghc-persistent-test - ghc-exceptions - ghc-fast-logger - ghc-hspec - ghc-hunit - ghc-quickcheck - ghc-system-fileio - ghc-system-filepath - ghc-temporary)) - (home-page - "https://www.yesodweb.com/book/persistent") + (inputs (list ghc-persistent + ghc-aeson + ghc-conduit + ghc-microlens-th + ghc-monad-logger + ghc-resource-pool + ghc-resourcet + ghc-unliftio-core + ghc-unordered-containers)) + (native-inputs (list ghc-persistent-test + ghc-fast-logger + ghc-hspec + ghc-hunit + ghc-microlens + ghc-quickcheck + ghc-system-fileio + ghc-system-filepath + ghc-temporary)) + (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the persistent library using sqlite3") - (description "This Haskell package includes a thin sqlite3 wrapper based + (description + "This Haskell package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.") (license license:expat))) @@ -9254,14 +8725,14 @@ functions for the ghc-persistent package.") (define-public ghc-persistent-test (package (name "ghc-persistent-test") - (version "2.13.0.3") + (version "2.13.1.2") (source (origin (method url-fetch) (uri (hackage-uri "persistent-test" version)) (sha256 (base32 - "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs")))) + "0cah2gyp5lm9hipm3wvcxnl14cmq51dajzcw3wcf9xd19sbm4k49")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-test"))) (inputs @@ -9342,6 +8813,9 @@ For further information, see (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) + (arguments + `(#:cabal-revision ("6" + "16s8a1ijakhsk73ny2vrw6a8r2dszgncd0wk735ii6csg3l2c9pm"))) (home-page "https://hackage.haskell.org/package/pipes") (synopsis "Compositional pipelines") @@ -9399,8 +8873,8 @@ other end when progressing past the actual edge.") (build-system haskell-build-system) (properties '((upstream-name . "polyparse"))) (arguments - `(#:cabal-revision - ("2" "1n5q6w7x46cvcq7j1pg9jx9h72vcsc5di35rbkmwgjw6pq4w4gfl"))) + `(#:cabal-revision ("5" + "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc"))) (home-page "http://code.haskell.org/~malcolm/polyparse/") (synopsis @@ -9417,18 +8891,19 @@ Strings.") (define-public ghc-pqueue (package (name "ghc-pqueue") - (version "1.4.1.3") + (version "1.4.3.0") (source (origin (method url-fetch) (uri (hackage-uri "pqueue" version)) (sha256 (base32 - "1sz7hlnfd86hbwrgqxczmsjsl1ki0ryi9dgzscxlsgjkdgcdia2p")))) + "0kl608jw0xz0n4ysw7p3cvlm1s71xrysw8862cddrzbr38bv8jvq")))) (build-system haskell-build-system) (properties '((upstream-name . "pqueue"))) + (inputs (list ghc-indexed-traversable)) (native-inputs - (list ghc-quickcheck)) + (list ghc-tasty ghc-tasty-quickcheck)) (home-page "https://hackage.haskell.org/package/pqueue") (synopsis "Reliable, persistent, fast priority queues") (description @@ -9577,21 +9052,19 @@ examination.") (define-public ghc-pretty-simple (package (name "ghc-pretty-simple") - (version "4.0.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "pretty-simple" version)) - (sha256 - (base32 "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw")))) + (version "4.1.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "pretty-simple" version)) + (sha256 + (base32 + "0di7n3kq2bl0xqj9b1xxf3jznyy6cfyjs6hf6g0bi72rf4wprd1w")))) (build-system haskell-build-system) (properties '((upstream-name . "pretty-simple"))) - - (inputs - (list ghc-aeson ghc-optparse-applicative - ghc-prettyprinter-ansi-terminal ghc-prettyprinter)) - (native-inputs - (list cabal-doctest ghc-doctest ghc-glob ghc-quickcheck)) + (inputs (list ghc-prettyprinter ghc-prettyprinter-ansi-terminal + ghc-optparse-applicative ghc-aeson)) + (native-inputs (list ghc-doctest ghc-glob ghc-quickcheck)) + (arguments (list #:tests? #f)) ; Could not find module ‘Build_doctests’ (home-page "https://github.com/cdepillabout/pretty-simple") (synopsis "Pretty printer for data types with a 'Show' instance") (description @@ -9602,27 +9075,27 @@ Show instance.") (define-public ghc-primitive (package (name "ghc-primitive") - (version "0.7.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "primitive" version)) - (sha256 - (base32 - "1facmq2wxhn5mbgd209zz5swyaw1q970fv3hd84klaxrhabqaxwi")))) + (version "0.7.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "primitive" version)) + (sha256 + (base32 + "1p01fmw8yi578rvwicrlpbfkbfsv7fbnzb88a7vggrhygykgs31w")))) (build-system haskell-build-system) (properties '((upstream-name . "primitive"))) - (arguments `(#:tests? #f)) ; TODO: Loops. -; (native-inputs -; `(("ghc-base-orphans" ,ghc-base-orphans) -; ("ghc-quickcheck-classes-base" ,ghc-quickcheck-classes-base) -; ("ghc-quickcheck" ,ghc-quickcheck) -; ("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) -; ("ghc-tagged" ,ghc-tagged) -; ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page - "https://github.com/haskell/primitive") +; (native-inputs (list ghc-base-orphans +; ghc-quickcheck-classes-base +; ghc-quickcheck +; ghc-tasty +; ghc-tasty-quickcheck +; ghc-tagged +; ghc-transformers-compat)) + (arguments + `(#:tests? #f ; Cannot resolve package cycle. + #:cabal-revision ("2" + "0xh1m8nybz760c71gm1w9fga25y2rys1211q77v6wagdsas634yf"))) + (home-page "https://github.com/haskell/primitive") (synopsis "Primitive memory-related operations") (description "This package provides various primitive memory-related operations.") @@ -9735,20 +9208,18 @@ the ideal templating system.") (define-public ghc-protolude (package (name "ghc-protolude") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "protolude" version)) - (sha256 - (base32 - "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))) + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "protolude" version)) + (sha256 + (base32 + "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y")))) (build-system haskell-build-system) (properties '((upstream-name . "protolude"))) - (inputs - (list ghc-async ghc-hashable ghc-mtl-compat ghc-paths - ghc-transformers-compat)) - (home-page "https://github.com/protolude/protolude") + (inputs (list ghc-async ghc-hashable ghc-mtl-compat + ghc-transformers-compat)) + (home-page "https://github.com/sdiehl/protolude") (synopsis "Sensible set of defaults for writing custom Preludes") (description "Protolude gives you sensible defaults for writing custom Preludes to @@ -9758,18 +9229,19 @@ replace the standard one provided by GHC.") (define-public ghc-psqueue (package (name "ghc-psqueue") - (version "1.1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (hackage-uri "PSQueue" version)) (sha256 (base32 - "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza")))) + "02pgqzwxndi8cwa5fw668gfsh7z3lzbygkgcsf56bwrxwqjyz4bi")))) (build-system haskell-build-system) (properties '((upstream-name . "PSQueue"))) + (native-inputs (list ghc-quickcheck)) (arguments '(#:cabal-revision - ("2" "0n1yrv1x1dxbjn9hjr8lk4k5in9c75ixzldlmszayi26bvax7329"))) + ("1" "02a5g59sc9jh3v4pibhjpijv8lsbiydznrpqyin7qhwsyc0p813a"))) (home-page "https://hackage.haskell.org/package/PSQueue") (synopsis "Priority search queue") (description @@ -9784,32 +9256,26 @@ keys, in linear time.") (define-public ghc-psqueues (package (name "ghc-psqueues") - (version "0.2.7.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "psqueues" version)) - (sha256 - (base32 - "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6")))) + (version "0.2.7.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "psqueues" version)) + (sha256 + (base32 + "1cmz7spfzx7niglmsphnndh0m4b8njkn0fhb9nshbnbq6nx515yh")))) (build-system haskell-build-system) (properties '((upstream-name . "psqueues"))) - (arguments - '(#:tests? #f ; TODO: Needs quickcheck<2.14 - #:cabal-revision - ("1" "0d0mm3c8x31dasfzp1884r2irkm3c9irvvbahjzfr1bzzxfb7vyv"))) - (inputs - (list ghc-hashable)) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-tagged - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) - (home-page "https://github.com/jaspervdj/psqueues") + (inputs (list ghc-hashable)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-tagged)) + (home-page "http://hackage.haskell.org/package/psqueues") (synopsis "Pure priority search queues") - (description "The psqueues package provides + (description + "The psqueues package provides @uref{https://en.wikipedia.org/wiki/Priority_queue, Priority Search Queues} in three different flavors: @@ -9878,36 +9344,33 @@ usable.") (define-public ghc-random (package (name "ghc-random") - (version "1.2.0") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "random" version)) - (sha256 - (base32 "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4")))) + (version "1.2.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "random" version)) + (sha256 + (base32 + "0xlv1k4sj87akwvj54kq4nrfkzi6qcz1941bf78pnkbaxpvp44iy")))) (build-system haskell-build-system) (properties '((upstream-name . "random"))) - (arguments - `(#:tests? #f - #:cabal-revision - ("6" "1hzfz9b1cxrsya8i53yx145iypaakfsfjix7l8girhx7vbz0cm8r"))) - (inputs `(("ghc-splitmix" ,ghc-splitmix-bootstrap))) - ;; ghc-random is widely used and causes quite a few loops. -; (native-inputs -; `(("ghc-doctest" ,ghc-doctest) -; ("ghc-mwc-random" ,ghc-mwc-random) -; ("ghc-primitive" ,ghc-primitive) -; ("ghc-unliftio" ,ghc-unliftio) -; ("ghc-vector" ,ghc-vector) -; ("ghc-smallcheck" ,ghc-smallcheck) -; ("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) -; ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) -; ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://hackage.haskell.org/package/random") + ;; ghc-random is widely used and causes quite a few loops, so disable tests. + (arguments (list #:tests? #f)) + (inputs (list ghc-splitmix-bootstrap)) +; (native-inputs (list ghc-doctest +; ghc-mwc-random +; ghc-primitive +; ghc-unliftio-bootstrap +; ghc-vector +; ghc-smallcheck +; ghc-tasty +; ghc-tasty-smallcheck +; ghc-tasty-hunit +; ghc-tasty +; ghc-tasty-inspection-testing)) + (home-page "http://hackage.haskell.org/package/random") (synopsis "Random number library") - (description "This package provides a basic random number generation + (description + "This package provides a basic random number generation library, including the ability to split random number generators.") (license license:bsd-3))) @@ -9958,6 +9421,9 @@ DOS/Windows paths and markup languages (such as XML).") "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h")))) (build-system haskell-build-system) (properties '((upstream-name . "readable"))) + (arguments + `(#:cabal-revision ("1" + "0dywlvxjszqa1dj5r1cva0viv2l1hm8mw75zddnf96pfpd00fmga"))) (home-page "https://github.com/mightybyte/readable") (synopsis "Type class for reading from Text and ByteString") (description "This package provides a @code{Readable} type class for @@ -9968,38 +9434,41 @@ includes efficient implementations for common data types.") (define-public ghc-rebase (package (name "ghc-rebase") - (version "1.13.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "rebase" version)) - (sha256 - (base32 - "0sh1vha10n28c4jb97p99xglghqph8ppydqzbnb2h25a34057927")))) + (version "1.16.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "rebase" version)) + (sha256 + (base32 + "0mb1x5p3lvfhxsrnmkhsv6f4rd1cxp6m3qg6kyz30svrbwxsvvkz")))) (build-system haskell-build-system) (properties '((upstream-name . "rebase"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-bifunctors - ghc-comonad - ghc-contravariant - ghc-dlist - ghc-either - ghc-hashable - ghc-hashable-time - ghc-profunctors - ghc-scientific - ghc-selective - ghc-semigroupoids - ghc-unordered-containers - ghc-uuid-types - ghc-vector - ghc-vector-instances - ghc-void)) + (inputs (list ghc-bifunctors + ghc-contravariant + ghc-comonad + ghc-dlist + ghc-either + ghc-groups + ghc-hashable + ghc-invariant + ghc-profunctors + ghc-scientific + ghc-selective + ghc-semigroupoids + ghc-time-compat + ghc-unordered-containers + ghc-uuid-types + ghc-vector + ghc-vector-instances + ghc-void)) + (arguments + `(#:cabal-revision ("1" + "1igpk9gz54jfvf5m69xcp7hl567c4lkbmwhzylcbx0i1n0pd7i2n"))) (home-page "https://github.com/nikita-volkov/rebase") (synopsis "Progressive alternative to the base package for Haskell") - (description "This Haskell package is intended for those who are + (description + "This Haskell package is intended for those who are tired of keeping long lists of dependencies to the same essential libraries in each package as well as the endless imports of the same APIs all over again. @@ -10025,24 +9494,23 @@ the community, with the missing features being added with pull-requests.") (define-public ghc-reducers (package (name "ghc-reducers") - (version "3.12.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "reducers" version)) - (sha256 - (base32 - "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) + (version "3.12.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "reducers" version)) + (sha256 + (base32 + "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0")))) (build-system haskell-build-system) (properties '((upstream-name . "reducers"))) + (inputs (list ghc-fingertree ghc-hashable ghc-unordered-containers + ghc-semigroupoids ghc-semigroups)) (arguments - '(#:cabal-revision - ("2" "1kd38n9h2hxl09khvkvkhnflgm6rbky1zkw3iazlpb8xk9zkk39s"))) - (inputs - (list ghc-fingertree ghc-hashable ghc-unordered-containers - ghc-semigroupoids ghc-semigroups)) - (home-page "https://github.com/ekmett/reducers/") - (synopsis "Semigroups, specialized containers and a general map/reduce framework") + `(#:cabal-revision ("2" + "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"))) + (home-page "http://github.com/ekmett/reducers/") + (synopsis + "Semigroups, specialized containers and a general map/reduce framework") (description "This library provides various semigroups, specialized containers and a general map/reduce framework for Haskell.") (license license:bsd-3))) @@ -10096,36 +9564,23 @@ configurations to coexist without resorting to mutable global variables or (define-public ghc-regex (package (name "ghc-regex") - (version "1.1.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "regex" version)) - (sha256 - (base32 - "02hxgy5ck3h5pwd5gzs4565qbql8457cjdbbc2yrk236qzc1qa8x")))) + (version "1.1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "regex" version)) + (sha256 + (base32 + "1nzyfkqmclmawmphvksvm9l64awqgnypic4xplc2s9sjcj4h814a")))) (build-system haskell-build-system) (properties '((upstream-name . "regex"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-dependencies - (lambda _ - (substitute* "regex.cabal" - (("base-compat.*>=.*0.6.*") - "base-compat >= 0.6\n") - (("template-haskell.*>=.*2.7.*") - "template-haskell >= 2.7\n")) - #t))))) - (inputs - (list ghc-base-compat - ghc-hashable - ghc-regex-base - ghc-regex-pcre-builtin - ghc-regex-tdfa - ghc-time-locale-compat - ghc-unordered-containers - ghc-utf8-string)) + (inputs (list ghc-base-compat + ghc-hashable + ghc-regex-base + ghc-regex-pcre-builtin + ghc-regex-tdfa + ghc-time-locale-compat + ghc-unordered-containers + ghc-utf8-string)) (home-page "https://regex.uk") (synopsis "Toolkit for regex-base") (description @@ -10163,20 +9618,22 @@ regular expressions. Parsers can be built using Applicative interface.") (define-public ghc-regex-base (package (name "ghc-regex-base") - (version "0.94.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "regex-base" version)) - (sha256 - (base32 - "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi")))) + (version "0.94.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "regex-base" version)) + (sha256 + (base32 + "1w9fxad1dwi040r3db9i2cjhhrl86p3hngj13ixbcnqgb27l16bv")))) (build-system haskell-build-system) (properties '((upstream-name . "regex-base"))) - (home-page - "https://sourceforge.net/projects/lazy-regex") + (arguments + `(#:cabal-revision ("1" + "1k2gzjm7xz69f7zr08wh2wzb5dhb659cvimsvx0g9p8cf5f45x2g"))) + (home-page "https://wiki.haskell.org/Regular_expressions") (synopsis "Replaces/Enhances Text.Regex") - (description "@code{Text.Regex.Base} provides the interface API for + (description + "@code{Text.Regex.Base} provides the interface API for regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (license license:bsd-3))) @@ -10195,36 +9652,15 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (properties '((upstream-name . "regex-compat"))) (inputs (list ghc-regex-base ghc-regex-posix)) + (arguments + `(#:cabal-revision ("2" + "0ldqpdxikm17ydrkfmichflkdqdrkspv4r0qy3zbdgqf5033pj4n"))) (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") (description "This library provides one module layer over @code{regex-posix} to replace @code{Text.Regex}.") (license license:bsd-3))) -(define-public ghc-regex-compat-tdfa - (package - (name "ghc-regex-compat-tdfa") - (version "0.95.1.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "regex-compat-tdfa" version)) - (sha256 - (base32 - "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg")))) - (build-system haskell-build-system) - (properties '((upstream-name . "regex-compat-tdfa"))) - (inputs - (list ghc-regex-base ghc-regex-tdfa)) - (home-page "https://hub.darcs.net/shelarcy/regex-compat-tdfa") - (synopsis "Unicode Support version of Text.Regex, using regex-tdfa") - (description - "One module layer over @code{regex-tdfa} to replace @code{Text.Regex}. -@code{regex-compat} can't use Unicode characters correctly because of using regex-posix. -This is not good for Unicode users. This modified regex-compat uses regex-tdfa to solve -this problem.") - (license license:bsd-3))) - (define-public ghc-regex-pcre (package (name "ghc-regex-pcre") @@ -10298,23 +9734,18 @@ Haskell library @code{regex-base}.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.3.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "regex-tdfa" version)) - (sha256 - (base32 - "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi")))) + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "regex-tdfa" version)) + (sha256 + (base32 + "1lfzhir5zbgga44zhr4qvc2xc9pa9lslv12c8lwqqw80bzfdfq16")))) (build-system haskell-build-system) (properties '((upstream-name . "regex-tdfa"))) - (arguments - '(#:cabal-revision - ("1" "02gwf740vs0jy3l6dgw72r8c04yggshia6w16n140ncpsici8c4r"))) - (inputs - (list ghc-regex-base)) - (native-inputs (list ghc-utf8-string)) - (home-page "https://github.com/haskell-hvr/regex-tdfa") + (inputs (list ghc-regex-base)) + (native-inputs (list ghc-utf8-string ghc-doctest-parallel)) + (home-page "https://wiki.haskell.org/Regular_expressions") (synopsis "POSIX extended regular expressions in Haskell") (description "Regex-tdfa is a pure Haskell regular expression library implementing POSIX @@ -10325,18 +9756,15 @@ inspired by libtre.") (define-public ghc-repline (package (name "ghc-repline") - (version "0.4.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "repline" version)) - (sha256 - (base32 - "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3")))) + (version "0.4.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "repline" version)) + (sha256 + (base32 + "0nldn02yqqmrxkzwzrx3v6hkb4y2hch48jkcr2qrw1dl0vqv70b1")))) (build-system haskell-build-system) (properties '((upstream-name . "repline"))) - (inputs - (list ghc-exceptions ghc-haskeline)) (home-page "https://github.com/sdiehl/repline") (synopsis "Haskeline wrapper for GHCi-like REPL interfaces") (description @@ -10347,22 +9775,20 @@ normal mtl transformers.") (define-public ghc-rerebase (package (name "ghc-rerebase") - (version "1.13.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "rerebase" version)) - (sha256 - (base32 - "0j50l96whwi65ir35nfhn24h6103zy1ilfjsqiax63ajzw169fkv")))) + (version "1.16.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "rerebase" version)) + (sha256 + (base32 + "04pw2j4nh8x53axmfzp9d2plmiwxpxddgwcji0a8j24lkdyv8k32")))) (build-system haskell-build-system) (properties '((upstream-name . "rerebase"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-rebase)) + (inputs (list ghc-rebase)) (home-page "https://github.com/nikita-volkov/rerebase") (synopsis "Reexports from ``base'' with many other standard libraries") - (description "A rich drop-in replacement for @code{base}. For details and + (description + "A rich drop-in replacement for @code{base}. For details and documentation please visit @uref{https://github.com/nikita-volkov/rerebase, the project's home page}.") (license license:expat))) @@ -10381,9 +9807,16 @@ the project's home page}.") (build-system haskell-build-system) (properties '((upstream-name . "resolv"))) (arguments - `(#:tests? #f ; TODO: tasty >=1.2.3 && <1.3 || >=1.3.1 && <1.4 - #:cabal-revision - ("3" "0af5dsdyn04i76d012xhhfkkml10bqzl6q2yivkhf8rlvh1fiii5"))) + `(;#:tests? #f ; tasty >=1.2.3 && <1.3 || >=1.3.1 && <1.4 + #:cabal-revision ("5" + "0df5y8bj9bxjmqnkvpwxvb17k70g1i174xs6vfrv9f1lys7xkqk1") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "resolv.cabal" + (("\\b(tasty)\\s+[^,]+" all dep) + dep))))))) (inputs (list ghc-base16-bytestring)) (native-inputs @@ -10422,26 +9855,18 @@ connections.") (define-public ghc-resourcet (package (name "ghc-resourcet") - (version "1.2.4.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "resourcet" version)) - (sha256 - (base32 - "0zrvnikw1a0r2j59k12fxikyrg0ki5a7xhqhjgfl9h6dqpz54h85")))) + (version "1.2.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "resourcet" version)) + (sha256 + (base32 + "0d7xnpysrick56gxzkkj0mpblywbxaaldhziyl77am3822r3afzq")))) (build-system haskell-build-system) (properties '((upstream-name . "resourcet"))) - (inputs - (list ghc-transformers-base - ghc-monad-control - ghc-transformers-compat - ghc-mmorph - ghc-exceptions - ghc-unliftio-core)) - (native-inputs - (list ghc-lifted-base ghc-hspec)) - (home-page "https://github.com/snoyberg/conduit") + (inputs (list ghc-unliftio-core ghc-primitive)) + (native-inputs (list ghc-hspec)) + (home-page "http://github.com/snoyberg/conduit") (synopsis "Deterministic allocation and freeing of scarce resources") (description "ResourceT is a monad transformer which creates a region of code where you can safely allocate resources.") @@ -10450,24 +9875,22 @@ code where you can safely allocate resources.") (define-public ghc-retry (package (name "ghc-retry") - (version "0.8.1.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "retry" version)) - (sha256 - (base32 - "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5")))) + (version "0.9.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "retry" version)) + (sha256 + (base32 + "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1")))) (build-system haskell-build-system) (properties '((upstream-name . "retry"))) - (inputs - (list ghc-exceptions ghc-random)) - (native-inputs - (list ghc-hunit ghc-tasty ghc-tasty-hunit ghc-tasty-hedgehog - ghc-hedgehog)) - (home-page "https://github.com/Soostone/retry") + (inputs (list ghc-random ghc-mtl-compat ghc-unliftio-core)) + (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit + ghc-tasty-hedgehog ghc-hedgehog)) + (home-page "http://github.com/Soostone/retry") (synopsis "Retry combinators for monadic actions that may fail") - (description "This package exposes combinators that can wrap + (description + "This package exposes combinators that can wrap arbitrary monadic actions. They run the action and potentially retry running it with some configurable delay for a configurable number of times. The purpose is to make it easier to work with IO and especially @@ -10503,31 +9926,29 @@ better for some purposes.") (define-public ghc-rio (package (name "ghc-rio") - (version "0.1.21.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "rio" version)) - (sha256 - (base32 - "013m4xgsmg8h1rba9krxppz49lc5wz26gksms5zibsjj0w59m58h")))) + (version "0.1.22.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "rio" version)) + (sha256 + (base32 + "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6")))) (build-system haskell-build-system) (properties '((upstream-name . "rio"))) - (inputs - (list ghc-hashable - ghc-microlens - ghc-microlens-mtl - ghc-primitive - ghc-typed-process - ghc-unliftio-core - ghc-unliftio - ghc-unordered-containers - ghc-vector)) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) + (inputs (list ghc-hashable + ghc-microlens + ghc-microlens-mtl + ghc-primitive + ghc-typed-process + ghc-unliftio + ghc-unliftio-core + ghc-unordered-containers + ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) (home-page "https://github.com/commercialhaskell/rio#readme") (synopsis "Standard library for Haskell") - (description "This package works as a prelude replacement for Haskell, + (description + "This package works as a prelude replacement for Haskell, providing more functionality and types out of the box than the standard prelude (such as common data types like @code{ByteString} and @code{Text}), as well as removing common ``gotchas'', like partial @@ -10553,6 +9974,14 @@ expose it from another module in the hierarchy. (build-system haskell-build-system) (properties '((upstream-name . "roman-numerals"))) (inputs (list ghc-base-unicode-symbols)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "roman-numerals.cabal" + (("\\b(bytestring)\\s+[^,]+" all dep) + dep))))))) (home-page "https://github.com/roelvandijk/roman-numerals") (synopsis "Parsing and pretty printing of Roman numerals") (description @@ -10587,21 +10016,20 @@ exceptions.") (define-public ghc-safe-exceptions (package (name "ghc-safe-exceptions") - (version "0.1.7.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "safe-exceptions" version)) - (sha256 - (base32 - "15a80s87f603w8l7fnaba2cyqx62042vvcidpjzyga2685wpyqv9")))) + (version "0.1.7.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "safe-exceptions" version)) + (sha256 + (base32 + "1gxm61mccivrdz2qcfh5sim596nbrpapx0nli0bx7vx6z3c2ikli")))) (build-system haskell-build-system) (properties '((upstream-name . "safe-exceptions"))) - (native-inputs - (list ghc-hspec ghc-void hspec-discover)) - (home-page "https://github.com/fpco/safe-exceptions") + (native-inputs (list ghc-hspec ghc-void hspec-discover)) + (home-page "https://github.com/fpco/safe-exceptions#readme") (synopsis "Safe, consistent, and easy exception handling") - (description "Runtime exceptions - as exposed in @code{base} by the + (description + "Runtime exceptions - as exposed in @code{base} by the @code{Control.Exception} module - have long been an intimidating part of the Haskell ecosystem. This package is intended to overcome this. It provides a safe and simple API on top of the existing exception handling machinery. The @@ -10629,6 +10057,7 @@ handling wrong.") (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit ghc-test-framework-th)) + (arguments (list #:tests? #f)) ; Fail to build: Module ‘Data.ByteString’ does not export ‘hPutStrLn’. (home-page "https://github.com/luispedro/safeio") (synopsis "Write output to disk atomically") (description @@ -10738,6 +10167,9 @@ as sending some messages to the terminal - that has the following properties: ghc-tasty-quickcheck ghc-smallcheck ghc-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "1n67w1b64q59nn4845z3kr8rm0x0p7bi3cyp6n1dpnfs8k4l8x2i"))) (home-page "https://github.com/basvandijk/scientific") (synopsis "Numbers represented using scientific notation") (description "This package provides @code{Data.Scientific}, which provides @@ -10786,22 +10218,22 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl2 (package (name "ghc-sdl2") - (version "2.5.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sdl2" version)) - (sha256 - (base32 - "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q")))) + (version "2.5.4.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "sdl2" version)) + (sha256 + (base32 + "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym")))) (build-system haskell-build-system) (properties '((upstream-name . "sdl2"))) - (arguments '(#:tests? #f)) ; tests require graphical environment - (inputs - (list ghc-exceptions ghc-linear ghc-statevar ghc-vector sdl2)) - (native-inputs - (list ghc-weigh pkg-config)) - (home-page "https://hackage.haskell.org/package/sdl2") + (inputs (list ghc-statevar ghc-vector ghc-linear sdl2)) + (native-inputs (list ghc-weigh pkg-config)) + (arguments + `(#:tests? #f ; Needs a graphics card. + #:cabal-revision ("2" + "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"))) + (home-page "http://hackage.haskell.org/package/sdl2") (synopsis "High- and low-level bindings to the SDL library") (description "This package contains bindings to the SDL 2 library, in both high- and @@ -10817,21 +10249,18 @@ programming.") (define-public ghc-sdl2-image (package (name "ghc-sdl2-image") - (version "2.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sdl2-image" version)) - (sha256 - (base32 - "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) + (version "2.1.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "sdl2-image" version)) + (sha256 + (base32 + "03cjlmj844gmfxqn9mp8333hpsg227kaipgs6g68xwg0cvch696j")))) (build-system haskell-build-system) (properties '((upstream-name . "sdl2-image"))) - (inputs - (list ghc-sdl2 sdl2-image)) - (native-inputs - (list pkg-config)) - (home-page "https://hackage.haskell.org/package/sdl2-image") + (inputs (list ghc-sdl2 sdl2-image)) + (native-inputs (list pkg-config)) + (home-page "http://hackage.haskell.org/package/sdl2-image") (synopsis "Bindings to SDL2_image") (description "This package provides Haskell bindings to @code{SDL2_image}.") @@ -10840,26 +10269,19 @@ programming.") (define-public ghc-sdl2-mixer (package (name "ghc-sdl2-mixer") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sdl2-mixer" version)) - (sha256 - (base32 - "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) + (version "1.2.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "sdl2-mixer" version)) + (sha256 + (base32 + "16fgnxq2nmifbz3lrr7dn1qj57l5f2kzv124lya1fjaxmwk1h52q")))) (build-system haskell-build-system) (properties '((upstream-name . "sdl2-mixer"))) - (inputs - (list ghc-data-default-class - ghc-lifted-base - ghc-monad-control - ghc-sdl2 - ghc-vector - sdl2-mixer)) - (native-inputs - (list pkg-config)) - (home-page "https://hackage.haskell.org/package/sdl2-mixer") + (inputs (list ghc-data-default-class ghc-lifted-base ghc-monad-control + ghc-sdl2 ghc-vector sdl2-mixer)) + (native-inputs (list pkg-config)) + (home-page "http://hackage.haskell.org/package/sdl2-mixer") (synopsis "Bindings to SDL2 mixer") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") @@ -10944,28 +10366,28 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") (define-public ghc-semialign (package (name "ghc-semialign") - (version "1.1.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "semialign" version)) - (sha256 - (base32 - "11qs4imy3cq4cx9mm6g30r6qk3rngqrmz7lkl5379gs1yvgvs44q")))) + (version "1.2.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "semialign" version)) + (sha256 + (base32 + "0ci1jpp37p1lzyjxc1bljd6zgg407qmkl9s36b50qjxf85q6j06r")))) (build-system haskell-build-system) (properties '((upstream-name . "semialign"))) - (inputs - (list ghc-these - ghc-base-compat - ghc-hashable - ghc-tagged - ghc-unordered-containers - ghc-vector - ghc-semigroupoids)) - (home-page - "https://github.com/isomorphism/these") - (synopsis - "Align and Zip type-classes from the common Semialign ancestor") + (inputs (list ghc-these + ghc-hashable + ghc-indexed-traversable + ghc-indexed-traversable-instances + ghc-tagged + ghc-unordered-containers + ghc-vector + ghc-semigroupoids)) + (arguments + `(#:cabal-revision ("3" + "0dbcdnksik508i12arh3s6bis6779lx5f1df0jkc0bp797inhd7f"))) + (home-page "https://github.com/haskellari/these") + (synopsis "Align and Zip type-classes from the common Semialign ancestor") (description "The major use of @code{These} of this is provided by the @code{align} member of @code{Semialign} class, representing a @@ -10978,31 +10400,29 @@ class, forming lattice-like structure.") (define-public ghc-semigroupoids (package (name "ghc-semigroupoids") - (version "5.3.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "semigroupoids" version)) - (sha256 - (base32 - "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n")))) + (version "5.3.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "semigroupoids" version)) + (sha256 + (base32 + "169pjrm7lxjxrqj5q1iyl288bx5nj8n0pf2ri1cclxccqnvcsibd")))) (build-system haskell-build-system) (properties '((upstream-name . "semigroupoids"))) - (outputs '("out" "static" "doc")) - (inputs - (list ghc-base-orphans - ghc-transformers-compat - ghc-bifunctors - ghc-comonad - ghc-contravariant - ghc-distributive - ghc-generic-deriving - ghc-hashable - ghc-tagged - ghc-unordered-containers)) - (home-page "https://github.com/ekmett/semigroupoids") + (inputs (list ghc-base-orphans + ghc-bifunctors + ghc-transformers-compat + ghc-generic-deriving + ghc-contravariant + ghc-distributive + ghc-comonad + ghc-tagged + ghc-hashable + ghc-unordered-containers)) + (home-page "http://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") - (description "This library provides a wide array of (semi)groupoids and + (description + "This library provides a wide array of (semi)groupoids and operations for working with them. A @code{Semigroupoid} is a @code{Category} without the requirement of identity arrows for every object in the category. A @code{Category} is any @code{Semigroupoid} for which the Yoneda lemma holds. @@ -11010,26 +10430,26 @@ Finally, to work with these weaker structures it is beneficial to have containers that can provide stronger guarantees about their contents, so versions of @code{Traversable} and @code{Foldable} that can be folded with just a @code{Semigroup} are added.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-semigroups (package (name "ghc-semigroups") - (version "0.19.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "semigroups" version)) - (sha256 - (base32 - "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855")))) + (version "0.20") + (source (origin + (method url-fetch) + (uri (hackage-uri "semigroups" version)) + (sha256 + (base32 + "1qbk6scp1rzb69dy8mz26p6az5vi16g2lzwmwnfshh3br4rjwbch")))) (build-system haskell-build-system) (properties '((upstream-name . "semigroups"))) - (inputs - (list ghc-nats ghc-tagged ghc-unordered-containers ghc-hashable)) - (home-page "https://github.com/ekmett/semigroups/") + (inputs (list ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers + ghc-transformers-compat)) + (home-page "http://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") - (description "This package provides semigroups for Haskell. In + (description + "This package provides semigroups for Haskell. In mathematics, a semigroup is an algebraic structure consisting of a set together with an associative binary operation. A semigroup generalizes a monoid in that there might not exist an identity element. It @@ -11082,29 +10502,28 @@ by @code{0} annihilates R.") (define-public ghc-serialise (package (name "ghc-serialise") - (version "0.2.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "serialise" version)) - (sha256 - (base32 - "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69")))) + (version "0.2.6.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "serialise" version)) + (sha256 + (base32 + "05m5h5vfjp4wvh6y7j2f3d4c3l6gxww2n1v38vqrjacpw641izwk")))) (build-system haskell-build-system) (properties '((upstream-name . "serialise"))) - (inputs - (list ghc-cborg - ghc-half - ghc-hashable - ghc-primitive - ghc-unordered-containers - ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck - ghc-quickcheck-instances)) + (inputs (list ghc-cborg + ghc-half + ghc-hashable + ghc-primitive + ghc-strict + ghc-these + ghc-unordered-containers + ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-hunit + ghc-tasty-quickcheck ghc-quickcheck-instances)) (arguments - `(#:cabal-revision - ("2" "1qcsp15v0swxy2qlvc40fil09zq32y3wl00y3passc2a4b4yhmr4"))) + `(#:cabal-revision ("1" + "0rlsi4jq2d1dak2fps5flcn27lywjlhvsi0x2k2lvnjqawnfb3f9"))) (home-page "https://github.com/well-typed/cborg") (synopsis "Binary serialisation library for Haskell values") (description @@ -11155,6 +10574,9 @@ environment variables.") "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir")))) (build-system haskell-build-system) (properties '((upstream-name . "setlocale"))) + (arguments + `(#:cabal-revision ("2" + "1k4idj2xl9dg5nfz128xazrrydz9mgm3bbjrc0cyby8n3c0ij9x1"))) (home-page "https://hackage.haskell.org/package/setlocale") (synopsis "Haskell bindings to setlocale") (description "This package provides Haskell bindings to the @@ -11164,27 +10586,28 @@ environment variables.") (define-public ghc-shakespeare (package (name "ghc-shakespeare") - (version "2.0.25") - (source - (origin - (method url-fetch) - (uri (hackage-uri "shakespeare" version)) - (sha256 - (base32 - "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4")))) - (build-system haskell-build-system) - (properties '((upstream-name . "shakespeare"))) - (inputs (list ghc-aeson + (version "2.0.30") + (source (origin + (method url-fetch) + (uri (hackage-uri "shakespeare" version)) + (sha256 + (base32 + "038yprj9yig2xbjs2pqsjzs4pl9ir2frdz9wn2pklc4kvdazx3aw")))) + (build-system haskell-build-system) + (properties '((upstream-name . "shakespeare"))) + (inputs (list ghc-aeson ghc-blaze-markup ghc-blaze-html + ghc-file-embed ghc-vector - ghc-th-lift ghc-unordered-containers - ghc-scientific)) + ghc-scientific + ghc-th-lift)) (native-inputs (list ghc-hspec ghc-hunit hspec-discover)) - (home-page "https://www.yesodweb.com/book/shakespearean-templates") + (home-page "http://www.yesodweb.com/book/shakespearean-templates") (synopsis "Family of type-safe template languages for Haskell") - (description "This Haskell package provides a family of type-safe + (description + "This Haskell package provides a family of type-safe templates with simple variable interpolation. Shakespeare templates can be used inline with a quasi-quoter or in an external file and it interpolates variables according to the type being inserted.") @@ -11193,30 +10616,26 @@ interpolates variables according to the type being inserted.") (define-public ghc-shelly (package (name "ghc-shelly") - (version "1.9.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "shelly" version)) - (sha256 - (base32 - "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday")))) + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "shelly" version)) + (sha256 + (base32 + "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65")))) (build-system haskell-build-system) (properties '((upstream-name . "shelly"))) - (inputs - (list ghc-unix-compat - ghc-system-filepath-bootstrap - ghc-system-fileio-bootstrap - ghc-monad-control - ghc-lifted-base - ghc-lifted-async - ghc-exceptions - ghc-enclosed-exceptions - ghc-async - ghc-transformers-base - ghc-hunit - ghc-hspec - ghc-hspec-contrib)) + (inputs (list ghc-async + ghc-enclosed-exceptions + ghc-lifted-async + ghc-lifted-base + ghc-monad-control + ghc-transformers-base + ghc-unix-compat)) + (native-inputs (list ghc-hspec ghc-hspec-contrib ghc-hunit)) + (arguments + `(#:cabal-revision ("1" + "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp"))) (home-page "https://github.com/yesodweb/Shelly.hs") (synopsis "Shell-like (systems) programming in Haskell") (description @@ -11227,23 +10646,30 @@ spirit to POSIX shells. Shelly is originally forked from the Shellish package. (define-public ghc-silently (package (name "ghc-silently") - (version "1.2.5.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "silently" version)) - (sha256 - (base32 - "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz")))) + (version "1.2.5.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "silently" version)) + (sha256 + (base32 + "0wk3yci4r9v0vwyzylj3k07damz17jwc6n6imwqahf4lsapsz7ds")))) (build-system haskell-build-system) (properties '((upstream-name . "silently"))) - (arguments `(#:tests? #f)) ;; circular dependency with nanospec + (native-inputs (list ghc-nanospec ghc-temporary)) (home-page "https://github.com/hspec/silently") (synopsis "Prevent writing to stdout") (description "This package provides functions to prevent or capture writing to stdout and other handles.") (license license:bsd-3))) +(define-public ghc-silently-bootstrap + (package + (inherit ghc-silently) + (name "ghc-silently-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-simple-reflect (package (name "ghc-simple-reflect") @@ -11295,30 +10721,17 @@ are the bottleneck of web servers.") (define-public ghc-size-based (package (name "ghc-size-based") - (version "0.1.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "size-based" version)) - (sha256 - (base32 - "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp")))) + (version "0.1.3.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "size-based" version)) + (sha256 + (base32 + "1x2z8iw4jgcp6xirclifjhh3rvyjy5xgqrd6lcv4gifj859sfjd2")))) (build-system haskell-build-system) (properties '((upstream-name . "size-based"))) - (inputs - (list ghc-dictionary-sharing ghc-testing-type-modifiers - ghc-template-haskell)) - (arguments - `(#:cabal-revision - ("1" "0kax1ypjyglkn6iff1x4yz12y7f2n249m95xvdhrc63hsa4xlcqv") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "size-based.cabal" - (("(template-haskell)\\s+.+$" all dep) - (string-append dep "\n")))))))) - (home-page "https://hackage.haskell.org/package/size-based") + (inputs (list ghc-dictionary-sharing ghc-testing-type-modifiers)) + (home-page "http://hackage.haskell.org/package/size-based") (synopsis "Sized functors for size-based enumerations") (description "This library provides a framework for size-based enumerations.") @@ -11327,13 +10740,13 @@ enumerations.") (define-public ghc-skylighting-core (package (name "ghc-skylighting-core") - (version "0.10.5.2") + (version "0.13.2") (source (origin (method url-fetch) (uri (hackage-uri "skylighting-core" version)) (sha256 (base32 - "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d")))) + "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting-core"))) (inputs @@ -11364,20 +10777,115 @@ supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to be the successor to highlighting-kate.") (license license:gpl2))) +(define-public ghc-skylighting-format-blaze-html + (package + (name "ghc-skylighting-format-blaze-html") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-blaze-html" version)) + (sha256 + (base32 + "04zg92x1jnzv6hac6wdgksgma7gi5g82x2kdxk8r7pk9yd6rn4xi")))) + (build-system haskell-build-system) + (properties '((upstream-name . "skylighting-format-blaze-html"))) + (inputs (list ghc-skylighting-core ghc-blaze-html)) + (home-page "https://github.com/jgm/skylighting") + (synopsis "HTML formatter for skylighting syntax highlighting library") + (description + "This module allows tokens produced by skylighting-core to be rendered as HTML.") + (license license:bsd-3))) + +(define-public ghc-skylighting-format-latex + (package + (name "ghc-skylighting-format-latex") + (version "0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-latex" version)) + (sha256 + (base32 + "0y7v5aifwar24i976pw32scfdywjwy2ad05ajhdf8l84nsd6rdlp")))) + (build-system haskell-build-system) + (properties '((upstream-name . "skylighting-format-latex"))) + (inputs (list ghc-skylighting-core)) + (home-page "https://github.com/jgm/skylighting") + (synopsis "LaTeX formatter for skylighting syntax highlighting library") + (description + "This module allows tokens produced by skylighting-core to be rendered as LaTeX +macros.") + (license license:bsd-3))) + +(define-public ghc-skylighting-format-context + (package + (name "ghc-skylighting-format-context") + (version "0.1.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-context" version)) + (sha256 + (base32 + "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0")))) + (build-system haskell-build-system) + (properties '((upstream-name . "skylighting-format-context"))) + (inputs (list ghc-skylighting-core)) + (home-page "https://github.com/jgm/skylighting") + (synopsis "ConTeXt formatter for skylighting syntax highlighting library") + (description + "This module allows tokens produced by skylighting-core to be rendered as ConTeXt +commands.") + (license license:bsd-3))) + +(define-public ghc-skylighting-format-ansi + (package + (name "ghc-skylighting-format-ansi") + (version "0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-ansi" version)) + (sha256 + (base32 + "16qavv10g5yqwi60axj7q595ll605vmnfjgdxyi029nd5rnaipr3")))) + (build-system haskell-build-system) + (properties '((upstream-name . "skylighting-format-ansi"))) + (inputs (list ghc-skylighting-core ghc-ansi-terminal ghc-colour)) + (home-page "https://github.com/jgm/skylighting") + (synopsis "ANSI formatter for skylighting syntax highlighting library") + (description + "This module allows tokens produced by skylighting-core to be rendered as ANSI +colored text.") + (license license:bsd-3))) + (define-public ghc-skylighting (package - (inherit ghc-skylighting-core) (name "ghc-skylighting") - (version "0.10.5.2") + (version "0.13.2") (source (origin (method url-fetch) - (uri (hackage-uri "skylighting-core" version)) + (uri (hackage-uri "skylighting" version)) (sha256 (base32 - "152ywiy7h04xjy0fdl571jwahl6c9350isqbm4p0na4cjd9cczzh")))) - (inputs - (modify-inputs (package-inputs ghc-skylighting-core) - (prepend ghc-skylighting-core))))) + "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879")))) + (build-system haskell-build-system) + (properties '((upstream-name . "skylighting"))) + (inputs (list ghc-skylighting-core + ghc-skylighting-format-ansi + ghc-skylighting-format-context + ghc-skylighting-format-latex + ghc-skylighting-format-blaze-html + ghc-pretty-show + ghc-blaze-html)) + (home-page "https://github.com/jgm/skylighting") + (synopsis "syntax highlighting library") + (description + "Skylighting is a syntax highlighting library with support for over one hundred +languages. It derives its tokenizers from XML syntax definitions used by KDE's +KSyntaxHighlighting framework, so any syntax supported by that framework can be +added. An optional command-line program is provided. Skylighting is intended +to be the successor to highlighting-kate. This package provides generated +syntax modules based on the KDE XML definitions provided by the +@code{skylighting-core} package.") + (license license:gpl2))) (define-public ghc-smallcheck (package @@ -11425,19 +10933,22 @@ automatically by SmallCheck.") (define-public ghc-sop-core (package (name "ghc-sop-core") - (version "0.5.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "sop-core" version)) - (sha256 - (base32 - "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys")))) + (version "0.5.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "sop-core" version)) + (sha256 + (base32 + "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7")))) (build-system haskell-build-system) (properties '((upstream-name . "sop-core"))) - (home-page "https://hackage.haskell.org/package/sop-core") + (arguments + `(#:cabal-revision ("1" + "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz"))) + (home-page "http://hackage.haskell.org/package/sop-core") (synopsis "True Sums of Products") - (description "This package provides an implementation of + (description + "This package provides an implementation of @math{n}-ary sums and @math{n}-ary products. The module @code{Data.SOP} is the main module of this library and contains more detailed documentation. The main use case of this package is to serve as the @@ -11460,6 +10971,9 @@ generics-sop}.") (properties '((upstream-name . "special-values"))) (inputs (list ghc-scientific ghc-ieee754 ghc-nats)) + (arguments + `(#:cabal-revision ("2" + "1vv5gydjd65jniifl3mnch8bzvpvdahi913gsa3kv5zijwhad699"))) (home-page "https://github.com/minad/special-values#readme") (synopsis "Typeclass providing special values") @@ -11471,24 +10985,20 @@ used for example by QuickCheck, see quickcheck-special." ) (define-public ghc-split (package (name "ghc-split") - (version "0.2.3.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "split" version)) - (sha256 - (base32 - "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7")))) + (version "0.2.3.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "split" version)) + (sha256 + (base32 + "0n9ip49laq5jwqw0c43lhf69ii8y4lwci9j6d5bjnjim23bai2mz")))) (build-system haskell-build-system) (properties '((upstream-name . "split"))) - (arguments - `(#:cabal-revision - ("1" "06pmlvyrz4rr7rsrghpyrdypprphm9522rvnz4l3i8333n4pb304"))) - (native-inputs - (list ghc-quickcheck)) - (home-page "https://hackage.haskell.org/package/split") + (native-inputs (list ghc-quickcheck)) + (home-page "http://hackage.haskell.org/package/split") (synopsis "Combinator library for splitting lists") - (description "This package provides a collection of Haskell functions for + (description + "This package provides a collection of Haskell functions for splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) @@ -11496,30 +11006,36 @@ mainstream languages.") (define-public ghc-splitmix (package (name "ghc-splitmix") - (version "0.1.0.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "splitmix" version)) - (sha256 - (base32 - "0das5n44dhlcv5i233iakx37d17kidqvhrvp6w9nd7hc015ry026")))) + (version "0.1.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "splitmix" version)) + (sha256 + (base32 + "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd")))) (build-system haskell-build-system) (properties '((upstream-name . "splitmix"))) - (native-inputs - (list ghc-async - ghc-base-compat-batteries - ghc-base-compat - ghc-hunit - ghc-math-functions - ghc-random-bootstrap - ghc-test-framework - ghc-test-framework-hunit - ghc-tf-random - ghc-vector)) - (home-page "https://hackage.haskell.org/package/splitmix") + (native-inputs (list ghc-hunit + ghc-base-compat + ghc-hunit + ghc-math-functions + ghc-test-framework + ghc-test-framework-hunit + ghc-async + ghc-base-compat-batteries + ghc-random + ghc-tf-random + ghc-vector + ghc-base-compat-batteries + ghc-hunit)) + (arguments + `(#:tests? #f ; Missing library testu01. + #:cabal-revision ("1" + "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"))) + (home-page "http://hackage.haskell.org/package/splitmix") (synopsis "Fast and splittable pseudorandom number generator") - (description "This package provides a Pure Haskell implementation of the + (description + "This package provides a Pure Haskell implementation of the SplitMix pseudorandom number generator. SplitMix is a \"splittable\" pseudorandom number generator that is quite fast: 9 64-bit arithmetic/logical operations per 64 bits generated. SplitMix is tested @@ -11592,41 +11108,39 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-statistics (package (name "ghc-statistics") - (version "0.15.2.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "statistics" version)) - (sha256 - (base32 - "0j9awbg47fzb58k5z2wgkp6a0042j7hqrl1g6lyflrbsfswdp5n4")))) + (version "0.16.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "statistics" version)) + (sha256 + (base32 + "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq")))) (build-system haskell-build-system) (properties '((upstream-name . "statistics"))) - (inputs - (list ghc-aeson - ghc-async - ghc-base-orphans - ghc-data-default-class - ghc-dense-linear-algebra - ghc-math-functions - ghc-monad-par - ghc-mwc-random - ghc-primitive - ghc-vector - ghc-vector-algorithms - ghc-vector-th-unbox - ghc-vector-binary-instances)) - (native-inputs - (list ghc-erf - ghc-ieee754 - ghc-quickcheck - ghc-tasty-expected-failure - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) - (home-page "https://github.com/bos/mwc-random") + (inputs (list ghc-math-functions + ghc-mwc-random + ghc-random + ghc-aeson + ghc-async + ghc-primitive + ghc-dense-linear-algebra + ghc-parallel + ghc-vector + ghc-vector-algorithms + ghc-vector-th-unbox + ghc-vector-binary-instances + ghc-data-default-class)) + (native-inputs (list ghc-quickcheck + ghc-erf + ghc-ieee754 + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-tasty-expected-failure)) + (home-page "https://github.com/haskell/statistics") (synopsis "Haskell library of statistical types, data, and functions") - (description "This library provides a number of common functions + (description + "This library provides a number of common functions and types useful in statistics. We focus on high performance, numerical robustness, and use of good algorithms. Where possible, we provide references to the statistical literature. @@ -11756,22 +11270,21 @@ and Fortran complex data types.") (define-public ghc-storable-record (package (name "ghc-storable-record") - (version "0.0.5") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "storable-record" version)) - (sha256 - (base32 - "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf")))) + (version "0.0.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "storable-record" version)) + (sha256 + (base32 + "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd")))) (build-system haskell-build-system) (properties '((upstream-name . "storable-record"))) - (inputs - (list ghc-semigroups ghc-utility-ht ghc-storablevector ghc-timeit)) - (home-page "https://hackage.haskell.org/package/storable-record") + (inputs (list ghc-quickcheck ghc-semigroups ghc-utility-ht + ghc-storablevector ghc-timeit)) + (home-page "http://code.haskell.org/~thielema/storable-record/") (synopsis "Elegant definition of Storable instances for records") - (description "With this package you can build a Storable instance of + (description + "With this package you can build a Storable instance of a record type from Storable instances of its elements in an elegant way. It does not do any magic, just a bit arithmetic to compute the right offsets, that would be otherwise done manually or by a preprocessor like @@ -11827,6 +11340,13 @@ together.") ghc-unsafe ghc-quickcheck ghc-syb)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "storablevector.cabal" + (("bytestring >=0\\.9 && <0\\.11") "bytestring"))))))) (home-page "https://wiki.haskell.org/Storable_Vector") (synopsis "Fast, packed, strict storable arrays with a list interface") (description "This library provides fast, packed, strict storable @@ -11846,14 +11366,14 @@ a library that provides fusion with lazy lists.") (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") - (version "0.2.1.1") + (version "0.2.2.5") (source (origin (method url-fetch) (uri (hackage-uri "streaming-commons" version)) (sha256 (base32 - "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) + "0157xjz8nhr65y9rm7rdf3pnjlrsgaqam7qfg7nqq91bvfdq2l6a")))) (build-system haskell-build-system) (properties '((upstream-name . "streaming-commons"))) (inputs @@ -11881,6 +11401,9 @@ needed by various Haskell streaming data libraries, such as @code{conduit} and (properties '((upstream-name . "strict"))) (inputs (list ghc-hashable ghc-these ghc-assoc)) + (arguments + `(#:cabal-revision ("4" + "0pdzqhy7z70m8gxcr54jf04qhncl1jbvwybigb8lrnxqirs5l86n"))) (home-page "https://hackage.haskell.org/package/strict") (synopsis "Strict data types and String IO") (description @@ -11973,8 +11496,8 @@ occurrences of a substring (the first in case of overlaps) with another.") (inputs (list ghc-blaze-builder ghc-hashable ghc-unordered-containers)) (arguments - `(#:cabal-revision - ("3" "1zc7shja5i63rn7kd9mnq2m052qhp7nh44qy8qp93dm64v9m9pi2"))) + `(#:cabal-revision ("6" + "1cprm8ya1rdid4pz1dk6692mv0kqkaxrsqaxg83bca5z4dkgqi2z"))) (home-page "https://github.com/diagrams/svg-builder.git") (synopsis "Domain-specific language for building Scalable Vector Graphics") (description "Easy-to-write domain-specific language (DSL) for @@ -11984,23 +11507,20 @@ building Scalable Vector Graphics (SVG).") (define-public ghc-syb (package (name "ghc-syb") - (version "0.7.2.1") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "syb" version)) - (sha256 - (base32 - "15ld5929n3lzfb5sy9nnm77x2l6i2sgsxw47jdrqcrz6fxpwc1qq")))) + (version "0.7.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "syb" version)) + (sha256 + (base32 + "1qxjjndfwz2vvpz9707banmcn6jl2v6w6zp401zxaj327fccchw1")))) (build-system haskell-build-system) (properties '((upstream-name . "syb"))) - (native-inputs - (list ghc-tasty ghc-tasty-hunit)) - (home-page - "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") (synopsis "Scrap Your Boilerplate") - (description "This package contains the generics system described in the + (description + "This package contains the generics system described in the /Scrap Your Boilerplate/ papers (see @uref{http://www.cs.uu.nl/wiki/GenericProgramming/SYB, the website}). It defines the @code{Data} class of types permitting folding and unfolding of @@ -12208,9 +11728,10 @@ having to unsafely pass dummy arguments.") (build-system haskell-build-system) (properties '((upstream-name . "tar"))) (arguments - `(#:cabal-revision - ("4" "03a33nj9k62f318qgmp5pgk7i99c8cyqy5f7m7p0bwc5ni39ysfq"))) - (inputs + `(#:tests? #f ; Failed! Exception: 'TruncatedArchive' (after 4 tests): + #:cabal-revision ("5" + "15dqywn1lsyqb0nq1amj70mh1i079b7xwr02wbpcdzmdljg9c55w"))) + (native-inputs (list ghc-bytestring-handle ghc-quickcheck ghc-tasty ghc-tasty-quickcheck)) (home-page "https://hackage.haskell.org/package/tar") @@ -12305,16 +11826,16 @@ This is a better maintained fork of the \"temporary\" package.") (define-public ghc-terminal-size (package (name "ghc-terminal-size") - (version "0.3.2.1") + (version "0.3.3") (source (origin (method url-fetch) (uri (hackage-uri "terminal-size" version)) (sha256 (base32 - "0n4nvj3dbj9gxfnprgish45asn9z4dipv9j98s8i7g2n8yb3xhmm")))) + "1hv0r8gr1ms258rrz602gd5kziykkxw5zlnnzz5f42r0ly7lq5wc")))) (build-system haskell-build-system) (properties '((upstream-name . "terminal-size"))) - (home-page "https://hackage.haskell.org/package/terminal-size") + (home-page "http://hackage.haskell.org/package/terminal-size") (synopsis "Get terminal window height and width") (description "Get terminal window height and width without ncurses dependency.") @@ -12323,20 +11844,18 @@ dependency.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.12.3.2") + (version "0.12.5.4") (source (origin (method url-fetch) (uri (hackage-uri "texmath" version)) (sha256 (base32 - "1d9r3na7hmkgr0j63fs50ssll506l1wyqhw0dpap7jk0rdz8pv6n")))) + "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq")))) (build-system haskell-build-system) (properties '((upstream-name . "texmath"))) - (inputs - (list ghc-syb ghc-network-uri ghc-split ghc-xml ghc-pandoc-types)) - (native-inputs - (list ghc-temporary ghc-utf8-string)) - (home-page "https://github.com/jgm/texmath") + (inputs (list ghc-syb ghc-xml ghc-pandoc-types ghc-split)) + (native-inputs (list ghc-pretty-show ghc-tasty ghc-tasty-golden ghc-tagged)) + (home-page "http://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") (description "The texmath library provides functions to read and write TeX math, @@ -12345,7 +11864,7 @@ Office). Support is also included for converting math formats to pandoc's native format (allowing conversion, via pandoc, to a variety of different markup formats). The TeX reader supports basic LaTeX and AMS extensions, and it can parse and apply LaTeX macros.") - (license license:gpl2+))) + (license license:gpl2))) (define-public ghc-text-binary (package @@ -12371,20 +11890,17 @@ text package.") (define-public ghc-text-manipulate (package (name "ghc-text-manipulate") - (version "0.3.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "text-manipulate" version)) - (sha256 - (base32 - "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a")))) + (version "0.3.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "text-manipulate" version)) + (sha256 + (base32 + "1g06ldl6cdnyr31xlks5qm1sj44ccrdvq4bf8dk032mzfkpyyrws")))) (build-system haskell-build-system) (properties '((upstream-name . "text-manipulate"))) - (native-inputs - (list ghc-tasty ghc-tasty-hunit)) - (home-page - "https://github.com/brendanhay/text-manipulate") + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/brendanhay/text-manipulate") (synopsis "Case conversion, word boundary manipulation, and textual subjugation") (description @@ -12455,14 +11971,13 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (define-public ghc-th-abstraction (package (name "ghc-th-abstraction") - (version "0.4.3.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "th-abstraction" version)) - (sha256 - (base32 - "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8")))) + (version "0.4.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "th-abstraction" version)) + (sha256 + (base32 + "09hm0famyqsq09lal2ylnhsb31hybj8zanldi7cqncky4i7y5m80")))) (build-system haskell-build-system) (properties '((upstream-name . "th-abstraction"))) (home-page "https://github.com/glguy/th-abstraction") @@ -12477,21 +11992,17 @@ Template Haskell.") (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.8.0") + (version "0.4.10.0") (source (origin (method url-fetch) (uri (hackage-uri "th-expand-syns" version)) (sha256 (base32 - "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si")))) + "044h1hv4b0ihpwr9wndj55fa843cbzqp1difgj9wyy3mw925higm")))) (build-system haskell-build-system) (properties '((upstream-name . "th-expand-syns"))) - (arguments - `(#:cabal-revision - ("1" "0l30cmwm20lgjpvr3a5yxj6429s1hqahjsij8z2ap88754phd41l"))) - (inputs - (list ghc-syb ghc-th-abstraction)) - (home-page "https://hackage.haskell.org/package/th-expand-syns") + (inputs (list ghc-syb ghc-th-abstraction)) + (home-page "https://github.com/DanielSchuessler/th-expand-syns") (synopsis "Expands type synonyms in Template Haskell ASTs") (description "This package enables users to expand type synonyms in Template Haskell @@ -12512,6 +12023,9 @@ Template Haskell.") (properties '((upstream-name . "th-lift"))) (inputs (list ghc-th-abstraction)) + (arguments + `(#:cabal-revision ("2" + "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi"))) (home-page "https://github.com/mboes/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description @@ -12522,21 +12036,21 @@ datatypes.") (define-public ghc-th-lift-instances (package (name "ghc-th-lift-instances") - (version "0.1.18") - (source - (origin - (method url-fetch) - (uri (hackage-uri "th-lift-instances" version)) - (sha256 - (base32 - "09nv1zsffvv6zfz1fjzcqrla3lc350qr4i4xf7wgvzp049sprrdy")))) + (version "0.1.20") + (source (origin + (method url-fetch) + (uri (hackage-uri "th-lift-instances" version)) + (sha256 + (base32 + "0w6qc7xzyjymhh8hv72rlszh3n2xyzzamlfcl1hs9k6xbbww6czm")))) (build-system haskell-build-system) (properties '((upstream-name . "th-lift-instances"))) - (inputs - (list ghc-th-lift ghc-vector ghc-quickcheck)) - (home-page "https://github.com/bennofs/th-lift-instances/") + (inputs (list ghc-vector ghc-th-lift)) + (native-inputs (list ghc-quickcheck)) + (home-page "http://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types") - (description "Most data types in the Haskell platform do not have Lift + (description + "Most data types in the Haskell platform do not have Lift instances. This package provides orphan instances for @code{containers}, @code{text}, @code{bytestring} and @code{vector}.") (license license:bsd-3))) @@ -12544,28 +12058,19 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-orphans (package (name "ghc-th-orphans") - (version "0.13.12") + (version "0.13.14") (source (origin (method url-fetch) (uri (hackage-uri "th-orphans" version)) (sha256 (base32 - "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz")))) + "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx")))) (build-system haskell-build-system) (properties '((upstream-name . "th-orphans"))) - (arguments - `(#:cabal-revision - ("1" "0vfz9dl5g9xwp2zmwqc5gngyvjaqj3i0s97vbcslafcqhdqw3qaj"))) - (inputs - (list ghc-th-lift - ghc-th-lift-instances - ghc-th-reify-many - ghc-th-compat - ghc-th-expand-syns - ghc-generic-deriving)) - (native-inputs - (list ghc-hspec)) - (home-page "https://hackage.haskell.org/package/th-orphans") + (inputs (list ghc-th-compat ghc-th-lift ghc-th-reify-many + ghc-generic-deriving ghc-th-lift-instances)) + (native-inputs (list ghc-hspec)) + (home-page "http://hackage.haskell.org/package/th-orphans") (synopsis "Orphan instances for TH datatypes") (description "This package provides orphan instances for Template Haskell datatypes. In particular, @@ -12590,8 +12095,8 @@ package, and that's where the version number started.") (inputs (list ghc-hashable ghc-assoc)) (arguments - `(#:cabal-revision - ("2" "16x3am622jn97j1d9879x7j5zbjn33bkfaa0dq0xyp1fbc0s7h5x"))) + `(#:cabal-revision ("6" + "12ll5l8m482qkb8zn79vx51bqlwc89fgixf8jv33a32b4qzc3499"))) (home-page "https://github.com/isomorphism/these") (synopsis "Either-or-both data type") @@ -12625,22 +12130,21 @@ variant of @code{These}. (define-public ghc-threads (package (name "ghc-threads") - (version "0.5.1.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "threads" version)) - (sha256 - (base32 - "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk")))) + (version "0.5.1.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "threads" version)) + (sha256 + (base32 + "1l226792dqlp772aaxqr3qzz8yq72702g708k16gi8lrkfhgxxp0")))) (build-system haskell-build-system) (properties '((upstream-name . "threads"))) - (native-inputs - (list ghc-concurrent-extra ghc-hunit ghc-test-framework - ghc-test-framework-hunit)) + (native-inputs (list ghc-concurrent-extra ghc-hunit ghc-test-framework + ghc-test-framework-hunit)) (home-page "https://github.com/basvandijk/threads") (synopsis "Fork threads and wait for their result") - (description "This package provides functions to fork threads and + (description + "This package provides functions to fork threads and wait for their result, whether it's an exception or a normal value. Besides waiting for the termination of a single thread this package also provides functions to wait for a group of threads to terminate. This @@ -12683,30 +12187,27 @@ function which generates instances.") (define-public ghc-time-compat (package (name "ghc-time-compat") - (version "1.9.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "time-compat" version)) - (sha256 - (base32 - "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii")))) + (version "1.9.6.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "time-compat" version)) + (sha256 + (base32 + "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd")))) (build-system haskell-build-system) (properties '((upstream-name . "time-compat"))) - (inputs - (list ghc-base-orphans)) - (native-inputs - (list ghc-hunit - ghc-base-compat - ghc-quickcheck - ghc-tagged - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-base-orphans ghc-hashable)) + (native-inputs (list ghc-hunit + ghc-base-compat + ghc-quickcheck + ghc-tagged + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck)) (arguments - `(#:cabal-revision - ("1" "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5"))) - (home-page "https://github.com/phadej/time-compat") + `(#:cabal-revision ("4" + "1n39yfk21xz8y1xvkh01651yysk2zp5qac22l5pq2hi7scczmxaw"))) + (home-page "https://github.com/haskellari/time-compat") (synopsis "Compatibility package for time") (description "This package tries to compat as many @code{time} features as possible.") @@ -12775,52 +12276,50 @@ used CPU time of monadic computation with an IO base.") (define-public ghc-timezone-series (package - (name "ghc-timezone-series") - (version "0.1.9") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "timezone-series" version)) - (sha256 - (base32 - "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5")))) - (build-system haskell-build-system) - (properties '((upstream-name . "timezone-series"))) - (home-page "https://archives.haskell.org/projects.haskell.org/time-ng/") - (synopsis "Enhanced timezone handling for Time") - (description - "This package endows @code{Data.Time}, from the time package, with several + (name "ghc-timezone-series") + (version "0.1.13") + (source (origin + (method url-fetch) + (uri (hackage-uri "timezone-series" version)) + (sha256 + (base32 + "18n6w7jxwlysq5mvb1sp1z57nyrsgn2ans642fy5rhmpwcavgvr8")))) + (build-system haskell-build-system) + (properties '((upstream-name . "timezone-series"))) + (arguments + `(#:cabal-revision ("1" + "1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc"))) + (home-page "http://projects.haskell.org/time-ng/") + (synopsis "Enhanced timezone handling for Time") + (description + "This package endows @code{Data.Time}, from the time package, with several data types and functions for enhanced processing of timezones. For one way to create timezone series, see the ghc-timezone-olson package.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public ghc-timezone-olson (package - (name "ghc-timezone-olson") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri - (hackage-uri "timezone-olson" version)) - (sha256 - (base32 - "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg")))) - (build-system haskell-build-system) - (properties '((upstream-name . "timezone-olson"))) - (inputs - (list ghc-timezone-series ghc-extensible-exceptions)) - (home-page "https://archives.haskell.org/projects.haskell.org/time-ng/") - (synopsis "Parser and renderer for binary Olson timezone files") - (description - "A parser and renderer for binary Olson timezone files whose format + (name "ghc-timezone-olson") + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "timezone-olson" version)) + (sha256 + (base32 + "10f5843sza2ikj2sg9fjhf5dhnhcidad86cdjmrj1y6zclkiqmdc")))) + (build-system haskell-build-system) + (properties '((upstream-name . "timezone-olson"))) + (inputs (list ghc-timezone-series ghc-extensible-exceptions)) + (home-page "http://projects.haskell.org/time-ng/") + (synopsis "Parser and renderer for binary Olson timezone files") + (description + "A parser and renderer for binary Olson timezone files whose format is specified by the tzfile(5) man page on Unix-like systems. For more information about this format, see @url{http://www.iana.org/time-zones/repository/tz-link.html}. Functions are provided for converting the parsed data into @code{TimeZoneSeries} objects from the timezone-series package.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public ghc-tldr (package @@ -12938,19 +12437,20 @@ compatibility to run on old versions of the platform.") (define-public ghc-transformers-compat (package (name "ghc-transformers-compat") - (version "0.6.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "transformers-compat" version)) - (sha256 - (base32 - "1yd936az31g9995frc84g05rrb5b7w59ajssc5183lp6wm8h4bky")))) + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "transformers-compat" version)) + (sha256 + (base32 + "0slxrkxi8xa1bmi9saq9x8bz52clrf2slf877m3ckjzkr4276b5n")))) (build-system haskell-build-system) (properties '((upstream-name . "transformers-compat"))) - (home-page "https://github.com/ekmett/transformers-compat/") + (inputs (list ghc-generic-deriving)) + (home-page "http://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") - (description "This package includes backported versions of types that were + (description + "This package includes backported versions of types that were added to transformers in transformers 0.3 and 0.4 for users who need strict transformers 0.2 or 0.3 compatibility to run on old versions of the platform, but also need those types.") @@ -12959,42 +12459,38 @@ but also need those types.") (define-public ghc-tree-diff (package (name "ghc-tree-diff") - (version "0.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "tree-diff" version)) - (sha256 - (base32 - "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap")))) + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "tree-diff" version)) + (sha256 + (base32 + "0g3lsp067dq1ydvj2im4nlfxa65g9zjmjjkv91dhjhnrklir10q0")))) (build-system haskell-build-system) (properties '((upstream-name . "tree-diff"))) - (arguments - `(#:cabal-revision - ("1" "0brlnq5ddmambidll1dn4jnjac2i44a9hd5hwp2p0rbh1s8jfyhm"))) - (inputs - (list ghc-aeson - ghc-ansi-terminal - ghc-ansi-wl-pprint - ghc-base-compat - ghc-bytestring-builder - ghc-hashable - ghc-parsers - ghc-primitive - ghc-quickcheck - ghc-scientific - ghc-semialign - ghc-strict - ghc-tagged - ghc-these - ghc-unordered-containers - ghc-uuid-types - ghc-vector)) - (native-inputs - (list ghc-trifecta ghc-tasty ghc-tasty-golden ghc-tasty-quickcheck)) + (inputs (list ghc-aeson + ghc-ansi-terminal + ghc-ansi-wl-pprint + ghc-base-compat + ghc-bytestring-builder + ghc-hashable + ghc-parsers + ghc-primitive + ghc-quickcheck + ghc-scientific + ghc-semialign + ghc-strict + ghc-tagged + ghc-these + ghc-unordered-containers + ghc-uuid-types + ghc-vector)) + (native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-quickcheck + ghc-trifecta)) (home-page "https://github.com/phadej/tree-diff") (synopsis "Compute difference between (expression) trees") - (description "This Haskell library provides a function for computing + (description + "This Haskell library provides a function for computing the difference between (expression) trees. It also provides a way to compute the difference between arbitrary abstract datatypes (ADTs) using @code{Generics}-derivable helpers.") @@ -13003,36 +12499,37 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (define-public ghc-trifecta (package (name "ghc-trifecta") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (hackage-uri "trifecta" version)) (sha256 (base32 - "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y")))) + "1akx8m6mgskwsbhsf90cxlqjq23jk4pwaxagvm923dpncwrlwfla")))) (build-system haskell-build-system) (properties '((upstream-name . "trifecta"))) - (inputs - (list ghc-ansi-terminal - ghc-blaze-builder - ghc-blaze-html - ghc-blaze-markup - ghc-charset - ghc-comonad - ghc-fingertree - ghc-hashable - ghc-indexed-traversable - ghc-lens - ghc-parsers - ghc-prettyprinter-ansi-terminal - ghc-prettyprinter - ghc-profunctors - ghc-reducers - ghc-unordered-containers - ghc-utf8-string)) - (native-inputs - (list ghc-quickcheck)) - (home-page "https://github.com/ekmett/trifecta/") + (inputs (list ghc-ansi-terminal + ghc-blaze-builder + ghc-blaze-html + ghc-blaze-markup + ghc-charset + ghc-comonad + ghc-fingertree + ghc-hashable + ghc-indexed-traversable + ghc-lens + ghc-parsers + ghc-prettyprinter + ghc-prettyprinter-ansi-terminal + ghc-profunctors + ghc-reducers + ghc-unordered-containers + ghc-utf8-string)) + (native-inputs (list ghc-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9"))) + (home-page "http://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, with slicing and Clang-style colored diagnostics.") @@ -13062,34 +12559,29 @@ statically known size.") (define-public ghc-turtle (package (name "ghc-turtle") - (version "1.5.22") - (source - (origin - (method url-fetch) - (uri (hackage-uri "turtle" version)) - (sha256 - (base32 - "14lf43b5rxci6p9sy1gkb715m4b1s4rl65swn2qpdqv3h2yvpi4s")))) + (version "1.5.25") + (source (origin + (method url-fetch) + (uri (hackage-uri "turtle" version)) + (sha256 + (base32 + "1hh2rbwk3m4iklk67f1l1a8shsng9qzs9132j6lpag7cgqkrmqdk")))) (build-system haskell-build-system) (properties '((upstream-name . "turtle"))) - (inputs - (list ghc-ansi-wl-pprint - ghc-async - ghc-clock - ghc-exceptions - ghc-foldl - ghc-hostname - ghc-managed - ghc-semigroups - ghc-system-filepath - ghc-system-fileio - ghc-streaming-commons - ghc-temporary - ghc-optparse-applicative - ghc-optional-args - ghc-unix-compat)) - (native-inputs - (list ghc-doctest ghc-fail)) + (inputs (list ghc-ansi-wl-pprint + ghc-async + ghc-clock + ghc-foldl + ghc-hostname + ghc-managed + ghc-system-filepath + ghc-system-fileio + ghc-streaming-commons + ghc-temporary + ghc-optparse-applicative + ghc-optional-args + ghc-unix-compat)) + (native-inputs (list ghc-doctest)) (home-page "https://hackage.haskell.org/package/turtle") (synopsis "Shell programming, Haskell-style") @@ -13119,21 +12611,24 @@ similar functionality.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.6.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "typed-process" version)) - (sha256 - (base32 - "071mw4yv4xr5n82si33qbcqcxvcr7h56zlyd8gmsfrsdnacbq47k")))) + (version "0.2.10.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "typed-process" version)) + (sha256 + (base32 + "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4")))) (build-system haskell-build-system) (properties '((upstream-name . "typed-process"))) - (inputs - (list ghc-async ghc-unliftio-core)) - (native-inputs - (list ghc-base64-bytestring ghc-hspec hspec-discover ghc-temporary)) - (home-page "https://haskell-lang.org/library/typed-process") + (inputs (list ghc-async ghc-unliftio-core)) + (native-inputs (list ghc-base64-bytestring + ghc-hspec + ghc-temporary + ghc-base64-bytestring + ghc-hspec + ghc-temporary + hspec-discover)) + (home-page "https://github.com/fpco/typed-process") (synopsis "Run external processes with strong typing of streams") (description "This library provides the ability to launch and interact with external @@ -13164,21 +12659,18 @@ function.") (define-public ghc-unagi-chan (package (name "ghc-unagi-chan") - (version "0.4.1.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unagi-chan" version)) - (sha256 - (base32 - "15fnk9x4fd2ryp31fjfrwm8k61m3a0qyb95m4065zc0yi0jyacp2")))) + (version "0.4.1.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "unagi-chan" version)) + (sha256 + (base32 + "1d98a6s7rydjlf2p3jv6j7wglq8ahf8kgcibji5fiy6y0ymz9mnr")))) (build-system haskell-build-system) (properties '((upstream-name . "unagi-chan"))) - (inputs - (list ghc-atomic-primops ghc-primitive)) - (arguments - `(#:tests? #f)) ; TODO: Fail. - (home-page "https://hackage.haskell.org/package/unagi-chan") + (inputs (list ghc-atomic-primops ghc-primitive)) + (arguments (list #:tests? #f)) ; counter is atomic... test: Counter broken: expecting 10000000 got 9999996 + (home-page "http://hackage.haskell.org/package/unagi-chan") (synopsis "Fast concurrent queues with a Chan-like API, and more") (description "This library provides implementations of concurrent FIFO queues (for @@ -13228,24 +12720,49 @@ unbounded @code{Integer} type.") handled safely, this is what you're left with.") (license license:isc))) +(define-public ghc-unicode-data + (package + (name "ghc-unicode-data") + (version "0.4.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "unicode-data" version)) + (sha256 + (base32 + "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p")))) + (build-system haskell-build-system) + (properties '((upstream-name . "unicode-data"))) + (native-inputs (list ghc-hspec)) + (home-page "http://github.com/composewell/unicode-data") + (synopsis "Access Unicode Character Database (UCD)") + (description + "This package provides Haskell APIs to efficiently access the + (UCD). Performance is +the primary goal in the design of this package. The Haskell data structures +are generated programmatically from the UCD files.") + (license license:asl2.0))) + (define-public ghc-unicode-transforms (package (name "ghc-unicode-transforms") - (version "0.3.7.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unicode-transforms" version)) - (sha256 - (base32 - "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f")))) + (version "0.4.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "unicode-transforms" version)) + (sha256 + (base32 + "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-transforms"))) - (native-inputs - (list ghc-quickcheck ghc-getopt-generics ghc-split ghc-hspec)) - (home-page "https://github.com/composewell/unicode-transforms") + (inputs (list ghc-unicode-data)) + (native-inputs (list ghc-quickcheck ghc-quickcheck ghc-hspec ghc-split)) + (arguments + `(#:cabal-revision ("2" + "1imm3svpz2shilj2kmmmcyy5yd4c1mpmz5v1gvjrr98hrab2i9x7"))) + (home-page "http://github.com/composewell/unicode-transforms") (synopsis "Unicode normalization") - (description "This library provides tools for fast Unicode 12.1.0 + (description + "This library provides tools for fast Unicode 12.1.0 normalization in Haskell (normalization forms C, KC, D, and KD).") (license license:bsd-3))) @@ -13298,18 +12815,19 @@ work, but is substantially simpler and faster.") (define-public ghc-unix-compat (package (name "ghc-unix-compat") - (version "0.5.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unix-compat" version)) - (sha256 - (base32 - "1j75i3dj489rz60ij3nfza774mb7mw33amhdkm10dd0dxabvb4q8")))) + (version "0.5.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "unix-compat" version)) + (sha256 + (base32 + "1cd4lh2c16h7y5hzrcn5l9vir8aq2wcizwksppnagklsdsfmf942")))) (build-system haskell-build-system) (properties '((upstream-name . "unix-compat"))) - (home-page - "https://github.com/jystic/unix-compat") + (arguments + `(#:cabal-revision ("2" + "0mik6xb1jdmb2jlxlmzf0517mxfj0c1j2i4r6h5212m4q6znqqcm"))) + (home-page "http://github.com/jacobstanley/unix-compat") (synopsis "Portable POSIX-compatibility layer") (description "This package provides portable implementations of parts of the unix @@ -13320,22 +12838,19 @@ isn't available, portable implementations are used.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.4.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unix-time" version)) - (sha256 - (base32 - "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr")))) + (version "0.4.8") + (source (origin + (method url-fetch) + (uri (hackage-uri "unix-time" version)) + (sha256 + (base32 + "0hz8mi08kg84hiqnch5ycscgqmjyn1mnl5ih1bsrclyb3fhvdppy")))) (build-system haskell-build-system) (properties '((upstream-name . "unix-time"))) - (arguments - `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This - ; is weird, that should be provided by GHC 7.10.2. - (inputs - (list ghc-old-time ghc-old-locale)) - (home-page "https://hackage.haskell.org/package/unix-time") + (inputs (list ghc-old-time)) + (native-inputs (list ghc-doctest ghc-old-locale ghc-quickcheck ghc-hspec + hspec-discover)) + (home-page "http://hackage.haskell.org/package/unix-time") (synopsis "Unix time parser/formatter and utilities") (description "This library provides fast parsing and formatting utilities for Unix time in Haskell.") @@ -13344,25 +12859,22 @@ for Unix time in Haskell.") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.20") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unliftio" version)) - (sha256 - (base32 - "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my")))) + (version "0.2.23.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "unliftio" version)) + (sha256 + (base32 + "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id")))) (build-system haskell-build-system) (properties '((upstream-name . "unliftio"))) - (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH - (outputs '("out" "static" "doc")) - (inputs - (list ghc-async ghc-unliftio-core)) - (native-inputs (list ghc-hspec)) - (home-page "https://github.com/fpco/unliftio") + (inputs (list ghc-async ghc-safe-exceptions ghc-unliftio-core ghc-nats)) + (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) + (home-page "https://github.com/fpco/unliftio/tree/master/unliftio#readme") (synopsis "Provides MonadUnliftIO typecplass for unlifting monads to IO") - (description "This Haskell package provides the core @code{MonadUnliftIO} + (description + "This Haskell package provides the core @code{MonadUnliftIO} typeclass, a number of common instances, and a collection of common functions working with it.") (license license:expat))) @@ -13394,29 +12906,30 @@ functions.") (define-public ghc-unordered-containers (package (name "ghc-unordered-containers") - (version "0.2.14.0") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "unordered-containers" version)) - (sha256 - (base32 - "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1")))) + (version "0.2.19.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "unordered-containers" version)) + (sha256 + (base32 + "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv")))) (build-system haskell-build-system) (properties '((upstream-name . "unordered-containers"))) - (inputs - (list ghc-chasingbottoms - ghc-hunit - ghc-quickcheck - ghc-test-framework - ghc-test-framework-hunit - ghc-test-framework-quickcheck2 - ghc-hashable)) + (inputs (list ghc-hashable)) + (native-inputs (list ghc-chasingbottoms + ghc-hunit + ghc-quickcheck + ghc-random + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-nothunks-bootstrap)) + (arguments + `(#:cabal-revision ("1" + "0fcax3apnpxxy9maymclr6s2b4c28d3pkl3plbg0lv1mn0mh84fv"))) (home-page - "https://github.com/tibbe/unordered-containers") - (synopsis - "Efficient hashing-based container types") + "https://github.com/haskell-unordered-containers/unordered-containers") + (synopsis "Efficient hashing-based container types") (description "Efficient hashing-based container types. The containers have been optimized for performance critical use, both in terms of large data quantities @@ -13430,6 +12943,7 @@ and high speed.") (arguments `(#:tests? #f)) (inputs `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (native-inputs '()) (properties '((hidden? #t))))) (define-public ghc-unsafe @@ -13489,16 +13003,17 @@ parser that uses ByteStrings for parsing and representing the URI data.") (define-public ghc-utf8-light (package (name "ghc-utf8-light") - (version "0.4.2") + (version "0.4.4.0") (source (origin (method url-fetch) (uri (hackage-uri "utf8-light" version)) (sha256 (base32 - "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q")))) + "0415hapndlsnzvmm3bk2fl42h4vn1izky7jb3lbby3mzzzd8d1fx")))) (build-system haskell-build-system) (properties '((upstream-name . "utf8-light"))) + (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://hackage.haskell.org/package/utf8-light") (synopsis "Lightweight unicode support for Haskell") @@ -13590,10 +13105,13 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d")))) (build-system haskell-build-system) (properties '((upstream-name . "uuid-types"))) - (arguments `(#:tests? #f)) ; TODO: Wrong byteorder version? (inputs (list ghc-hashable ghc-random)) - (native-inputs (list ghc-byteorder ghc-quickcheck ghc-tasty + (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) + (arguments + `(#:tests? #f ; Missing GHC internal library ghc-byteorder. + #:cabal-revision ("3" + "10hpjshw6z8xnjpga47cazfdd4i27qvy4ash13lza2lmwf36k9ww"))) (home-page "https://github.com/hvr/uuid") (synopsis "Haskell type definitions for UUIDs") (description "This Haskell library contains type definitions for @@ -13605,24 +13123,28 @@ functions.") (define-public ghc-validation (package (name "ghc-validation") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "validation" version)) - (sha256 - (base32 - "1dv7azpljdcf7irbnznnz31hq611bn1aj2m6ywghz3hgv835qqak")))) + (version "1.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "validation" version)) + (sha256 + (base32 + "15hhz2kj6h9zv568bvq79ymck3s3b89fpkasdavbwvyhfyjm5k8x")))) (build-system haskell-build-system) (properties '((upstream-name . "validation"))) - (inputs - (list ghc-semigroups ghc-semigroupoids ghc-assoc ghc-bifunctors - ghc-lens)) - (native-inputs - (list ghc-hedgehog ghc-hunit)) + (inputs (list ghc-assoc ghc-semigroups ghc-semigroupoids ghc-bifunctors + ghc-lens)) + (native-inputs (list ghc-hedgehog ghc-hunit)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "validation.cabal" + (("\\b(hedgehog|lens)\\s+[^,]+" all dep) + dep))))))) (home-page "https://github.com/qfpl/validation") - (synopsis - "Data-type like Either but with an accumulating Applicative") + (synopsis "Data-type like Either but with an accumulating Applicative") (description "A data-type like Either but with differing properties and type-class instances. @@ -13644,19 +13166,17 @@ example of, \"An applicative functor that is not a monad.\"") (define-public ghc-validity (package (name "ghc-validity") - (version "0.11.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "validity" version)) - (sha256 - (base32 - "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x")))) + (version "0.12.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "validity" version)) + (sha256 + (base32 + "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w")))) (build-system haskell-build-system) (properties '((upstream-name . "validity"))) (native-inputs (list ghc-hspec hspec-discover)) - (home-page - "https://github.com/NorfairKing/validity") + (home-page "https://github.com/NorfairKing/validity#readme") (synopsis "Validity typeclass") (description "Values of custom types usually have invariants imposed upon them. This @@ -13679,6 +13199,9 @@ explicit by providing a function to check whether the invariants hold.") (properties '((upstream-name . "vault"))) (inputs (list ghc-unordered-containers ghc-hashable ghc-semigroups)) + (arguments + `(#:cabal-revision ("2" + "1bjwv3nv8jfhrdxa5kn3gvgxmyalpq7592bvyl7bpvcc7bbkfkf3"))) (home-page "https://github.com/HeinrichApfelmus/vault") (synopsis "Persistent store for arbitrary values") @@ -13761,6 +13284,9 @@ optimisation framework.") (list ghc-vector)) (native-inputs (list ghc-tasty ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "0av0k2gn90mf5ai74575bd368x73ljnr7xlkwsqmrs6zdzkw0i83"))) (home-page "https://github.com/bos/vector-binary-instances") (synopsis "Instances of Data.Binary and Data.Serialize for vector") (description "This library provides instances of @code{Binary} for the @@ -13773,27 +13299,27 @@ boxed and storable vectors.") (define-public ghc-vector-builder (package (name "ghc-vector-builder") - (version "0.3.8.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "vector-builder" version)) - (sha256 - (base32 - "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs")))) + (version "0.3.8.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "vector-builder" version)) + (sha256 + (base32 + "0gc2n5j1ca07hd50shy7l5xybs1y720zrarzs5dj74dsdcpvmjxw")))) (build-system haskell-build-system) (properties '((upstream-name . "vector-builder"))) - (inputs (list ghc-vector ghc-semigroups ghc-base-prelude)) + (inputs (list ghc-vector)) (native-inputs (list ghc-attoparsec + ghc-quickcheck + ghc-quickcheck-instances + ghc-rerebase ghc-tasty ghc-tasty-hunit - ghc-tasty-quickcheck - ghc-hunit - ghc-quickcheck-instances - ghc-rerebase)) + ghc-tasty-quickcheck)) (home-page "https://github.com/nikita-volkov/vector-builder") (synopsis "Vector builder for Haskell") - (description "This Haskell package provides an API for constructing vectors. + (description + "This Haskell package provides an API for constructing vectors. It provides the composable @code{Builder} abstraction, which has instances of the @code{Monoid} and @code{Semigroup} classes. @@ -13805,21 +13331,24 @@ vector.") (define-public ghc-vector-th-unbox (package (name "ghc-vector-th-unbox") - (version "0.2.1.9") - (source - (origin - (method url-fetch) - (uri (hackage-uri "vector-th-unbox" version)) - (sha256 - (base32 - "0jbzm31d91kxn8m0h6iplj54h756q6f4zzdrnb2w7rzz5zskgqyl")))) + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "vector-th-unbox" version)) + (sha256 + (base32 + "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a")))) (build-system haskell-build-system) (properties '((upstream-name . "vector-th-unbox"))) - (inputs - (list ghc-vector ghc-data-default)) - (home-page "https://github.com/liyang/vector-th-unbox") + (inputs (list ghc-vector)) + (native-inputs (list ghc-data-default)) + (arguments + `(#:cabal-revision ("3" + "0ki133sixq8pkfys36nl25jzdvnw40qq2bnskdmk2zyjhckdjcna"))) + (home-page "https://github.com/tsurucapital/vector-th-unbox") (synopsis "Deriver for Data.Vector.Unboxed using Template Haskell") - (description "This Haskell library provides a Template Haskell + (description + "This Haskell library provides a Template Haskell deriver for unboxed vectors, given a pair of coercion functions to and from some existing type with an Unbox instance.") (license license:bsd-3))) @@ -13860,13 +13389,8 @@ given term should not exist.") (build-system haskell-build-system) (properties '((upstream-name . "wave"))) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "wave.cabal" - (("temporary.* < 1\\.3") - "temporary >= 1.1 && < 1.4"))))))) + `(#:cabal-revision ("1" + "19rxhnqhhv1qs35y723c15c8nifj8pakcrd09jlvg5271zg4qb0b"))) (inputs (list ghc-cereal ghc-data-default-class ghc-quickcheck ghc-temporary)) (native-inputs @@ -14019,40 +13543,34 @@ modernized interface.") (define-public ghc-wl-pprint-text (package (name "ghc-wl-pprint-text") - (version "1.2.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "wl-pprint-text" version)) - (sha256 - (base32 - "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly")))) + (version "1.2.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "wl-pprint-text" version)) + (sha256 + (base32 + "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj")))) (build-system haskell-build-system) (properties '((upstream-name . "wl-pprint-text"))) - (inputs - (list ghc-base-compat)) - (home-page "https://hackage.haskell.org/package/wl-pprint-text") + (inputs (list ghc-base-compat)) + (home-page "http://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") - (description - "A clone of wl-pprint for use with the text library.") + (description "A clone of wl-pprint for use with the text library.") (license license:bsd-3))) (define-public ghc-word-wrap (package (name "ghc-word-wrap") - (version "0.4.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "word-wrap" version)) - (sha256 - (base32 "15rcqhg9vb7qisk9ryjnyhhfgigxksnkrczycaw2rin08wczjwpb")))) + (version "0.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "word-wrap" version)) + (sha256 + (base32 + "0i57233g4p9p8c0jf9mp3pvknwgv1lsrxm4mxjay38rw0372jpzq")))) (build-system haskell-build-system) (properties '((upstream-name . "word-wrap"))) (native-inputs (list ghc-hspec)) - (arguments - `(#:cabal-revision - ("1" "1k4w4g053vhmpp08542hrqaw81p3p35i567xgdarqmpghfrk68pp"))) (home-page "https://github.com/jtdaugherty/word-wrap/") (synopsis "Haskell library for word-wrapping text") (description @@ -14104,22 +13622,21 @@ word expansion like a posix-shell.") (define-public ghc-x11 (package (name "ghc-x11") - (version "1.10.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "X11" version)) - (sha256 - (base32 "1ip207l97s8nw4daxp9s254agk8f0wibpf0prx0n695klqyn8bz1")))) + (version "1.10.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "X11" version)) + (sha256 + (base32 + "0hnj2q310a6s0h479hq8jsmywymvxdjxg13zw46mmdndynwd2jnq")))) (build-system haskell-build-system) (properties '((upstream-name . "X11"))) (arguments `(#:extra-directories ("libx11" "libxrandr" "libxinerama" "libxscrnsaver"))) - (inputs - (list libx11 libxrandr libxinerama libxscrnsaver - ghc-data-default-class)) - (home-page "https://github.com/haskell-pkg-janitors/X11") + (inputs (list libx11 libxrandr libxinerama libxscrnsaver + ghc-data-default-class)) + (home-page "https://github.com/xmonad/X11") (synopsis "Bindings to the X11 graphics library") (description "This package provides Haskell bindings to the X11 graphics library. The @@ -14129,27 +13646,25 @@ bindings are a direct translation of the C bindings.") (define-public ghc-x11-xft (package (name "ghc-x11-xft") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "X11-xft" version)) - (sha256 - (base32 "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf")))) - (arguments - `(#:extra-directories ("libx11" "libxft" "xorgproto"))) - (inputs - (list ghc-x11 ghc-utf8-string libx11 libxft xorgproto)) - (native-inputs - (list pkg-config)) + (version "0.3.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "X11-xft" version)) + (sha256 + (base32 + "05m988r45jiqpxqsw3vafz158whlwfcl7v8z9nnqnqz9mggd4032")))) (build-system haskell-build-system) (properties '((upstream-name . "X11-xft"))) - (home-page "https://hackage.haskell.org/package/X11-xft") + (arguments + `(#:extra-directories ("libx11" "libxft" "xorgproto"))) + (inputs (list ghc-x11 ghc-utf8-string libx11 libxft xorgproto)) + (native-inputs (list pkg-config)) + (home-page "http://hackage.haskell.org/package/X11-xft") (synopsis "Bindings to Xft") (description "Bindings to the Xft, X Free Type interface library, and some Xrender parts.") - (license license:lgpl2.1))) + (license license:bsd-3))) (define-public ghc-xdg-basedir (package @@ -14209,8 +13724,20 @@ parts.") ghc-data-default-class ghc-blaze-markup ghc-blaze-html)) - (native-inputs - (list ghc-doctest ghc-hspec ghc-cabal-doctest ghc-hunit)) + (native-inputs (list ghc-hspec ghc-hunit ghc-doctest hspec-discover)) + (arguments + `(#:cabal-revision ("2" + "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6") + #:tests? #f ; Depend on non-existent doctest API. + #:phases + (modify-phases %standard-phases + ;; Tries to use non-existent doctest API. + (add-after 'unpack 'disable-doctest + (lambda _ + (with-output-to-file "Setup.hs" + (lambda _ + (display + "import Distribution.Simple\nmain = defaultMain\n")))))))) (home-page "https://github.com/snoyberg/xml") (synopsis "Utilities for dealing with XML with the conduit package") (description @@ -14240,56 +13767,56 @@ documents.") (define-public ghc-xml-hamlet (package (name "ghc-xml-hamlet") - (version "0.5.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "xml-hamlet" version)) - (sha256 - (base32 "0jrhcjy7ww59dafg857f2g2df1fw2jmbwcs1q379ph0pc5rxj3lj")))) + (version "0.5.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "xml-hamlet" version)) + (sha256 + (base32 + "109fck1626d74s00ssjffg837584wf7dxpswkil37wqqfy94mw2z")))) (build-system haskell-build-system) (properties '((upstream-name . "xml-hamlet"))) - (inputs - (list ghc-shakespeare ghc-xml-conduit)) - (native-inputs - (list ghc-hspec ghc-hunit)) - (home-page "https://www.yesodweb.com/") + (inputs (list ghc-shakespeare ghc-xml-conduit)) + (native-inputs (list ghc-hspec ghc-hunit)) + (home-page "http://www.yesodweb.com/") (synopsis "Hamlet-style quasiquoter for XML content") - (description "This package provides a type-safe tool for generating XML + (description + "This package provides a type-safe tool for generating XML code via quasi-quoting built on top of @code{ghc-shakespeare}.") (license license:bsd-3))) (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.11.7.0") + (version "0.11.8.0") (source (origin (method url-fetch) (uri (hackage-uri "yaml" version)) (sha256 (base32 - "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx")))) + "1s0arllihjjqp65jbc8c1w5106i2infppsirvbsifpmpkf14w6pn")))) (build-system haskell-build-system) (properties '((upstream-name . "yaml"))) - (inputs - (list ghc-conduit - ghc-resourcet - ghc-aeson - ghc-unordered-containers - ghc-vector - ghc-attoparsec - ghc-scientific - ghc-libyaml - ghc-optparse-applicative)) - (native-inputs - (list ghc-hspec - ghc-hunit - ghc-base-compat - hspec-discover - ghc-mockery - ghc-raw-strings-qq - ghc-temporary)) - (home-page "https://github.com/snoyberg/yaml/") + (inputs (list ghc-aeson + ghc-attoparsec + ghc-conduit + ghc-libyaml + ghc-resourcet + ghc-scientific + ghc-unordered-containers + ghc-vector + ghc-optparse-applicative)) + (native-inputs (list ghc-hunit + ghc-base-compat + ghc-hspec + ghc-mockery + ghc-raw-strings-qq + ghc-temporary + hspec-discover)) + (arguments + `(#:cabal-revision ("2" + "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l"))) + (home-page "https://github.com/snoyberg/yaml#readme") (synopsis "Parsing and rendering YAML documents") (description "This package provides a library to parse and render YAML documents.") @@ -14298,16 +13825,17 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.4.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "zip-archive" version)) - (sha256 - (base32 - "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5")))) + (version "0.4.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "zip-archive" version)) + (sha256 + (base32 + "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4")))) (build-system haskell-build-system) (properties '((upstream-name . "zip-archive"))) + (inputs (list ghc-zlib ghc-digest)) + (native-inputs (list ghc-hunit ghc-temporary which unzip)) (arguments `(#:phases (modify-phases %standard-phases @@ -14318,46 +13846,31 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (path (getenv "PATH"))) (setenv "PATH" (string-append unzip "/bin:" which "/bin:" path)) #t)))))) - (inputs - (list ghc-digest ghc-temporary ghc-zlib)) - (native-inputs - (list ghc-hunit unzip which)) - (home-page "https://hackage.haskell.org/package/zip-archive") + (home-page "http://github.com/jgm/zip-archive") (synopsis "Zip archive library for Haskell") - (description "The zip-archive library provides functions for creating, + (description + "The zip-archive library provides functions for creating, modifying, and extracting files from zip archives in Haskell.") (license license:bsd-3))) (define-public ghc-zlib (package (name "ghc-zlib") - (version "0.6.2.3") - (outputs '("out" "static" "doc")) - (source - (origin - (method url-fetch) - (uri (hackage-uri "zlib" version)) - (sha256 - (base32 - "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0")))) + (version "0.6.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "zlib" version)) + (sha256 + (base32 + "1nh4xsm3kgsg76jmkcphvy7hhslg9hx1s75mpsskhi2ksjd9ialy")))) (build-system haskell-build-system) (properties '((upstream-name . "zlib"))) (arguments - `(#:extra-directories ("zlib") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'strip-test-framework-constraints - (lambda _ - (substitute* "zlib.cabal" - (("tasty >= 0\\.8 && < 0\\.12") "tasty") - (("tasty-hunit >= 0\\.8 && < 0\\.10") "tasty-hunit") - (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) + `(#:extra-directories ("zlib"))) (inputs (list zlib)) - (native-inputs - (list ghc-quickcheck ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck)) - (home-page "https://hackage.haskell.org/package/zlib") - (synopsis - "Compression and decompression in the gzip and zlib formats") + (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-quickcheck)) + (home-page "http://hackage.haskell.org/package/zlib") + (synopsis "Compression and decompression in the gzip and zlib formats") (description "This package provides a pure interface for compressing and decompressing streams of data represented as lazy @code{ByteString}s. It uses the zlib C @@ -14420,20 +13933,20 @@ compression ratios.") (define-public ghc-indexed-traversable (package (name "ghc-indexed-traversable") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "indexed-traversable" version)) - (sha256 - (base32 "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs")))) + (version "0.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable" version)) + (sha256 + (base32 + "13b91rkhs6wcshaz3dwx6x3xjpw5z5bm2riwp78zxccqf7p5hs2i")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-traversable"))) (inputs (list ghc-generic-deriving)) (arguments - `(#:cabal-revision - ("1" "0krvp9v5dh4w2076kar48cpkk62ndqp769v2ai3b38rsa5bj6q74"))) - (home-page "https://hackage.haskell.org/package/indexed-traversable") + `(#:cabal-revision ("2" + "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj"))) + (home-page "http://hackage.haskell.org/package/indexed-traversable") (synopsis "Indexed Functor, Foldable, and Traversable typeclasses") (description "This Haskell package provides three useful generalizations: @@ -14471,8 +13984,8 @@ associated @code{TypeFamilies} instead of @code{FunctionalDependencies}.") (build-system haskell-build-system) (properties '((upstream-name . "type-equality"))) (arguments - `(#:cabal-revision - ("2" "1a3irpv5kyg3rywhmcp5fwg5irrdbdr0hrlw7asdk113nakrba7j"))) + `(#:cabal-revision ("4" + "0sajw67mmk5syhbrwx4bz82j5cjhm04n4kjl0pp3dnphxg1m5nbw"))) (home-page "https://github.com/hesselink/type-equality") (synopsis "@code{Data.Type.Equality} compatibility package") (description @@ -14491,18 +14004,16 @@ for compilers with @code{PolyKinds}.") (define-public ghc-selective (package (name "ghc-selective") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "selective" version)) - (sha256 - (base32 "1mg5hnr3f4zjh3ajy16jkxj630rnfa9iqnnmpjqd9gkjdxpssd5l")))) + (version "0.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "selective" version)) + (sha256 + (base32 + "18wd5wn8xaw0ilx34j292l06cqn6r2rri1wvxng8ygd8141sizdh")))) (build-system haskell-build-system) (properties '((upstream-name . "selective"))) - (native-inputs - (list ghc-quickcheck ghc-tasty ghc-tasty-expected-failure - ghc-tasty-quickcheck)) + (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/snowleopard/selective") (synopsis "Selective applicative functors") (description @@ -14534,6 +14045,9 @@ on selective functors} for more details.") ghc-tagged ghc-transformers-compat ghc-unordered-containers)) + (arguments + `(#:cabal-revision ("2" + "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"))) (home-page "http://github.com/ekmett/keys/") (synopsis "Keyed functors and containers") (description @@ -14546,26 +14060,25 @@ dependencies.") (define-public ghc-pointed (package (name "ghc-pointed") - (version "5.0.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "pointed" version)) - (sha256 - (base32 "07p92y62dibys3xa59rvx52xyyr39nghl73z7hzwnksa3ry3vfmq")))) + (version "5.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "pointed" version)) + (sha256 + (base32 + "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3")))) (build-system haskell-build-system) (properties '((upstream-name . "pointed"))) - (inputs - (list ghc-data-default-class - ghc-comonad - ghc-kan-extensions - ghc-semigroupoids - ghc-semigroups - ghc-tagged - ghc-transformers-compat - ghc-hashable - ghc-unordered-containers)) - (home-page "https://github.com/ekmett/pointed/") + (inputs (list ghc-data-default-class + ghc-comonad + ghc-kan-extensions + ghc-semigroupoids + ghc-semigroups + ghc-tagged + ghc-transformers-compat + ghc-hashable + ghc-unordered-containers)) + (home-page "http://github.com/ekmett/pointed/") (synopsis "Pointed and copointed data types") (description "This Haskell library provides pointed and copointed data types.") @@ -14601,17 +14114,16 @@ the @code{ghc-vector} package.") (define-public ghc-th-compat (package (name "ghc-th-compat") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "th-compat" version)) - (sha256 - (base32 "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b")))) + (version "0.1.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "th-compat" version)) + (sha256 + (base32 + "1f5ssi24mnhmmi91dl5ddg2jwci6akwlznqggf56nyxl9b0pmyfq")))) (build-system haskell-build-system) (properties '((upstream-name . "th-compat"))) - (native-inputs - (list ghc-base-compat ghc-hspec hspec-discover)) + (native-inputs (list ghc-base-compat ghc-hspec hspec-discover)) (home-page "https://github.com/haskell-compat/th-compat") (synopsis "Backward- and forward-compatible @code{Quote} and @code{Code} types") @@ -14626,19 +14138,18 @@ range of @code{template-haskell} versions. On recent versions of (define-public ghc-filepattern (package (name "ghc-filepattern") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "filepattern" version)) - (sha256 - (base32 "0nznzji5haxl4ninm2a79dqf4c7fj6pc3z9gdc6wbf5h1pp14afr")))) + (version "0.1.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "filepattern" version)) + (sha256 + (base32 + "0dlnwnwhsfdkwm69z66wj5d2x9n3la55glq4fsn5rxm2kr1msi6c")))) (build-system haskell-build-system) (properties '((upstream-name . "filepattern"))) - (inputs - (list ghc-extra ghc-semigroups)) + (inputs (list ghc-extra)) (native-inputs (list ghc-quickcheck)) - (home-page "https://github.com/ndmitchell/filepattern") + (home-page "https://github.com/ndmitchell/filepattern#readme") (synopsis "File path glob-like matching") (description "This package provides Haskell library for matching files using patterns @@ -14667,19 +14178,18 @@ traverals using patterns. (define-public ghc-lib-parser-ex (package (name "ghc-lib-parser-ex") - (version "8.10.0.23") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ghc-lib-parser-ex" version)) - (sha256 - (base32 "0r5sl7hhn0cxp0b1dskx1lshplc0yka7hcvs2nh10nrj07fjd3vj")))) + (version "9.2.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "ghc-lib-parser-ex" version)) + (sha256 + (base32 + "138wkpy7qpdkp07028flab3lwq4b3mns0qcrkfrhclixlz8pi74v")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser-ex"))) (inputs (list ghc-uniplate)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit ghc-extra)) - (home-page "https://github.com/shayne-fletcher/ghc-lib-parser-ex") + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-extra)) + (home-page "https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme") (synopsis "Algorithms on GHC parse trees") (description "The @code{ghc-lib-parser-ex} package contains GHC API parse tree utilities.") @@ -14688,16 +14198,16 @@ traverals using patterns. (define-public ghc-lift-type (package (name "ghc-lift-type") - (version "0.1.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "lift-type" version)) - (sha256 - (base32 "1195iyf0s8zmibjmvd10bszyccp1a2g4wdysn7yk10d3j0q9xdxf")))) + (version "0.1.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "lift-type" version)) + (sha256 + (base32 + "039psym2ghkydk4qyycs3cxndrf85ab5hwzrqv0ajxcilqr11n0h")))) (build-system haskell-build-system) (properties '((upstream-name . "lift-type"))) - (home-page "https://github.com/parsonsmatt/lift-type") + (home-page "https://github.com/parsonsmatt/lift-type#readme") (synopsis "Lift a type from a Typeable constraint to a Template Haskell type") (description @@ -14709,19 +14219,18 @@ it.") (define-public ghc-unicode-collation (package (name "ghc-unicode-collation") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (hackage-uri "unicode-collation" version)) - (sha256 - (base32 "0nbxkpd29ivdi6vcikbaasffkcz9m2vd4nhv29p6gmvckzmhj7zi")))) + (version "0.1.3.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "unicode-collation" version)) + (sha256 + (base32 + "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-collation"))) (inputs (list ghc-th-lift-instances)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit - ghc-unicode-transforms ghc-doctest)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit + ghc-unicode-transforms ghc-doctest)) (home-page "https://github.com/jgm/unicode-collation") (synopsis "Haskell implementation of the Unicode Collation Algorithm") (description @@ -14735,32 +14244,31 @@ provided.") (define-public ghc-citeproc (package (name "ghc-citeproc") - (version "0.4.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "citeproc" version)) - (sha256 - (base32 "13hgbcbr7jbyfbxp8fsc43c2wq4fhlbxzqwh1plfkdi5n9bif1lv")))) + (version "0.8.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "citeproc" version)) + (sha256 + (base32 + "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw")))) (build-system haskell-build-system) (properties '((upstream-name . "citeproc"))) - (inputs - (list ghc-safe - ghc-case-insensitive - ghc-vector - ghc-scientific - ghc-uniplate - ghc-xml-conduit - ghc-attoparsec - ghc-data-default - ghc-aeson - ghc-file-embed - ghc-pandoc-types - ghc-unicode-collation - ghc-base-compat - ghc-aeson-pretty)) + (inputs (list ghc-safe + ghc-case-insensitive + ghc-vector + ghc-scientific + ghc-uniplate + ghc-xml-conduit + ghc-attoparsec + ghc-data-default + ghc-aeson + ghc-file-embed + ghc-pandoc-types + ghc-unicode-collation + ghc-base-compat + ghc-aeson-pretty)) (native-inputs (list ghc-timeit ghc-diff)) - (home-page "https://hackage.haskell.org/package/citeproc") + (home-page "http://hackage.haskell.org/package/citeproc") (synopsis "Generate citations and bibliography from CSL styles") (description "@code{ghc-citeproc} parses @acronym{Citation Style Language, CSL} style files @@ -14771,18 +14279,17 @@ entries. For more information about CSL, see @uref{https://citationstyles.org/} (define-public ghc-commonmark (package (name "ghc-commonmark") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "commonmark" version)) - (sha256 - (base32 "105szy7l4ji255fwv0kbfcy3i3a3a4197zgj6s9jb12kwbn6n0c7")))) + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "commonmark" version)) + (sha256 + (base32 + "0kmjc9xgzy33kxz842mw5rdywip3lmk7v3ambrs87nakawgl42xp")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark"))) - (inputs (list ghc-unicode-transforms)) - (native-inputs - (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) + (inputs (list ghc-unicode-transforms ghc-unicode-data)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) (home-page "https://github.com/jgm/commonmark-hs") (synopsis "Pure Haskell Commonmark parser") (description @@ -14805,19 +14312,17 @@ varies linearly with input length.") (define-public ghc-commonmark-extensions (package (name "ghc-commonmark-extensions") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "commonmark-extensions" version)) - (sha256 - (base32 "0jm6w84p2a2gyaljvnlvjjwrwnir1lss3ps53d0bd8mkvhixxrqr")))) + (version "0.2.3.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "commonmark-extensions" version)) + (sha256 + (base32 + "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-extensions"))) - (inputs - (list ghc-network-uri ghc-commonmark ghc-emojis)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit)) + (inputs (list ghc-network-uri ghc-commonmark ghc-emojis)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/jgm/commonmark-hs") (synopsis "Extensions for @code{ghc-commonmark}") (description @@ -14829,17 +14334,16 @@ footnotes, math, and more.") (define-public ghc-commonmark-pandoc (package (name "ghc-commonmark-pandoc") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "commonmark-pandoc" version)) - (sha256 - (base32 "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp")))) + (version "0.2.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "commonmark-pandoc" version)) + (sha256 + (base32 + "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-pandoc"))) - (inputs - (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types)) + (inputs (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types)) (home-page "https://github.com/jgm/commonmark-hs") (synopsis "Bridge between Commonmark and Pandoc AST") (description @@ -14850,19 +14354,18 @@ Pandoc types.") (define-public ghc-hslua-module-path (package (name "ghc-hslua-module-path") - (version "0.1.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-path" version)) - (sha256 - (base32 "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68")))) + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-path" version)) + (sha256 + (base32 + "1sy2k4mb263kg85vkf39ja84xz5kvm6z61xn62jy1swhrvvd96sr")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-path"))) - (inputs (list ghc-hslua)) - (native-inputs - (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) - (home-page "https://github.com/hslua/hslua-module-path") + (inputs (list ghc-hslua-core ghc-hslua-marshalling ghc-hslua-packaging)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) + (home-page "https://hslua.org/") (synopsis "Lua module to work with file paths") (description "This Haskell library provides a Lua module to work with file paths in a @@ -14872,16 +14375,22 @@ platform independent way.") (define-public ghc-template-haskell (package (name "ghc-template-haskell") - (version "2.16.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "template-haskell" version)) - (sha256 - (base32 "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g")))) + (version "2.18.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "template-haskell" version)) + (sha256 + (base32 + "0mcb7psdkyx9ddwkny0ymvadrsy2dnj82d6jdm23c63zv99z3g1r")))) (build-system haskell-build-system) (properties '((upstream-name . "template-haskell"))) - (inputs (list ghc-boot-th)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "template-haskell.cabal" + (("ghc-boot-th == 9.2.1") "ghc-boot-th"))))))) (home-page "https://hackage.haskell.org/package/template-haskell") (synopsis "Support library for Template Haskell") (description @@ -14894,74 +14403,50 @@ information.") (define-public ghc-genvalidity-hspec (package (name "ghc-genvalidity-hspec") - (version "0.7.0.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "genvalidity-hspec" version)) - (sha256 - (base32 "0aajx07n2rznyqxb0c4pn9j2cvkzw5brz9ki4grhhigbcri3jzmv")))) + (version "1.0.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "genvalidity-hspec" version)) + (sha256 + (base32 + "00sv0mzlvny5ch7c9fnd19szqd0pjrkvi080x1i62qa5fdzs5yc4")))) (build-system haskell-build-system) (properties '((upstream-name . "genvalidity-hspec"))) - (inputs - (list ghc-quickcheck - ghc-genvalidity - ghc-genvalidity-property - ghc-hspec - hspec-discover - ghc-hspec-core - ghc-validity)) - (home-page "https://github.com/NorfairKing/validity") + (inputs (list ghc-quickcheck + ghc-genvalidity + ghc-genvalidity-property + ghc-hspec + ghc-hspec-core + ghc-validity)) + (native-inputs (list hspec-discover)) + (home-page "https://github.com/NorfairKing/validity#readme") (synopsis "Standard spec's for @code{GenValidity} instances") (description "This haskell library provides validity and validity-based testing for @code{ghc-hspec}.") (license license:expat))) -(define-public ghc-boot-th - (package - (name "ghc-boot-th") - (version "8.10.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "ghc-boot-th" version)) - (sha256 - (base32 "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli")))) - (build-system haskell-build-system) - (properties '((upstream-name . "ghc-boot-th"))) - (home-page "https://hackage.haskell.org/package/ghc-boot-th") - (synopsis - "Shared functionality between GHC and Template Haskell") - (description - "This library contains various bits shared between GHC and Template -Haskell. This package exists to ensure that @code{template-haskell} has a -minimal set of transitive dependencies, since it is intended to be depended -upon by user code.") - (license license:bsd-3))) - (define-public ghc-binary-orphans (package (name "ghc-binary-orphans") - (version "1.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "binary-orphans" version)) - (sha256 - (base32 "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3")))) + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "binary-orphans" version)) + (sha256 + (base32 + "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2")))) (build-system haskell-build-system) (properties '((upstream-name . "binary-orphans"))) - (native-inputs - (list ghc-quickcheck ghc-quickcheck-instances ghc-tagged ghc-tasty - ghc-tasty-quickcheck)) - (arguments - `(#:cabal-revision - ("5" "1h2d37szfrcwn9rphnijn4q9l947b0wwqjs1aqmm62xkhbad7jf6"))) + (native-inputs (list ghc-onetuple + ghc-quickcheck + ghc-quickcheck-instances + ghc-tagged + ghc-tasty + ghc-tasty-quickcheck)) (home-page "https://hackage.haskell.org/package/binary-orphans") (synopsis "Compatibility package for binary") - (description - "This package provides instances defined in later versions of + (description "This package provides instances defined in later versions of @code{ghc-binary} package.") (license license:bsd-3))) @@ -14991,18 +14476,18 @@ of Netlink families.") (define-public ghc-doctest-driver-gen (package (name "ghc-doctest-driver-gen") - (version "0.3.0.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "doctest-driver-gen" version)) - (sha256 - (base32 "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a")))) + (version "0.3.0.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "doctest-driver-gen" version)) + (sha256 + (base32 + "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l")))) (build-system haskell-build-system) (properties '((upstream-name . "doctest-driver-gen"))) - (arguments `(#:tests? #f)) ; TODO: Fail to open shared library. (native-inputs (list ghc-doctest)) - (home-page "https://github.com/Hexirp/doctest-driver-gen") + (arguments (list #:tests? #f)) ;; XXX: doctest-driver-gen: error while loading shared libraries: libHSdoctest-driver-gen-0.3.0.6-3WJHXaMfGwJFKjjgcmC868-ghc9.2.5.so: cannot open shared object file: No such file or directory + (home-page "https://github.com/Hexirp/doctest-driver-gen#readme") (synopsis "Generate driver file for Doctest's Cabal integration") (description "@code{ghc-doctest-driver-gen} is a Doctest's driver file generator. It @@ -15012,17 +14497,19 @@ lets you automatically generate driver file for Doctest's Cabal integration.") (define-public ghc-template-haskell-compat-v0208 (package (name "ghc-template-haskell-compat-v0208") - (version "0.1.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "template-haskell-compat-v0208" version)) - (sha256 - (base32 "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8")))) + (version "0.1.9.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "template-haskell-compat-v0208" version)) + (sha256 + (base32 + "1z87rla4vcbghdrvjkay59b686f0by02102vwrcayn4vbwzn4am1")))) (build-system haskell-build-system) (properties '((upstream-name . "template-haskell-compat-v0208"))) - (home-page "https://github.com/nikita-volkov/template-haskell-compat-v0208") - (synopsis "Backwards compatibility layer for Template Haskell newer than 2.8") + (home-page + "https://github.com/nikita-volkov/template-haskell-compat-v0208") + (synopsis + "Backwards compatibility layer for Template Haskell newer than 2.8") (description "This package provides a backwards compatibility layer for Template Haskell newer than 2.8.") @@ -15084,28 +14571,26 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (define-public ghc-mysql-simple (package (name "ghc-mysql-simple") - (version "0.4.7") - (source - (origin - (method url-fetch) - (uri (hackage-uri "mysql-simple" version)) - (sha256 - (base32 "1mhmszpq64h8kxr20iaj1laq46wr2gaqc8xxq1k821i7jfxfld6j")))) + (version "0.4.9") + (source (origin + (method url-fetch) + (uri (hackage-uri "mysql-simple" version)) + (sha256 + (base32 + "0hwv1hlr65m5l2zrrj5zmvrjz9y2814jy05l17l5jb4j4j5xw3z2")))) (build-system haskell-build-system) (properties '((upstream-name . "mysql-simple"))) - (arguments `(#:tests? #f)) ; TODO: Fails to connect to server. - (inputs - (list ghc-attoparsec - ghc-base16-bytestring - ghc-blaze-builder - ghc-mysql - ghc-pcre-light - ghc-old-locale - ghc-blaze-textual - ghc-vector - openssl - zlib)) + (inputs (list ghc-attoparsec + ghc-base16-bytestring + ghc-blaze-builder + ghc-mysql + ghc-pcre-light + ghc-old-locale + ghc-vector + openssl + zlib)) (native-inputs (list ghc-hspec)) + (arguments (list #:tests? #f)) ; Fail to build. (home-page "https://github.com/paul-rouse/mysql-simple") (synopsis "Mid-level MySQL client library") (description @@ -15116,27 +14601,25 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.") (define-public ghc-persistent-qq (package (name "ghc-persistent-qq") - (version "2.12.0.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "persistent-qq" version)) - (sha256 - (base32 "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p")))) + (version "2.12.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "persistent-qq" version)) + (sha256 + (base32 + "0pzlhwl4h9q358zc6d0m5zv0ii2yhf2lzw0a3v2spfc1ch4a014a")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-qq"))) - (inputs - (list ghc-haskell-src-meta ghc-persistent)) - (native-inputs - (list ghc-hunit - ghc-aeson - ghc-fast-logger - ghc-hspec - ghc-monad-logger - ghc-persistent-sqlite - ghc-resourcet - ghc-unliftio)) - (home-page "https://github.com/yesodweb/persistent") + (inputs (list ghc-haskell-src-meta ghc-persistent)) + (native-inputs (list ghc-hunit + ghc-aeson + ghc-fast-logger + ghc-hspec + ghc-monad-logger + ghc-persistent-sqlite + ghc-resourcet + ghc-unliftio)) + (home-page "https://github.com/yesodweb/persistent#readme") (synopsis "Quasi-quoter for raw SQL for @code{ghc-persistent}") (description "This package provides a quasi-quoter for raw @acronym{SQL, Structured Query @@ -15146,39 +14629,36 @@ Language} for @code{ghc-persistent}.") (define-public ghc-persistent-mysql (package (name "ghc-persistent-mysql") - (version "2.13.0.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "persistent-mysql" version)) - (sha256 - (base32 "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732")))) + (version "2.13.1.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "persistent-mysql" version)) + (sha256 + (base32 + "0fm6agqwawwraw6l6kxm8lq40pm5pnjg093f574a7sdf648q21yc")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-mysql"))) - (arguments `(#:tests? #f)) ; TODO: Fails to import MaybeFieldDefsTest. - (inputs - (list ghc-persistent - ghc-aeson - ghc-blaze-builder - ghc-conduit - ghc-monad-logger - ghc-mysql - ghc-mysql-simple - ghc-resourcet - ghc-resource-pool - ghc-unliftio-core - openssl - zlib)) - (native-inputs - (list ghc-fast-logger - ghc-hspec - ghc-http-api-data - ghc-hunit - ghc-path-pieces - ghc-persistent-qq - ghc-persistent-test - ghc-quickcheck - ghc-quickcheck-instances)) + (inputs (list ghc-persistent + ghc-aeson + ghc-blaze-builder + ghc-conduit + ghc-monad-logger + ghc-mysql + ghc-mysql-simple + ghc-resourcet + ghc-resource-pool + ghc-unliftio-core + openssl)) + (native-inputs (list ghc-fast-logger + ghc-hspec + ghc-http-api-data + ghc-hunit + ghc-path-pieces + ghc-persistent-qq + ghc-persistent-test + ghc-quickcheck + ghc-quickcheck-instances)) + (arguments (list #:tests? #f)) ; Fails to connect to server. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent} library using MySQL database server") @@ -15246,8 +14726,8 @@ string types into values of other string types.") (build-system haskell-build-system) (properties '((upstream-name . "postgresql-libpq"))) (arguments - `(#:cabal-revision - ("1" "1clivf13z15w954a0kcfkv8yc0d8kx61b68x2hk7a9236ck7l2m2"))) + `(#:cabal-revision ("3" + "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"))) (inputs (list postgresql)) (home-page "https://github.com/haskellari/postgresql-libpq") (synopsis "Low-level bindings to @code{libpq}") @@ -15293,8 +14773,8 @@ server and to receive the results of these queries.") ghc-tasty-golden ghc-tasty-hunit)) (arguments - `(#:cabal-revision - ("2" "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"))) + `(#:cabal-revision ("8" + "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"))) (home-page "https://hackage.haskell.org/package/postgresql-simple") (synopsis "Mid-Level PostgreSQL client library") (description @@ -15305,44 +14785,43 @@ server and to receive the results of these queries.") (define-public ghc-persistent-postgresql (package (name "ghc-persistent-postgresql") - (version "2.13.2.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "persistent-postgresql" version)) - (sha256 - (base32 "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir")))) + (version "2.13.5.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "persistent-postgresql" version)) + (sha256 + (base32 + "1q9hy49nfrb3azgz5rjz235d7scy27l5axkih7crskaa04hf4k8d")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-postgresql"))) - (arguments `(#:tests? #f)) ; TODO: Cannot import MaybeFieldDefsTest. - (inputs - (list ghc-persistent - ghc-aeson - ghc-attoparsec - ghc-blaze-builder - ghc-conduit - ghc-monad-logger - ghc-postgresql-simple - ghc-postgresql-libpq - ghc-resourcet - ghc-resource-pool - ghc-string-conversions - ghc-unliftio-core - ghc-unliftio)) - (native-inputs - (list ghc-persistent-qq - ghc-persistent-test - ghc-fast-logger - ghc-hunit - ghc-hspec - ghc-hspec-expectations - ghc-hspec-expectations-lifted - ghc-quickcheck - ghc-quickcheck-instances - ghc-path-pieces - ghc-http-api-data - ghc-unordered-containers - ghc-vector)) + (inputs (list ghc-persistent + ghc-aeson + ghc-attoparsec + ghc-blaze-builder + ghc-conduit + ghc-monad-logger + ghc-postgresql-simple + ghc-postgresql-libpq + ghc-resourcet + ghc-resource-pool + ghc-string-conversions + ghc-unliftio-core + ghc-vault + ghc-unliftio)) + (native-inputs (list ghc-persistent-qq + ghc-persistent-test + ghc-fast-logger + ghc-hunit + ghc-hspec + ghc-hspec-expectations + ghc-hspec-expectations-lifted + ghc-quickcheck + ghc-quickcheck-instances + ghc-path-pieces + ghc-http-api-data + ghc-unordered-containers + ghc-vector)) + (arguments (list #:tests? #f)) ; Fails to connect to server. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent library} using Postgresql") (description @@ -15393,22 +14872,21 @@ using the @code{ghc-postgresql-simple} package.") (define-public ghc-hsyaml-aeson (package (name "ghc-hsyaml-aeson") - (version "0.2.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "HsYAML-aeson" version)) - (sha256 - (base32 "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg")))) + (version "0.2.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "HsYAML-aeson" version)) + (sha256 + (base32 + "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r")))) (build-system haskell-build-system) (properties '((upstream-name . "HsYAML-aeson"))) - (inputs - (list ghc-hsyaml ghc-aeson ghc-scientific ghc-unordered-containers - ghc-vector)) + (inputs (list ghc-hsyaml ghc-aeson ghc-scientific ghc-unordered-containers + ghc-vector)) (arguments - `(#:cabal-revision - ("3" "0vhdndyj5f07vvvnssn5ybdja5wmaydq0n2lfpihvdg4dkhczrx2"))) - (home-page "https://hackage.haskell.org/package/HsYAML-aeson") + `(#:cabal-revision ("5" + "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"))) + (home-page "http://hackage.haskell.org/package/HsYAML-aeson") (synopsis "JSON to YAML adapter") (description "The @uref{https://yaml.org/spec/1.2/spec.html, YAML 1.2} format provides @@ -15443,8 +14921,8 @@ data into native Haskell data types.") ghc-tasty-hunit ghc-temporary)) (arguments - `(#:cabal-revision - ("1" "0mmq1q82mrbayiij0p8wdnkf0j8drmq1iibg8kn4cak3nrn9pd1d"))) + `(#:cabal-revision ("3" + "1a6spmbiv3ias40sjrnsxfgr1d5mwg039a2q7113zb7i9n6c1m7g"))) (home-page "https://hackage.haskell.org/package/lukko") (synopsis "File locking") (description @@ -15465,15 +14943,16 @@ locking. (define-public ghc-dec (package (name "ghc-dec") - (version "0.0.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "dec" version)) - (sha256 - (base32 "0yslffafmqfkvhcw2arpc53hfmn1788z85ss9lxnbclr29lbvzgc")))) + (version "0.0.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "dec" version)) + (sha256 + (base32 + "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071")))) (build-system haskell-build-system) (properties '((upstream-name . "dec"))) + (inputs (list ghc-boring)) (home-page "https://github.com/phadej/vec") (synopsis "Decidable propositions") (description @@ -15539,27 +15018,1265 @@ pages.") (define-public ghc-singleton-bool (package (name "ghc-singleton-bool") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (hackage-uri "singleton-bool" version)) - (sha256 - (base32 "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0")))) + (version "0.1.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "singleton-bool" version)) + (sha256 + (base32 + "1pc34dbzx5g3vw5w03zifvqva3whyvxzfy3yh78qkpd05f0g98sw")))) (build-system haskell-build-system) (properties '((upstream-name . "singleton-bool"))) - (inputs (list ghc-dec)) + (inputs (list ghc-boring ghc-dec ghc-some)) (arguments - `(#:cabal-revision - ("3" "11rhzpy4xiry39bbxzwrqff75f0f4g7z0vkr3v9l8rv3w40jlf7x"))) - (home-page "https://github.com/phadej/singleton-bool") + `(#:cabal-revision ("2" + "1l4nx664awgwzk3ih5idsgnj220jqdr1c55241xjv7fz7lwyhh5r"))) + (home-page "https://github.com/phadej/singleton-bool#readme") (synopsis "Type-level booleans") + (description "This package provides Type-level booleans.") + (license license:bsd-3))) + +(define-public ghc-breakpoint + (package + (name "ghc-breakpoint") + (version "0.1.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "breakpoint" version)) + (sha256 + (base32 + "1hk9mjijxvqjzcfqllzi53rmxiyggbxash05jbb742wrq832h2xw")))) + (build-system haskell-build-system) + (properties '((upstream-name . "breakpoint"))) + (inputs (list ghc-pretty-simple ghc-ansi-terminal)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "http://hackage.haskell.org/package/breakpoint") + (synopsis "Set breakpoints using a GHC plugin") (description - "This package provides Type-level booleans.") + "This package provides a plugin that allows you to set breakpoints for debugging +purposes. See the +[README](https://github.com/aaronallen8455/breakpoint#breakpoint) for details.") + (license license:expat))) + +(define-public ghc-githash + (package + (name "ghc-githash") + (version "0.1.6.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "githash" version)) + (sha256 + (base32 + "06zg1rif1rcxni1vacmr2bh1nbm6i62rjbikfr4xsyzq1sv7kfpw")))) + (build-system haskell-build-system) + (properties '((upstream-name . "githash"))) + (inputs (list ghc-th-compat git)) + (native-inputs (list ghc-hspec ghc-temporary ghc-unliftio hspec-discover)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-git-path + (lambda _ + (substitute* "src/GitHash.hs" + (("\"git\"") (string-append "\"" #$git "/bin/git\"")))))))) + (home-page "https://github.com/snoyberg/githash#readme") + (synopsis "Compile git revision info into Haskell projects") + (description "Please see the README and documentation at +") (license license:bsd-3))) -;;; -;;; Avoid adding new packages to the end of this file. To reduce the chances -;;; of a merge conflict, place them above by existing packages with similar -;;; functionality or similar names. -;;; +(define-public ghc-nothunks + (package + (name "ghc-nothunks") + (version "0.1.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "nothunks" version)) + (sha256 + (base32 + "0lqfhnyxhmhajvsgmz5h428pb5zrdy9zvbc5inzhd83cv31yk4f1")))) + (build-system haskell-build-system) + (properties '((upstream-name . "nothunks"))) + (inputs (list ghc-vector)) + ;(native-inputs (list ghc-hedgehog ghc-random ghc-tasty ghc-tasty-hedgehog)) + (arguments (list #:tests? #f)) ; Fail to compile. + (home-page "http://hackage.haskell.org/package/nothunks") + (synopsis "Examine values for unexpected thunks") + (description + "Long lived application data typically should not contain any thunks. This +library can be used to examine values for unexpected thunks, which can then be +used in assertions. This can be invaluable in avoiding memory leaks, or +tracking down existing ones.") + (license license:expat))) + +(define-public ghc-nothunks-bootstrap + (package + (inherit ghc-nothunks) + (name "ghc-nothunks-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + +(define-public ghc-barbies + (package + (name "ghc-barbies") + (version "2.0.4.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "barbies" version)) + (sha256 + (base32 + "0v8bckxi58fkqgf1i1xd3100wp792pzd319xlfvmmw8z0ii1g872")))) + (build-system haskell-build-system) + (properties '((upstream-name . "barbies"))) + (inputs (list ghc-distributive)) + (native-inputs (list ghc-quickcheck + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-quickcheck + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (home-page "https://github.com/jcpetruzza/barbies#readme") + (synopsis "Classes for working with types that can change clothes.") + (description + "Types that are parametric on a functor are like Barbies that have an outfit for +each role. This package provides the basic abstractions to work with them +comfortably.") + (license license:bsd-3))) + +(define-public ghc-onetuple + (package + (name "ghc-onetuple") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "OneTuple" version)) + (sha256 + (base32 + "1vry21z449ph9k61l5zm7mfmdwkwszxqdlawlhvwrd1gsn13d1cq")))) + (build-system haskell-build-system) + (properties '((upstream-name . "OneTuple"))) + (native-inputs (list ghc-hashable)) + (arguments + `(#:cabal-revision ("3" + "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw"))) + (home-page "http://hackage.haskell.org/package/OneTuple") + (synopsis "Singleton Tuple") + (description + "This package is a compatibility package for a singleton data type . > data Solo +a = Solo a . Note: it's not a @@newtype@@ . @@Solo@@ is available in +@@base-4.16@@ (GHC-9.2).") + (license license:bsd-3))) + +(define-public ghc-indexed-traversable-instances + (package + (name "ghc-indexed-traversable-instances") + (version "0.1.1.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable-instances" version)) + (sha256 + (base32 + "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9")))) + (build-system haskell-build-system) + (properties '((upstream-name . "indexed-traversable-instances"))) + (inputs (list ghc-indexed-traversable ghc-onetuple ghc-tagged + ghc-unordered-containers ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty + ghc-tasty-quickcheck)) + (home-page + "http://hackage.haskell.org/package/indexed-traversable-instances") + (synopsis + "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex") + (description + "This package provides extra instances for type-classes in the +[indexed-traversable](https://hackage.haskell.org/package/indexed-traversable) +package. . The intention is to keep this package minimal; it provides instances +that formely existed in @@lens@@ or @@optics-extra@@. We recommend putting +other instances directly into their defining packages. The +@@indexed-traversable@@ package is light, having only GHC boot libraries as its +dependencies.") + (license license:bsd-2))) + +(define-public ghc-witherable + (package + (name "ghc-witherable") + (version "0.4.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "witherable" version)) + (sha256 + (base32 + "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br")))) + (build-system haskell-build-system) + (properties '((upstream-name . "witherable"))) + (inputs (list ghc-base-orphans + ghc-hashable + ghc-unordered-containers + ghc-vector + ghc-indexed-traversable + ghc-indexed-traversable-instances)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty + ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc"))) + (home-page "https://github.com/fumieval/witherable") + (synopsis "filterable traversable") + (description + "This package provides a stronger variant of `traverse` which can remove elements +and generalised mapMaybe, catMaybes, filter") + (license license:bsd-3))) + +(define-public ghc-hspec-discover + (package + (name "ghc-hspec-discover") + (version "2.9.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-discover" version)) + (sha256 + (base32 + "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hspec-discover"))) + (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery)) + (home-page "http://hspec.github.io/") + (synopsis "Automatically discover and run Hspec tests") + (description "Automatically discover and run Hspec tests . +") + (license license:expat))) + +(define-public ghc-doctest-parallel + (package + (name "ghc-doctest-parallel") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (hackage-uri "doctest-parallel" version)) + (sha256 + (base32 + "13hjwhdjw8jrj07zxkrrfbzr0mrk8gwyis1rbdi4ld4jbq3rr1z7")))) + (build-system haskell-build-system) + (properties '((upstream-name . "doctest-parallel"))) + (inputs (list ghc-glob + ghc-base-compat + ghc-code-page + ghc-extra + ghc-paths + ghc-random + ghc-syb + ghc-unordered-containers)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-hspec + ghc-hspec-core + ghc-hspec-discover + ghc-mockery + ghc-setenv + ghc-silently + ghc-stringbuilder)) + (arguments + `(#:haddock? #f)) ; Setup.lhs: internal error when calculating transitive package dependencies. + (home-page "https://github.com/martijnbastiaan/doctest-parallel#readme") + (synopsis "Test interactive Haskell examples") + (description + "The doctest program checks examples in source code comments. It is modeled +after doctest for Python (). . +Documentation is at +.") + (license license:expat))) + +(define-public ghc-pcg-random + (package + (name "ghc-pcg-random") + (version "0.1.3.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "pcg-random" version)) + (sha256 + (base32 + "1l6jq5nvmg1ygk7i7g50s47p6qkh74p9avl1wbcxdl5m85lc5j76")))) + (build-system haskell-build-system) + (properties '((upstream-name . "pcg-random"))) + (inputs (list ghc-primitive ghc-random ghc-entropy)) + (native-inputs (list ghc-doctest)) + (arguments + `(#:tests? #f ; Could not find module ‘Build_doctests’ + #:phases + (modify-phases %standard-phases + ;; Tries to use non-existent doctest API. + (add-after 'unpack 'disable-doctest + (lambda _ + (with-output-to-file "Setup.hs" + (lambda _ + (display + "import Distribution.Simple\nmain = defaultMain\n")))))))) + (home-page "http://github.com/cchalmers/pcg-random") + (synopsis "Haskell bindings to the PCG random number generator.") + (description + "PCG is a family of simple fast space-efficient statistically good algorithms for +random number generation. Unlike many general-purpose RNGs, they are also hard +to predict. . This library implements bindings to the standard C +implementation. This includes the standard, unique, fast and single variants in +the pcg family. There is a pure implementation that can be used as a generator +with the random package as well as a faster primitive api that includes +functions for generating common types. . The generators in this module are +suitable for use in parallel but make sure threads don't share the same +generator or things will go horribly wrong.") + (license license:bsd-3))) + +(define-public ghc-random-bytestring + (package + (name "ghc-random-bytestring") + (version "0.1.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "random-bytestring" version)) + (sha256 + (base32 + "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j")))) + (build-system haskell-build-system) + (properties '((upstream-name . "random-bytestring"))) + (inputs (list ghc-mwc-random ghc-nats ghc-pcg-random)) + (home-page "https://www.github.com/larskuhtz/random-bytestring") + (synopsis "Efficient generation of random bytestrings") + (description + "__This package is deprecated__. Please, use genByteString from the [random +package (version >=1.2)](https://hackage.haskell.org/package/random) instead. . +Efficient generation of random bytestrings. The implementation populates +uninitialized memory with uniformily distributed random 64 bit words (and 8 bit +words for remaining bytes at the end of the bytestring). . Random words are +generated using the PRNG from the +[mwc-random](https://hackage.haskell.org/package/mwc-random) package or the +[pcg-random](https://hackage.haskell.org/package/pcg-random) package. It is +also possible to use a custom PRNG by providing an instance for the RandomWords +type class and using the function generate from the module +\"Data.ByteString.Random.Internal\". . The generated byte strings are suitable +for statistical applications. They are /not/ suitable for cryptographic +applications. . +![benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/benchmarks.png) +. ![detailed +benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/benchmarks-details.png)") + (license license:expat))) + +(define-public ghc-base64 + (package + (name "ghc-base64") + (version "0.4.2.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "base64" version)) + (sha256 + (base32 + "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4")))) + (build-system haskell-build-system) + (properties '((upstream-name . "base64"))) + (inputs (list ghc-text-short)) + (native-inputs (list ghc-base64-bytestring + ghc-quickcheck + ghc-random-bytestring + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("2" + "0cz3zzz9k490w9nfn4hpgdw4zx4w70fwqrwsfx8svcwqssqibqw3"))) + (home-page "https://github.com/emilypi/base64") + (synopsis "A modern RFC 4648-compliant Base64 library") + (description + "RFC 4648-compliant Base64 with an eye towards performance and modernity +(additional support for RFC 7049 standards)") + (license license:bsd-3))) + +(define-public ghc-ordered-containers + (package + (name "ghc-ordered-containers") + (version "0.2.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "ordered-containers" version)) + (sha256 + (base32 + "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n")))) + (build-system haskell-build-system) + (properties '((upstream-name . "ordered-containers"))) + (home-page "http://hackage.haskell.org/package/ordered-containers") + (synopsis + "Set- and Map-like types that remember the order elements were inserted") + (description "") + (license license:bsd-3))) + +(define-public ghc-cabal-syntax + (package + (name "ghc-cabal-syntax") + (version "3.6.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "Cabal-syntax" version)) + (sha256 + (base32 + "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa")))) + (build-system haskell-build-system) + (properties '((upstream-name . "Cabal-syntax"))) + (home-page "http://www.haskell.org/cabal/") + (synopsis "A library for working with .cabal files") + (description + "This library provides tools for reading and manipulating the .cabal file format. +. Version 3.6 (unlike the following versions) is a dummy package that prevents +module name clases between Cabal and Cabal-syntax if used together with a Cabal +flag as described below. . In Cabal-3.7 this package was split off. To avoid +module name clashes, you can add this to your .cabal file: . > flag Cabal-syntax +> description: Use the new Cabal-syntax package > default: False > manual: False +> > library > -- ... > if flag(Cabal-syntax) > build-depends: Cabal-syntax >= +3.7 > else > build-depends: Cabal < 3.7, Cabal-syntax < 3.7 . This will default +to the older build, but will allow consumers to opt-in to the newer libraries by +requiring Cabal or Cabal-syntax >= 3.7") + (license license:bsd-3))) + +(define-public ghc-tasty-hslua + (package + (name "ghc-tasty-hslua") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "tasty-hslua" version)) + (sha256 + (base32 + "0ibdxwaclghcgcyf9zx4b1dnp4b708ydwli4clmb0a0mp1lwdp98")))) + (build-system haskell-build-system) + (properties '((upstream-name . "tasty-hslua"))) + (inputs (list ghc-hslua-core ghc-tasty ghc-tasty-hunit)) + (home-page "https://hslua.org/") + (synopsis "Tasty helpers to test HsLua.") + (description + "Various tasty helpers and utilities to test HsLua oparations. Built on top of +tasty-hunit.") + (license license:expat))) + +(define-public ghc-hslua-marshalling + (package + (name "ghc-hslua-marshalling") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-marshalling" version)) + (sha256 + (base32 + "1xmix1frfcyv4p51rnshrg02gba7di7nrrc6chsq71d3mbwhyask")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-marshalling"))) + (inputs (list ghc-hslua-core)) + (native-inputs (list ghc-lua-arbitrary + ghc-quickcheck + ghc-quickcheck-instances + ghc-tasty-hslua + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Marshalling of values between Haskell and Lua.") + (description + "This package provides functions to marshal values from Haskell to Lua, and /vice +versa/. . This package is part of HsLua, a Haskell framework built around the +embeddable scripting language .") + (license license:expat))) + +(define-public ghc-lua-arbitrary + (package + (name "ghc-lua-arbitrary") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "lua-arbitrary" version)) + (sha256 + (base32 + "01g2pkvy7yhcrk8p1d9xzmqv279ldgy9z5aa6xj5msbxrpxvbpma")))) + (build-system haskell-build-system) + (properties '((upstream-name . "lua-arbitrary"))) + (inputs (list ghc-lua ghc-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Arbitrary instances for Lua types.") + (description + "This package provides instances for QuickCheck's \\\"Arbitrary\\\" typeclass.") + (license license:expat))) + +(define-public ghc-lua + (package + (name "ghc-lua") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "lua" version)) + (sha256 + (base32 + "07wni3ji46ndqabwffgwzij2jk34dq2d66z15hcd6jg33sqnym45")))) + (build-system haskell-build-system) + (properties '((upstream-name . "lua"))) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://hslua.org/") + (synopsis "Lua, an embeddable scripting language") + (description + "This package provides bindings and types to bridge Haskell and +. . The full Lua interpreter version 5.4.4 is +included. Alternatively, a system-wide Lua installation can be linked instead.") + (license license:expat))) + +(define-public ghc-hslua-core + (package + (name "ghc-hslua-core") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-core" version)) + (sha256 + (base32 + "0hy3a7rn940bcj0shxyk75dndwl23wwmmvbnwnay36py60hy3rbq")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-core"))) + (inputs (list ghc-lua)) + (native-inputs (list ghc-lua-arbitrary + ghc-quickcheck + ghc-quickcheck-instances + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Bindings to Lua, an embeddable scripting language") + (description + "Wrappers and helpers to bridge Haskell and . . It +builds upon the /lua/ package, which allows to bundle a Lua interpreter with a +Haskell program.") + (license license:expat))) + +(define-public ghc-hslua-aeson + (package + (name "ghc-hslua-aeson") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-aeson" version)) + (sha256 + (base32 + "0igmkay5bf3wg1n6rqm20kjv1xq36x552lgdvr1vlpwikgsiq8mb")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-aeson"))) + (inputs (list ghc-aeson + ghc-hashable + ghc-hslua-core + ghc-hslua-marshalling + ghc-scientific + ghc-unordered-containers + ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty + ghc-tasty-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Allow aeson data types to be used with Lua.") + (description + "This package provides instances to push and receive any datatype encodable as +JSON to and from the Lua stack.") + (license license:expat))) + +(define-public ghc-gridtables + (package + (name "ghc-gridtables") + (version "0.0.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "gridtables" version)) + (sha256 + (base32 + "1akix9flnax6dx3s9c7yyzb19nw13y8rmh0kz7y3hpjlkaz659xy")))) + (build-system haskell-build-system) + (properties '((upstream-name . "gridtables"))) + (inputs (list ghc-doclayout)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (arguments + `(#:cabal-revision ("1" + "0m2651z81n8s6hb8id7y6k2kprsgwnj7pcd6p8lmdpkzzz3wwd0c"))) + (home-page "https://github.com/tarleb/gridtables") + (synopsis "Parser for reStructuredText-style grid tables.") + (description + "This package provides a parser for plain-text representations of tables. This +package supports table headers, cells spanning multiple columns or rows, as well +as a way to specfiy column alignments.") + (license license:expat))) + +(define-public ghc-lpeg + (package + (name "ghc-lpeg") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "lpeg" version)) + (sha256 + (base32 + "19vvsvdw8l2zjwdcypnzw12vc9ycix92mkd6g3f6kx1i364z9hg1")))) + (build-system haskell-build-system) + (properties '((upstream-name . "lpeg"))) + (inputs (list ghc-lua)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://hslua.org/") + (synopsis "LPeg – Parsing Expression Grammars For Lua") + (description + "This package contains the C sources of LPeg, as well as some tiny Haskell helper +to load the package. . ") + (license license:expat))) + +(define-public ghc-pandoc-lua-marshal + (package + (name "ghc-pandoc-lua-marshal") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (hackage-uri "pandoc-lua-marshal" version)) + (sha256 + (base32 + "0pn9b7f8dln049k76zb4znscl01qms751y1ln4j8irs50rc1b55j")))) + (build-system haskell-build-system) + (properties '((upstream-name . "pandoc-lua-marshal"))) + (inputs (list ghc-lua ghc-hslua ghc-hslua-marshalling ghc-pandoc-types + ghc-safe)) + (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-hunit + ghc-tasty-lua ghc-tasty-quickcheck)) + (home-page "https://github.com/pandoc/pandoc-lua-marshal") + (synopsis "Use pandoc types in Lua") + (description + "This package provides functions to marshal and unmarshal pandoc document types +to and from Lua. . The values of most types are pushed to pandoc as \"userdata\" +objects that wrap a stable pointer to the Haskell value; these objects come with +methods to access and modify their properties. . Sequences are pushed as normal +Lua tables, but are augmented with convenience functions.") + (license license:expat))) + +(define-public ghc-should-not-typecheck + (package + (name "ghc-should-not-typecheck") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "should-not-typecheck" version)) + (sha256 + (base32 + "14fmv0mv2v4fqzynamlrmdj6d1l65aw1srf1wv19nrq7rrqaqf7m")))) + (build-system haskell-build-system) + (properties '((upstream-name . "should-not-typecheck"))) + (inputs (list ghc-hunit)) + (native-inputs (list ghc-hspec ghc-hspec-expectations)) + (home-page "http://github.com/CRogers/should-not-typecheck") + (synopsis + "A HUnit/hspec assertion library to verify that an expression does not typecheck") + (description + "For examples and an introduction to the library please take a look at the + +on github.") + (license license:bsd-3))) + +(define-public ghc-hspec-wai + (package + (name "ghc-hspec-wai") + (version "0.11.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-wai" version)) + (sha256 + (base32 + "03wiksic5y9a2g6a86nsxrnajdgdvpv17w02h5qla0zp9zs6pa1j")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hspec-wai"))) + (inputs (list ghc-quickcheck + ghc-base-compat + ghc-case-insensitive + ghc-hspec-core + ghc-hspec-expectations + ghc-http-types + ghc-wai + ghc-wai-extra)) + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "https://github.com/hspec/hspec-wai#readme") + (synopsis "Experimental Hspec support for testing WAI applications") + (description "Experimental Hspec support for testing WAI applications") + (license license:expat))) + +(define-public ghc-http-media + (package + (name "ghc-http-media") + (version "0.8.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "http-media" version)) + (sha256 + (base32 + "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir")))) + (build-system haskell-build-system) + (properties '((upstream-name . "http-media"))) + (inputs (list ghc-case-insensitive ghc-utf8-string)) + (native-inputs (list ghc-quickcheck ghc-test-framework + ghc-test-framework-quickcheck2)) + (arguments + `(#:cabal-revision ("7" + "1sm8bnrqvwkj7f60x4s8vfsj6lfi0knq38im35x88wk8s9whg6jd") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "http-media.cabal" + (("QuickCheck >= 2.8 && < 2.14") "QuickCheck") + (("base >= 4.7 && < 4.13") "base"))))))) + (home-page "https://github.com/zmthy/http-media") + (synopsis "Processing HTTP Content-Type and Accept headers") + (description + "This library is intended to be a comprehensive solution to parsing and selecting +quality-indexed values in HTTP headers. It is capable of parsing both media +types and language parameters from the Accept and Content header families, and +can be extended to match against other accept headers as well. Selecting the +appropriate header value is achieved by comparing a list of server options +against the quality-indexed values supplied by the client. . In the following +example, the Accept header is parsed and then matched against a list of server +options to serve the appropriate media using mapAcceptMedia': . > getHeader >>= +maybe send406Error sendResourceWith . mapAcceptMedia > [ (\"text/html\", asHtml) +> , (\"application/json\", asJson) > ] . Similarly, the Content-Type header can +be used to produce a parser for request bodies based on the given content type +with mapContentMedia': . > getContentType >>= maybe send415Error +readRequestBodyWith . mapContentMedia > [ (\"application/json\", parseJson) > , +(\"text/plain\", parseText) > ] . The API is agnostic to your choice of server.") + (license license:expat))) + +(define-public ghc-servant + (package + (name "ghc-servant") + (version "0.19.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "servant" version)) + (sha256 + (base32 + "1gk6j39rcjpjacs351lknhrwj86yr4ifyp3qwlmiig27dxqlig3q")))) + (build-system haskell-build-system) + (properties '((upstream-name . "servant"))) + (inputs (list ghc-constraints + ghc-sop-core + ghc-http-api-data + ghc-singleton-bool + ghc-base-compat + ghc-aeson + ghc-attoparsec + ghc-bifunctors + ghc-case-insensitive + ghc-http-media + ghc-http-types + ghc-mmorph + ghc-network-uri + ghc-quickcheck + ghc-string-conversions + ghc-tagged + ghc-vault)) + (native-inputs (list ghc-hspec ghc-quickcheck-instances hspec-discover)) + (home-page "http://docs.servant.dev/") + (synopsis "A family of combinators for defining webservices APIs") + (description + "This package provides a family of combinators for defining webservices APIs and +serving them . You can learn about the basics in the +. . +") + (license license:bsd-3))) + +(define-public ghc-servant-server + (package + (name "ghc-servant-server") + (version "0.19.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "servant-server" version)) + (sha256 + (base32 + "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy")))) + (build-system haskell-build-system) + (properties '((upstream-name . "servant-server"))) + (inputs (list ghc-constraints + ghc-servant + ghc-http-api-data + ghc-base-compat + ghc-base64-bytestring + ghc-http-media + ghc-http-types + ghc-network-uri + ghc-monad-control + ghc-network + ghc-sop-core + ghc-string-conversions + ghc-resourcet + ghc-tagged + ghc-transformers-base + ghc-wai + ghc-wai-app-static + ghc-word8 + ghc-aeson + ghc-warp)) + (native-inputs (list ghc-safe + ghc-transformers-compat + ghc-hspec + ghc-hspec-wai + ghc-quickcheck + ghc-should-not-typecheck + ghc-temporary + ghc-wai-extra + hspec-discover)) + (home-page "http://docs.servant.dev/") + (synopsis + "A family of combinators for defining webservices APIs and serving them") + (description + "This package provides a family of combinators for defining webservices APIs and +serving them . You can learn about the basics in the +. . + is a runnable example, with comments, that defines a dummy API and +implements a webserver that serves this API, using this package. . +") + (license license:bsd-3))) + +(define-public ghc-boring + (package + (name "ghc-boring") + (version "0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "boring" version)) + (sha256 + (base32 + "0d2cm9ra69cvaxs5x3lr2rfv7xx6xrbpb3dbcpyd8m77cqxm7b0b")))) + (build-system haskell-build-system) + (properties '((upstream-name . "boring"))) + (inputs (list ghc-tagged)) + (arguments + `(#:cabal-revision ("2" + "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828"))) + (home-page "https://github.com/phadej/boring") + (synopsis "Boring and Absurd types") + (description + "* @@Boring@@ types are isomorphic to @@()@@. . * @@Absurd@@ types are isomorphic +to @@Void@@. . See [What does () mean in Haskell -answer by Conor +McBride](https://stackoverflow.com/questions/33112439/what-does-mean-in-haskell/33115522#33115522)") + (license license:bsd-3))) + +(define-public ghc-some + (package + (name "ghc-some") + (version "1.0.4.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "some" version)) + (sha256 + (base32 + "1qy840b2f58f0jxmw4q9sfgbx64kypzdlqnwc72md5wwv84b9b1d")))) + (build-system haskell-build-system) + (properties '((upstream-name . "some"))) + (home-page "https://github.com/haskellari/some") + (synopsis "Existential type: Some") + (description + "This library defines an existential type Some'. . @@ data Some f where \\ Some :: +f a -> Some f @@ . in few variants, and utilities to work with it. . If you +are unsure which variant to use, use the one in \"Data.Some\" module.") + (license license:bsd-3))) + +(define-public ghc-hslua-classes + (package + (name "ghc-hslua-classes") + (version "2.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-classes" version)) + (sha256 + (base32 + "1z7ym3whcq16k2cm9jf7sf0vwmp52iv1f0iicvv4jk6xks9d6ia1")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-classes"))) + (inputs (list ghc-hslua-core ghc-hslua-marshalling)) + (native-inputs (list ghc-lua-arbitrary + ghc-quickcheck + ghc-quickcheck-instances + ghc-tasty + ghc-tasty-hslua + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Type classes for HsLua") + (description + "Type classes for convenient marshalling and calling of Lua functions.") + (license license:expat))) + +(define-public ghc-hslua-objectorientation + (package + (name "ghc-hslua-objectorientation") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-objectorientation" version)) + (sha256 + (base32 + "13011yzz6lrgl2gasn9w5ggdqgrdz49hhqk1h259qd9gq29jnq3y")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-objectorientation"))) + (inputs (list ghc-hslua-core ghc-hslua-marshalling)) + (native-inputs (list ghc-lua-arbitrary + ghc-quickcheck + ghc-quickcheck-instances + ghc-tasty + ghc-tasty-hslua + ghc-tasty-hunit + ghc-tasty-quickcheck)) + (home-page "https://hslua.org/") + (synopsis "Object orientation tools for HsLua") + (description + "Expose Haskell objects to Lua with an object oriented interface.") + (license license:expat))) + +(define-public ghc-hslua-packaging + (package + (name "ghc-hslua-packaging") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-packaging" version)) + (sha256 + (base32 + "1yxfrsxmmsb96lyfihlk9ks53l2z2aln3whfqaha7grs3gx1yaib")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-packaging"))) + (inputs (list ghc-hslua-core ghc-hslua-marshalling + ghc-hslua-objectorientation)) + (native-inputs (list ghc-tasty-hslua ghc-tasty ghc-tasty-hunit)) + (home-page "https://hslua.org/") + (synopsis "Utilities to build Lua modules.") + (description + "Utilities to package up Haskell functions and values into a Lua module. . This +package is part of HsLua, a Haskell framework built around the embeddable +scripting language .") + (license license:expat))) + +(define-public ghc-hslua-module-version + (package + (name "ghc-hslua-module-version") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-version" version)) + (sha256 + (base32 + "1v24lbbagvaz0hacq4525snp6smz8yc5ifrxg89z1y5bbn7v46f5")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-module-version"))) + (inputs (list ghc-hslua-core ghc-hslua-marshalling ghc-hslua-packaging)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) + (home-page "https://hslua.org/") + (synopsis "Lua module to work with version specifiers.") + (description "Wrapper for the Data.Version.Version Haskell type.") + (license license:expat))) + +(define-public ghc-recv + (package + (name "ghc-recv") + (version "0.0.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "recv" version)) + (sha256 + (base32 + "1yz9b95m9yxcwbbwdvp288y47ycn4yq9g7ixlw0sf98h5rjp4s2w")))) + (build-system haskell-build-system) + (properties '((upstream-name . "recv"))) + (inputs (list ghc-network)) + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "http://github.com/yesodweb/wai") + (synopsis "Efficient netowrk recv") + (description "Network recv based on buffer pools") + (license license:bsd-3))) + +(define-public ghc-glib + (package + (name "ghc-glib") + (version "0.13.8.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "glib" version)) + (sha256 + (base32 + "09qamkxkpx2paazbh8x225wvwgzgpp0g0a3s708n96q76b4bvd46")))) + (build-system haskell-build-system) + (properties '((upstream-name . "glib"))) + (inputs (list ghc-utf8-string glib)) + (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) + (home-page "https://github.com/gtk2hs/gtk2hs") + (synopsis "GLib bindings for for Gtk2Hs") + (description + "GLib is a collection of C data structures and utility functions for the GObject +system, main loop implementation, for strings and common data structures dealing +with Unicode. This package only binds as much functionality as required to +support the packages that wrap libraries that are themselves based on GLib.") + (license license:lgpl2.1))) + +(define-public ghc-pango + (package + (name "ghc-pango") + (version "0.13.8.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "pango" version)) + (sha256 + (base32 + "1mndcb904vlkqpbmj5np9lxqw2qw3pzawvrgbsbxa9xjayh0ylw5")))) + (build-system haskell-build-system) + (properties '((upstream-name . "pango"))) + (inputs (list ghc-glib ghc-cairo pango)) + (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) + (home-page "https://hackage.haskell.org/package/pango") + (synopsis "Haskell bindings to the Pango text rendering engine") + (description + "This package provides a wrapper around the Pango C library that allows +high-quality rendering of Unicode text. It can be used either with Cairo to +output text in PDF, PS or other documents or with Gtk+ to display text +on-screen.") + (license license:lgpl2.1))) + +(define-public ghc-monoidal-containers + (package + (name "ghc-monoidal-containers") + (version "0.6.3.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "monoidal-containers" version)) + (sha256 + (base32 + "0m41z50r3jvr8vvfry99kamb2h3knm0g7bqfwspchmhwsgqqczh4")))) + (build-system haskell-build-system) + (properties '((upstream-name . "monoidal-containers"))) + (inputs (list ghc-aeson + ghc-hashable + ghc-lens + ghc-newtype + ghc-unordered-containers + ghc-witherable + ghc-semialign + ghc-these)) + (home-page "http://github.com/bgamari/monoidal-containers") + (synopsis "Containers with monoidal accumulation") + (description + "Containers with merging via monoidal accumulation. The Monoid instances +provided by the @code{containers} and @code{unordered-containers} packages merge +structures in a left-biased manner instead of using the underlying monoidal +structure of the value. This package wraps the types provided by these +packages, but provides @code{Monoid} instances implemented in terms of the value +type's mappend'.") + (license license:bsd-3))) + +(define-public ghc-newtype + (package + (name "ghc-newtype") + (version "0.2.2.0") + (source (origin + (method url-fetch) + (uri (hackage-uri "newtype" version)) + (sha256 + (base32 + "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s")))) + (build-system haskell-build-system) + (properties '((upstream-name . "newtype"))) + (arguments + `(#:cabal-revision ("3" + "0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx"))) + (home-page "http://hackage.haskell.org/package/newtype") + (synopsis "Typeclass and set of functions for working with newtypes") + (description + "Per Conor McBride, the Newtype typeclass represents the packing and unpacking of +a @code{newtype}, and allows you to operate under that @code{newtype} with functions +such as ala'.") + (license license:bsd-3))) + +(define-public ghc-hspec-hedgehog + (package + (name "ghc-hspec-hedgehog") + (version "0.0.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "hspec-hedgehog" version)) + (sha256 + (base32 + "17gbr4ssnzjk7nvpsnh47av6vd9wz27ax92xvr4jwyw0z7h2wn13")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hspec-hedgehog"))) + (inputs (list ghc-hspec + ghc-hspec-core + ghc-hedgehog + ghc-hunit + ghc-quickcheck + ghc-splitmix)) + (arguments + `(#:cabal-revision ("1" + "1qv2gap0775d2zg8wbd3kq4ypziz05qlz5jfisvl3jfd6jzcf2ad"))) + (home-page "https://github.com/parsonsmatt/hspec-hedgehog#readme") + (synopsis "Integrate Hedgehog and Hspec") + (description "An integration library for hspec and hedgehog.") + (license license:bsd-3))) + +(define-public ghc-validation-selective + (package + (name "ghc-validation-selective") + (version "0.1.0.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "validation-selective" version)) + (sha256 + (base32 + "1gsvcm8gjp8kdfprd1i4h9si8f2ym1gj3hqfwz7x1ylsa8qxwvq1")))) + (build-system haskell-build-system) + (properties '((upstream-name . "validation-selective"))) + (inputs (list ghc-selective)) + (native-inputs (list ghc-hedgehog ghc-hspec ghc-hspec-hedgehog ghc-doctest)) + (home-page "https://github.com/kowainik/validation-selective") + (synopsis + "Data validation based on Applicative and Selective functors") + (description + "Lighweight pure data validation based on Applicative and Selective functors.") + (license license:mpl2.0))) + +(define-public ghc-tomland + (package + (name "ghc-tomland") + (version "1.3.3.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "tomland" version)) + (sha256 + (base32 + "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm")))) + (build-system haskell-build-system) + (properties '((upstream-name . "tomland"))) + (inputs (list ghc-hashable ghc-megaparsec ghc-parser-combinators + ghc-unordered-containers ghc-validation-selective)) + (native-inputs (list ghc-hedgehog ghc-hspec ghc-hspec-hedgehog + ghc-hspec-megaparsec)) + (home-page "https://github.com/kowainik/tomland") + (synopsis "Bidirectional TOML serialization") + (description + "Implementation of bidirectional TOML serialization.") + (license license:mpl2.0))) + +(define-public ghc-hslua-module-doclayout + (package + (name "ghc-hslua-module-doclayout") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-doclayout" version)) + (sha256 + (base32 + "14sqffgcrhhrv7k4j8b1l41mn5gqlp8yzggd727746kjl0n56hqq")))) + (build-system haskell-build-system) + (properties '((upstream-name . "hslua-module-doclayout"))) + (inputs (list ghc-doclayout ghc-hslua)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-tasty-lua)) + (home-page "https://github.com/hslua/hslua-module-doclayout") + (synopsis "Lua module wrapping Text.DocLayout") + (description "Lua module wrapping @code{Text.DocLayout}.") + (license license:expat))) + +(define-public ghc-random-shuffle + (package + (name "ghc-random-shuffle") + (version "0.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "random-shuffle" version)) + (sha256 + (base32 + "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j")))) + (build-system haskell-build-system) + (properties '((upstream-name . "random-shuffle"))) + (inputs (list ghc-random ghc-monadrandom)) + (home-page "http://hackage.haskell.org/package/random-shuffle") + (synopsis "Random shuffle implementation") + (description + "Random shuffle implementation, on immutable lists. Based on +@url{http://okmij.org/ftp/Haskell/perfect-shuffle.txt, perfect shuffle +implementation by Oleg Kiselyov}.") + (license license:bsd-3))) + +(define-public ghc-deriving-aeson + (package + (name "ghc-deriving-aeson") + (version "0.2.8") + (source (origin + (method url-fetch) + (uri (hackage-uri "deriving-aeson" version)) + (sha256 + (base32 + "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd")))) + (build-system haskell-build-system) + (properties '((upstream-name . "deriving-aeson"))) + (inputs (list ghc-aeson)) + (arguments + `(#:cabal-revision ("1" + "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"))) + (home-page "http://hackage.haskell.org/package/deriving-aeson") + (synopsis "Type driven generic aeson instance customisation") + (description + "This package provides a newtype wrapper with FromJSON/ToJSON instances +customisable via a phantom type parameter. The instances can be rendered to the +original type using DerivingVia.") + (license license:bsd-3))) + +(define-public ghc-leancheck + (package + (name "ghc-leancheck") + (version "0.9.12") + (source (origin + (method url-fetch) + (uri (hackage-uri "leancheck" version)) + (sha256 + (base32 + "15wpklkbr03dciai4mk8bm1yk9svxxmbsl22wsvwk3ns7aiamrkj")))) + (build-system haskell-build-system) + (properties '((upstream-name . "leancheck"))) + (home-page "https://github.com/rudymatela/leancheck#readme") + (synopsis "Enumerative property-based testing") + (description + "LeanCheck is a simple enumerative property-based testing library. Properties +are defined as Haskell functions returning a boolean value which should be true +for all possible choices of argument values. LeanCheck applies enumerated +argument values to these properties in search for a counterexample. Properties +can be viewed as parameterized unit tests. LeanCheck works by producing tiers +of test values: a possibly infinite list of finite sublists of +same-and-increasingly-sized values.") + (license license:bsd-3))) + +(define-public ghc-test-framework-leancheck + (package + (name "ghc-test-framework-leancheck") + (version "0.0.4") + (source (origin + (method url-fetch) + (uri (hackage-uri "test-framework-leancheck" version)) + (sha256 + (base32 + "0aa21r999jj59plzkn1px02k3a87znwhagdjmdsik2xvy5wrzgzv")))) + (build-system haskell-build-system) + (properties '((upstream-name . "test-framework-leancheck"))) + (inputs (list ghc-test-framework ghc-leancheck)) + (home-page "https://github.com/rudymatela/test-framework-leancheck#readme") + (synopsis "LeanCheck support for test-framework") + (description + "LeanCheck support for @code{test-framework}. This package can be used +to incorporate LeanCheck tests into test-framework test suites.") + (license license:bsd-3))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; + diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 8f08ed3a3e..5e4979edc3 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -99,7 +99,7 @@ (add-before 'configure 'update-constraints (lambda _ (substitute* "idris.cabal" - (("(aeson|ansi-terminal|haskeline|megaparsec|optparse-applicative)\\s+[^,]+" all dep) + (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[^,]+" all dep) dep)))) (add-before 'configure 'set-cc-command (lambda _ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 22284de7a2..c802a401b9 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1262,71 +1262,74 @@ assembler, PEG) is less than 1MB.") (license license:expat))) (define-public carp - (package - (name "carp") - (version "0.5.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/carp-lang/Carp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14jdnv0ljqvpr9ych1plfw7hp5q57a8j1bv8h3v345x06z783d07")))) - (build-system haskell-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Carp looks inside the sources checkout to know where to - ;; find its core libraries and other files. - ;; Carp emits C code and tries to compile it with an external - ;; C compiler. On Linux it defaults to Clang. - (add-after 'install 'wrap-programs - (lambda* (#:key inputs #:allow-other-keys) - (define (wrap-carp-program program) - (wrap-program (string-append - #$output "/bin/" program) - `("CARP_DIR" prefix - (#$(package-source this-package))) - `("PATH" prefix - ,(list (dirname - (search-input-file inputs "bin/clang")) - (dirname - (search-input-file inputs "bin/ld")))) - `("C_INCLUDE_PATH" prefix - ,(list (dirname - (search-input-directory - inputs "include/linux")) - (dirname - (search-input-file - inputs "include/stdlib.h")))))) - - (for-each wrap-carp-program - (list "carp" - "carp-header-parse"))))))) - (inputs - (list bash-minimal - clang - ghc-blaze-markup - ghc-blaze-html - ghc-split - ghc-ansi-terminal - ghc-cmark - ghc-edit-distance - ghc-hashable - ghc-open-browser - ghc-optparse-applicative)) - (native-inputs - (list ghc-hunit)) - (home-page "https://carp-lang.org/") - (synopsis "Statically typed Lisp without a garbage collector") - (description - "@code{carp} is a Lisp-like programming language that compiles to + ;; Release 0.5.5 does not support GHC 9.2. + (let ((commit "339722325ec607091f6035866ebedea2b69080fe") + (revision "1")) + (package + (name "carp") + (version (git-version "0.5.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carp-lang/Carp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0w0j3imi4270dsmrh96spsc9xllsk5rrh817l80q1nyay9p53xwd")))) + (build-system haskell-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; Carp looks inside the sources checkout to know where to + ;; find its core libraries and other files. + ;; Carp emits C code and tries to compile it with an external + ;; C compiler. On Linux it defaults to Clang. + (add-after 'install 'wrap-programs + (lambda* (#:key inputs #:allow-other-keys) + (define (wrap-carp-program program) + (wrap-program (string-append + #$output "/bin/" program) + `("CARP_DIR" prefix + (#$(package-source this-package))) + `("PATH" prefix + ,(list (dirname + (search-input-file inputs "bin/clang")) + (dirname + (search-input-file inputs "bin/ld")))) + `("C_INCLUDE_PATH" prefix + ,(list (dirname + (search-input-directory + inputs "include/linux")) + (dirname + (search-input-file + inputs "include/stdlib.h")))))) + + (for-each wrap-carp-program + (list "carp" + "carp-header-parse"))))))) + (inputs + (list bash-minimal + clang + ghc-blaze-markup + ghc-blaze-html + ghc-split + ghc-ansi-terminal + ghc-cmark + ghc-edit-distance + ghc-hashable + ghc-open-browser + ghc-optparse-applicative)) + (native-inputs + (list ghc-hunit)) + (home-page "https://carp-lang.org/") + (synopsis "Statically typed Lisp without a garbage collector") + (description + "@code{carp} is a Lisp-like programming language that compiles to C. It features inferred static typing, macros, automatic memory management without a garbage collector, a REPL, and straightforward integration with code written in C.") - (license license:asl2.0))) + (license license:asl2.0)))) (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") diff --git a/gnu/packages/patches/cabal-install-base16-bytestring1.0.patch b/gnu/packages/patches/cabal-install-base16-bytestring1.0.patch deleted file mode 100644 index 998bf08718..0000000000 --- a/gnu/packages/patches/cabal-install-base16-bytestring1.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -Restore compatibility with newer version of base16-bytestring. - -Taken from https://raw.githubusercontent.com/archlinux/svntogit-community/packages/trunk/cabal-install-base16-bytestring1.0.patch - -diff --git a/Distribution/Client/HashValue.hs b/Distribution/Client/HashValue.hs -index 54b8aee9e..11e647c1c 100644 ---- a/Distribution/Client/HashValue.hs -+++ b/Distribution/Client/HashValue.hs -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - {-# LANGUAGE DeriveDataTypeable #-} - {-# LANGUAGE DeriveGeneric #-} - module Distribution.Client.HashValue ( -@@ -72,10 +73,14 @@ hashFromTUF (Sec.Hash hashstr) = - --TODO: [code cleanup] either we should get TUF to use raw bytestrings or - -- perhaps we should also just use a base16 string as the internal rep. - case Base16.decode (BS.pack hashstr) of -+#if MIN_VERSION_base16_bytestring(1,0,0) -+ Right hash -> HashValue hash -+ Left _ -> error "hashFromTUF: cannot decode base16" -+#else - (hash, trailing) | not (BS.null hash) && BS.null trailing - -> HashValue hash - _ -> error "hashFromTUF: cannot decode base16 hash" -- -+#endif - - -- | Truncate a 32 byte SHA256 hash to - -- diff --git a/gnu/packages/patches/cabal-install-ghc8.10.patch b/gnu/packages/patches/cabal-install-ghc8.10.patch deleted file mode 100644 index 67c0953058..0000000000 --- a/gnu/packages/patches/cabal-install-ghc8.10.patch +++ /dev/null @@ -1,393 +0,0 @@ -From ac9b41eef3c781ce188ded2551f98fe75152e30c Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus -Date: Tue, 14 Apr 2020 11:31:34 +0300 -Subject: [PATCH] GHC-8.10 support for 3.2 - -Includes cherry-picked commits: - -- Test cabal-install with GHC-8.10 #6709 -- Add GHC-8.10.1 job. Only tests Cabal-the-lib part atm. #6617 - -Also add topHandler' signature. ---- - .docker/validate-8.10.1.dockerfile | 60 ++++++ - .github/workflows/artifacts.yml | 6 +- - .github/workflows/bootstrap.yml | 4 +- - .github/workflows/linux.yml | 179 ++++++++++++------ - .github/workflows/macos.yml | 40 ++-- - .github/workflows/quick-jobs.yml | 4 +- - .github/workflows/windows.yml | 117 +++++++++++- - .../Distribution/PackageDescription/Quirks.hs | 19 +- - Makefile | 4 + - boot/ci-artifacts.template.yml | 6 +- - boot/ci-bootstrap.template.yml | 4 +- - boot/ci-linux.template.yml | 8 +- - boot/ci-macos.template.yml | 7 +- - boot/ci-quick-jobs.template.yml | 4 +- - boot/ci-windows.template.yml | 8 +- - cabal-dev-scripts/src/GenValidate.hs | 33 ++-- - Distribution/Client/CmdSdist.hs | 3 + - .../Distribution/Client/FetchUtils.hs | 4 +- - .../Distribution/Client/IndexUtils.hs | 2 +- - Distribution/Client/Sandbox.hs | 5 +- - .../Distribution/Client/TargetSelector.hs | 2 +- - Distribution/Client/Update.hs | 4 +- - .../Distribution/Client/Utils/Json.hs | 13 +- - .../Distribution/Solver/Modular/Assignment.hs | 11 +- - .../Distribution/Solver/Modular/Builder.hs | 10 +- - .../Distribution/Solver/Modular/Index.hs | 6 +- - .../Solver/Modular/IndexConversion.hs | 8 +- - .../Distribution/Solver/Modular/Solver.hs | 12 +- - .../Distribution/Solver/Modular/Validate.hs | 5 +- - bootstrap.sh | 6 +- - cabal-install.cabal | 4 +- - cabal-install.cabal.pp | 4 +- - .../targets/complex/q/q.cabal | 3 +- - cabal-testsuite/cabal-testsuite.cabal | 4 +- - validate.sh | 21 +- - 35 files changed, 461 insertions(+), 169 deletions(-) - create mode 100644 .docker/validate-8.10.1.dockerfile -diff --git a/Distribution/Client/CmdSdist.hs b/Distribution/Client/CmdSdist.hs -index 9ce0c80100e..a22317004c4 100644 ---- a/Distribution/Client/CmdSdist.hs -+++ b/Distribution/Client/CmdSdist.hs -@@ -237,7 +237,10 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do - (norm NoExec -> nonexec, norm Exec -> exec) <- - listPackageSources verbosity (flattenPackageDescription $ packageDescription pkg) knownSuffixHandlers - -+ print $ map snd exec -+ print $ map snd nonexec - let files = nub . sortOn snd $ nonexec ++ exec -+ print files - - case format of - SourceList nulSep -> do -diff --git a/Distribution/Client/FetchUtils.hs b/Distribution/Client/FetchUtils.hs -index e9a31a91f84..4e5e581f9ec 100644 ---- a/Distribution/Client/FetchUtils.hs -+++ b/Distribution/Client/FetchUtils.hs -@@ -176,8 +176,8 @@ fetchRepoTarball verbosity' repoCtxt repo pkgid = do - verbosity = verboseUnmarkOutput verbosity' - - downloadRepoPackage = case repo of -- RepoLocal{..} -> return (packageFile repo pkgid) -- RepoLocalNoIndex{..} -> return (packageFile repo pkgid) -+ RepoLocal{} -> return (packageFile repo pkgid) -+ RepoLocalNoIndex{} -> return (packageFile repo pkgid) - - RepoRemote{..} -> do - transport <- repoContextGetTransport repoCtxt -diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs -index a76becc05ba..bf0ff7cf5ba 100644 ---- a/Distribution/Client/IndexUtils.hs -+++ b/Distribution/Client/IndexUtils.hs -@@ -634,7 +634,7 @@ withIndexEntries - -> ([IndexCacheEntry] -> IO a) - -> ([NoIndexCacheEntry] -> IO a) - -> IO a --withIndexEntries _ (RepoIndex repoCtxt repo@RepoSecure{..}) callback _ = -+withIndexEntries _ (RepoIndex repoCtxt repo@RepoSecure{}) callback _ = - repoContextWithSecureRepo repoCtxt repo $ \repoSecure -> - Sec.withIndex repoSecure $ \Sec.IndexCallbacks{..} -> do - -- Incrementally (lazily) read all the entries in the tar file in order, -diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs -index 66b415d7239..14bad3f2135 100644 ---- a/Distribution/Client/Sandbox.hs -+++ b/Distribution/Client/Sandbox.hs -@@ -666,7 +666,7 @@ reinstallAddSourceDeps :: Verbosity - -> FilePath - -> IO WereDepsReinstalled - reinstallAddSourceDeps verbosity configFlags' configExFlags -- installFlags globalFlags sandboxDir = topHandler' $ do -+ installFlags globalFlags sandboxDir = topHandlerWith errorMsg $ do - let sandboxDistPref = sandboxBuildDir sandboxDir - configFlags = configFlags' - { configDistPref = Flag sandboxDistPref } -@@ -710,7 +710,8 @@ reinstallAddSourceDeps verbosity configFlags' configExFlags - ++ "offending packages or recreating the sandbox." - logMsg message rest = debugNoWrap verbosity message >> rest - -- topHandler' = topHandlerWith $ \_ -> do -+ errorMsg :: a -> IO WereDepsReinstalled -+ errorMsg _ = do - warn verbosity "Couldn't reinstall some add-source dependencies." - -- Here we can't know whether any deps have been reinstalled, so we have - -- to be conservative. -diff --git a/Distribution/Client/TargetSelector.hs b/Distribution/Client/TargetSelector.hs -index 23d92f580fd..f8f683d9875 100644 ---- a/Distribution/Client/TargetSelector.hs -+++ b/Distribution/Client/TargetSelector.hs -@@ -222,7 +222,7 @@ readTargetSelectorsWith :: (Applicative m, Monad m) => DirActions m - -> Maybe ComponentKindFilter - -> [String] - -> m (Either [TargetSelectorProblem] [TargetSelector]) --readTargetSelectorsWith dirActions@DirActions{..} pkgs mfilter targetStrs = -+readTargetSelectorsWith dirActions@DirActions{} pkgs mfilter targetStrs = - case parseTargetStrings targetStrs of - ([], usertargets) -> do - usertargets' <- mapM (getTargetStringFileStatus dirActions) usertargets -diff --git a/Distribution/Client/Update.hs b/Distribution/Client/Update.hs -index 52bb1f76c96..8ded78b9d2e 100644 ---- a/Distribution/Client/Update.hs -+++ b/Distribution/Client/Update.hs -@@ -73,8 +73,8 @@ updateRepo :: Verbosity -> UpdateFlags -> RepoContext -> Repo -> IO () - updateRepo verbosity updateFlags repoCtxt repo = do - transport <- repoContextGetTransport repoCtxt - case repo of -- RepoLocal{..} -> return () -- RepoLocalNoIndex{..} -> return () -+ RepoLocal{} -> return () -+ RepoLocalNoIndex{} -> return () - RepoRemote{..} -> do - downloadResult <- downloadIndex transport verbosity repoRemote repoLocalDir - case downloadResult of -diff --git a/Distribution/Client/Utils/Json.hs b/Distribution/Client/Utils/Json.hs -index 89a13af87a4..01d5753136b 100644 ---- a/Distribution/Client/Utils/Json.hs -+++ b/Distribution/Client/Utils/Json.hs -@@ -15,12 +15,9 @@ module Distribution.Client.Utils.Json - ) - where - --import Data.Char --import Data.Int --import Data.String --import Data.Word --import Data.List --import Data.Monoid -+import Distribution.Client.Compat.Prelude -+ -+import Data.Char (intToDigit) - - import Data.ByteString.Builder (Builder) - import qualified Data.ByteString.Builder as BB -@@ -135,13 +132,13 @@ encodeArrayBB :: [Value] -> Builder - encodeArrayBB [] = "[]" - encodeArrayBB jvs = BB.char8 '[' <> go jvs <> BB.char8 ']' - where -- go = Data.Monoid.mconcat . intersperse (BB.char8 ',') . map encodeValueBB -+ go = mconcat . intersperse (BB.char8 ',') . map encodeValueBB - - encodeObjectBB :: Object -> Builder - encodeObjectBB [] = "{}" - encodeObjectBB jvs = BB.char8 '{' <> go jvs <> BB.char8 '}' - where -- go = Data.Monoid.mconcat . intersperse (BB.char8 ',') . map encPair -+ go = mconcat . intersperse (BB.char8 ',') . map encPair - encPair (l,x) = encodeStringBB l <> BB.char8 ':' <> encodeValueBB x - - encodeStringBB :: String -> Builder -diff --git a/Distribution/Solver/Modular/Assignment.hs b/Distribution/Solver/Modular/Assignment.hs -index be5e63bfbc1..b05a099ec5a 100644 ---- a/Distribution/Solver/Modular/Assignment.hs -+++ b/Distribution/Solver/Modular/Assignment.hs -@@ -9,10 +9,11 @@ module Distribution.Solver.Modular.Assignment - import Prelude () - import Distribution.Solver.Compat.Prelude hiding (pi) - --import Data.Array as A --import Data.List as L --import Data.Map as M --import Data.Maybe -+import qualified Data.Array as A -+import qualified Data.List as L -+import qualified Data.Map as M -+ -+import Data.Maybe (fromJust) - - import Distribution.PackageDescription (FlagAssignment, mkFlagAssignment) -- from Cabal - -@@ -79,7 +80,7 @@ toCPs (A pa fa sa) rdm = - -- Dependencies per package. - depp :: QPN -> [(Component, PI QPN)] - depp qpn = let v :: Vertex -- v = fromJust (cvm qpn) -+ v = fromJust (cvm qpn) -- TODO: why this is safe? - dvs :: [(Component, Vertex)] - dvs = tg A.! v - in L.map (\ (comp, dv) -> case vm dv of (_, x, _) -> (comp, PI x (pa M.! x))) dvs -diff --git a/Distribution/Solver/Modular/Builder.hs b/Distribution/Solver/Modular/Builder.hs -index eb11a36aa16..5d196f4fd9f 100644 ---- a/Distribution/Solver/Modular/Builder.hs -+++ b/Distribution/Solver/Modular/Builder.hs -@@ -19,10 +19,10 @@ module Distribution.Solver.Modular.Builder ( - -- flag-guarded dependencies, we cannot introduce them immediately. Instead, we - -- store the entire dependency. - --import Data.List as L --import Data.Map as M --import Data.Set as S --import Prelude hiding (sequence, mapM) -+import qualified Data.List as L -+import qualified Data.Map as M -+import qualified Data.Set as S -+import Prelude - - import qualified Distribution.Solver.Modular.ConflictSet as CS - import Distribution.Solver.Modular.Dependency -@@ -55,7 +55,7 @@ data BuildState = BS { - } - - -- | Map of available linking targets. --type LinkingState = Map (PN, I) [PackagePath] -+type LinkingState = M.Map (PN, I) [PackagePath] - - -- | Extend the set of open goals with the new goals listed. - -- -diff --git a/Distribution/Solver/Modular/Index.hs b/Distribution/Solver/Modular/Index.hs -index fdddfc8237a..ac60fec7d65 100644 ---- a/Distribution/Solver/Modular/Index.hs -+++ b/Distribution/Solver/Modular/Index.hs -@@ -6,10 +6,12 @@ module Distribution.Solver.Modular.Index - , mkIndex - ) where - --import Data.List as L --import Data.Map as M - import Prelude hiding (pi) - -+import Data.Map (Map) -+import qualified Data.List as L -+import qualified Data.Map as M -+ - import Distribution.Solver.Modular.Dependency - import Distribution.Solver.Modular.Flag - import Distribution.Solver.Modular.Package -diff --git a/Distribution/Solver/Modular/IndexConversion.hs b/Distribution/Solver/Modular/IndexConversion.hs -index c9565c80dba..8e9ef614184 100644 ---- a/Distribution/Solver/Modular/IndexConversion.hs -+++ b/Distribution/Solver/Modular/IndexConversion.hs -@@ -2,12 +2,12 @@ module Distribution.Solver.Modular.IndexConversion - ( convPIs - ) where - --import Data.List as L -+import qualified Data.List as L - import Data.Map.Strict (Map) - import qualified Data.Map.Strict as M --import Data.Maybe -+import Data.Maybe (mapMaybe, fromMaybe, maybeToList) - import Data.Monoid as Mon --import Data.Set as S -+import qualified Data.Set as S - - import Distribution.Compiler - import Distribution.InstalledPackageInfo as IPI -@@ -330,7 +330,7 @@ flagInfo (StrongFlags strfl) = - - -- | Internal package names, which should not be interpreted as true - -- dependencies. --type IPNs = Set PN -+type IPNs = S.Set PN - - -- | Convenience function to delete a 'Dependency' if it's - -- for a 'PN' that isn't actually real. -diff --git a/Distribution/Solver/Modular/Solver.hs b/Distribution/Solver/Modular/Solver.hs -index 32452550556..e6aa1fb4374 100644 ---- a/Distribution/Solver/Modular/Solver.hs -+++ b/Distribution/Solver/Modular/Solver.hs -@@ -9,9 +9,9 @@ module Distribution.Solver.Modular.Solver - , PruneAfterFirstSuccess(..) - ) where - --import Data.Map as M --import Data.List as L --import Data.Set as S -+import qualified Data.Map as M -+import qualified Data.List as L -+import qualified Data.Set as S - import Distribution.Verbosity - - import Distribution.Compiler (CompilerInfo) -@@ -91,8 +91,8 @@ solve :: SolverConfig -- ^ solver parameters - -> Index -- ^ all available packages as an index - -> PkgConfigDb -- ^ available pkg-config pkgs - -> (PN -> PackagePreferences) -- ^ preferences -- -> Map PN [LabeledPackageConstraint] -- ^ global constraints -- -> Set PN -- ^ global goals -+ -> M.Map PN [LabeledPackageConstraint] -- ^ global constraints -+ -> S.Set PN -- ^ global goals - -> RetryLog Message SolverFailure (Assignment, RevDepMap) - solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals = - explorePhase $ -@@ -232,7 +232,7 @@ instance GSimpleTree (Tree d c) where - - -- Show conflict set - goCS :: ConflictSet -> String -- goCS cs = "{" ++ (intercalate "," . L.map showVar . CS.toList $ cs) ++ "}" -+ goCS cs = "{" ++ (L.intercalate "," . L.map showVar . CS.toList $ cs) ++ "}" - #endif - - -- | Replace all goal reasons with a dummy goal reason in the tree -diff --git a/Distribution/Solver/Modular/Validate.hs b/Distribution/Solver/Modular/Validate.hs -index 6195d101b02..a3dec6e1f67 100644 ---- a/Distribution/Solver/Modular/Validate.hs -+++ b/Distribution/Solver/Modular/Validate.hs -@@ -15,11 +15,12 @@ module Distribution.Solver.Modular.Validate (validateTree) where - import Control.Applicative - import Control.Monad.Reader hiding (sequence) - import Data.Function (on) --import Data.List as L --import Data.Set as S - import Data.Traversable - import Prelude hiding (sequence) - -+import qualified Data.List as L -+import qualified Data.Set as S -+ - import Language.Haskell.Extension (Extension, Language) - - import Data.Map.Strict as M -diff --git a/bootstrap.sh b/bootstrap.sh -index 077d7f4efd2..d5141660474 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -260,9 +260,9 @@ EDIT_DISTANCE_VER="0.2.2.1"; EDIT_DISTANCE_VER_REGEXP="0\.2\.2\.?" - # 0.2.2.* - ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?" - # 0.0.* --HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\." -- # >= 0.7.0.0 && < 0.7 --TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?" -+HACKAGE_SECURITY_VER="0.6.0.1"; HACKAGE_SECURITY_VER_REGEXP="0\.6\." -+ # >= 0.6.0.0 && < 0.7 -+TAR_VER="0.5.1.1"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?" - # >= 0.5.0.3 && < 0.6 - DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)" - # >= 0.0.1.2 && < 0.1 -diff --git a/cabal-install.cabal b/cabal-install.cabal -index 985ea9a5a69..c9d713c29fe 100644 ---- a/cabal-install.cabal -+++ b/cabal-install.cabal -@@ -316,7 +316,7 @@ executable cabal - build-depends: - async >= 2.0 && < 2.3, - array >= 0.4 && < 0.6, -- base >= 4.8 && < 4.14, -+ base >= 4.8 && < 4.15, - base16-bytestring >= 0.1.1 && < 0.2, - binary >= 0.7.3 && < 0.9, - bytestring >= 0.10.6.0 && < 0.11, -@@ -341,7 +341,7 @@ executable cabal - time >= 1.5.0.1 && < 1.10, - transformers >= 0.4.2.0 && < 0.6, - zlib >= 0.5.3 && < 0.7, -- hackage-security >= 0.6.0.0 && < 0.7, -+ hackage-security >= 0.6.0.1 && < 0.7, - text >= 1.2.3 && < 1.3, - parsec >= 3.1.13.0 && < 3.2 - -diff --git a/tests/IntegrationTests2/targets/complex/q/q.cabal b/tests/IntegrationTests2/targets/complex/q/q.cabal -index 556fa4a4202..7ee22fcb28d 100644 ---- a/tests/IntegrationTests2/targets/complex/q/q.cabal -+++ b/tests/IntegrationTests2/targets/complex/q/q.cabal -@@ -5,7 +5,8 @@ cabal-version: >= 1.2 - - library - exposed-modules: Q -- build-depends: base, filepath -+ -- we rely that filepath has filepath-tests component -+ build-depends: base, filepath >=1.4.0.0 - - executable buildable-false - main-is: Main.hs diff --git a/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch b/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch new file mode 100644 index 0000000000..97caf2cc9b --- /dev/null +++ b/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch @@ -0,0 +1,303 @@ +Taken from https://github.com/bos/bloomfilter/pull/20 + +From fb79b39c44404fd791a3bed973e9d844fb084f1e Mon Sep 17 00:00:00 2001 +From: Simon Jakobi +Date: Fri, 12 Nov 2021 01:37:36 +0100 +Subject: [PATCH] Fix build with GHC 9.2 + +The `FastShift.shift{L,R}` methods are replaced with `unsafeShift{L,R}` +introduced in base-4.5. + +Fixes #19. +--- + Data/BloomFilter.hs | 16 +++++------ + Data/BloomFilter/Hash.hs | 15 +++++----- + Data/BloomFilter/Mutable.hs | 20 +++++++------- + Data/BloomFilter/Util.hs | 55 ++++++------------------------------- + bloomfilter.cabal | 2 +- + 5 files changed, 34 insertions(+), 74 deletions(-) + +diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs +index 2210cef..6b47c21 100644 +--- a/Data/BloomFilter.hs ++++ b/Data/BloomFilter.hs +@@ -78,8 +78,8 @@ import Control.DeepSeq (NFData(..)) + import Data.Array.Base (unsafeAt) + import qualified Data.Array.Base as ST + import Data.Array.Unboxed (UArray) +-import Data.Bits ((.&.)) +-import Data.BloomFilter.Util (FastShift(..), (:*)(..)) ++import Data.Bits ((.&.), unsafeShiftL, unsafeShiftR) ++import Data.BloomFilter.Util ((:*)(..)) + import qualified Data.BloomFilter.Mutable as MB + import qualified Data.BloomFilter.Mutable.Internal as MB + import Data.BloomFilter.Mutable.Internal (Hash, MBloom) +@@ -98,7 +98,7 @@ data Bloom a = B { + } + + instance Show (Bloom a) where +- show ub = "Bloom { " ++ show ((1::Int) `shiftL` shift ub) ++ " bits } " ++ show ub = "Bloom { " ++ show ((1::Int) `unsafeShiftL` shift ub) ++ " bits } " + + instance NFData (Bloom a) where + rnf !_ = () +@@ -172,7 +172,7 @@ singleton hash numBits elt = create hash numBits (\mb -> MB.insert mb elt) + -- | Given a filter's mask and a hash value, compute an offset into + -- a word array and a bit offset within that word. + hashIdx :: Int -> Word32 -> (Int :* Int) +-hashIdx mask x = (y `shiftR` logBitsInHash) :* (y .&. hashMask) ++hashIdx mask x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask) + where hashMask = 31 -- bitsInHash - 1 + y = fromIntegral x .&. mask + +@@ -191,7 +191,7 @@ hashesU ub elt = hashIdx (mask ub) `map` hashes ub elt + -- /still/ some possibility that @True@ will be returned. + elem :: a -> Bloom a -> Bool + elem elt ub = all test (hashesU ub elt) +- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) /= 0 ++ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) /= 0 + + modify :: (forall s. (MBloom s a -> ST s z)) -- ^ mutation function (result is discarded) + -> Bloom a +@@ -255,11 +255,11 @@ insertList elts = modify $ \mb -> mapM_ (MB.insert mb) elts + -- is /still/ some possibility that @True@ will be returned. + notElem :: a -> Bloom a -> Bool + notElem elt ub = any test (hashesU ub elt) +- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) == 0 ++ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) == 0 + + -- | Return the size of an immutable Bloom filter, in bits. + length :: Bloom a -> Int +-length = shiftL 1 . shift ++length = unsafeShiftL 1 . shift + + -- | Build an immutable Bloom filter from a seed value. The seeding + -- function populates the filter as follows. +@@ -318,7 +318,7 @@ fromList hashes numBits = unfold hashes numBits convert + logPower2 :: Int -> Int + logPower2 k = go 0 k + where go j 1 = j +- go j n = go (j+1) (n `shiftR` 1) ++ go j n = go (j+1) (n `unsafeShiftR` 1) + + -- $overview + -- +diff --git a/Data/BloomFilter/Hash.hs b/Data/BloomFilter/Hash.hs +index 132a3a4..d071fd4 100644 +--- a/Data/BloomFilter/Hash.hs ++++ b/Data/BloomFilter/Hash.hs +@@ -38,8 +38,7 @@ module Data.BloomFilter.Hash + ) where + + import Control.Monad (foldM) +-import Data.Bits ((.&.), (.|.), xor) +-import Data.BloomFilter.Util (FastShift(..)) ++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR, xor) + import Data.List (unfoldr) + import Data.Int (Int8, Int16, Int32, Int64) + import Data.Word (Word8, Word16, Word32, Word64) +@@ -91,11 +90,11 @@ class Hashable a where + -> Word64 -- ^ salt + -> IO Word64 + hashIO64 v salt = do +- let s1 = fromIntegral (salt `shiftR` 32) .&. maxBound ++ let s1 = fromIntegral (salt `unsafeShiftR` 32) .&. maxBound + s2 = fromIntegral salt + h1 <- hashIO32 v s1 + h2 <- hashIO32 v s2 +- return $ (fromIntegral h1 `shiftL` 32) .|. fromIntegral h2 ++ return $ (fromIntegral h1 `unsafeShiftL` 32) .|. fromIntegral h2 + + -- | Compute a 32-bit hash. + hash32 :: Hashable a => a -> Word32 +@@ -149,8 +148,8 @@ cheapHashes :: Hashable a => Int -- ^ number of hashes to compute + cheapHashes k v = go 0 + where go i | i == j = [] + | otherwise = hash : go (i + 1) +- where !hash = h1 + (h2 `shiftR` i) +- h1 = fromIntegral (h `shiftR` 32) ++ where !hash = h1 + (h2 `unsafeShiftR` i) ++ h1 = fromIntegral (h `unsafeShiftR` 32) + h2 = fromIntegral h + h = hashSalt64 0x9150a946c4a8966e v + j = fromIntegral k +@@ -163,7 +162,7 @@ instance Hashable Integer where + (salt `xor` 0x3ece731e) + | otherwise = hashIO32 (unfoldr go k) salt + where go 0 = Nothing +- go i = Just (fromIntegral i :: Word32, i `shiftR` 32) ++ go i = Just (fromIntegral i :: Word32, i `unsafeShiftR` 32) + + instance Hashable Bool where + hashIO32 = hashOne32 +@@ -224,7 +223,7 @@ instance Hashable Word64 where + -- | A fast unchecked shift. Nasty, but otherwise GHC 6.8.2 does a + -- test and branch on every shift. + div4 :: CSize -> CSize +-div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `shiftR` 2) ++div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `unsafeShiftR` 2) + + alignedHash :: Ptr a -> CSize -> Word32 -> IO Word32 + alignedHash ptr bytes salt +diff --git a/Data/BloomFilter/Mutable.hs b/Data/BloomFilter/Mutable.hs +index edff1fc..0bb5cc9 100644 +--- a/Data/BloomFilter/Mutable.hs ++++ b/Data/BloomFilter/Mutable.hs +@@ -65,9 +65,9 @@ module Data.BloomFilter.Mutable + import Control.Monad (liftM, forM_) + import Control.Monad.ST (ST) + import Data.Array.Base (unsafeRead, unsafeWrite) +-import Data.Bits ((.&.), (.|.)) ++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR) + import Data.BloomFilter.Array (newArray) +-import Data.BloomFilter.Util (FastShift(..), (:*)(..), nextPowerOfTwo) ++import Data.BloomFilter.Util ((:*)(..), nextPowerOfTwo) + import Data.Word (Word32) + import Data.BloomFilter.Mutable.Internal + +@@ -86,9 +86,9 @@ new hash numBits = MB hash shft msk `liftM` newArray numElems numBytes + | numBits > maxHash = maxHash + | isPowerOfTwo numBits = numBits + | otherwise = nextPowerOfTwo numBits +- numElems = max 2 (twoBits `shiftR` logBitsInHash) +- numBytes = numElems `shiftL` logBytesInHash +- trueBits = numElems `shiftL` logBitsInHash ++ numElems = max 2 (twoBits `unsafeShiftR` logBitsInHash) ++ numBytes = numElems `unsafeShiftL` logBytesInHash ++ trueBits = numElems `unsafeShiftL` logBitsInHash + shft = logPower2 trueBits + msk = trueBits - 1 + isPowerOfTwo n = n .&. (n - 1) == 0 +@@ -109,7 +109,7 @@ logBytesInHash = 2 -- logPower2 (sizeOf (undefined :: Hash)) + -- | Given a filter's mask and a hash value, compute an offset into + -- a word array and a bit offset within that word. + hashIdx :: Int -> Word32 -> (Int :* Int) +-hashIdx msk x = (y `shiftR` logBitsInHash) :* (y .&. hashMask) ++hashIdx msk x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask) + where hashMask = 31 -- bitsInHash - 1 + y = fromIntegral x .&. msk + +@@ -125,7 +125,7 @@ insert mb elt = do + let mu = bitArray mb + forM_ (hashesM mb elt) $ \(word :* bit) -> do + old <- unsafeRead mu word +- unsafeWrite mu word (old .|. (1 `shiftL` bit)) ++ unsafeWrite mu word (old .|. (1 `unsafeShiftL` bit)) + + -- | Query a mutable Bloom filter for membership. If the value is + -- present, return @True@. If the value is not present, there is +@@ -135,7 +135,7 @@ elem elt mb = loop (hashesM mb elt) + where mu = bitArray mb + loop ((word :* bit):wbs) = do + i <- unsafeRead mu word +- if i .&. (1 `shiftL` bit) == 0 ++ if i .&. (1 `unsafeShiftL` bit) == 0 + then return False + else loop wbs + loop _ = return True +@@ -145,7 +145,7 @@ elem elt mb = loop (hashesM mb elt) + + -- | Return the size of a mutable Bloom filter, in bits. + length :: MBloom s a -> Int +-length = shiftL 1 . shift ++length = unsafeShiftL 1 . shift + + + -- | Slow, crummy way of computing the integer log of an integer known +@@ -153,7 +153,7 @@ length = shiftL 1 . shift + logPower2 :: Int -> Int + logPower2 k = go 0 k + where go j 1 = j +- go j n = go (j+1) (n `shiftR` 1) ++ go j n = go (j+1) (n `unsafeShiftR` 1) + + -- $overview + -- +diff --git a/Data/BloomFilter/Util.hs b/Data/BloomFilter/Util.hs +index 7f695dc..6ade6e5 100644 +--- a/Data/BloomFilter/Util.hs ++++ b/Data/BloomFilter/Util.hs +@@ -2,15 +2,11 @@ + + module Data.BloomFilter.Util + ( +- FastShift(..) +- , nextPowerOfTwo ++ nextPowerOfTwo + , (:*)(..) + ) where + +-import Data.Bits ((.|.)) +-import qualified Data.Bits as Bits +-import GHC.Base +-import GHC.Word ++import Data.Bits ((.|.), unsafeShiftR) + + -- | A strict pair type. + data a :* b = !a :* !b +@@ -22,46 +18,11 @@ nextPowerOfTwo :: Int -> Int + {-# INLINE nextPowerOfTwo #-} + nextPowerOfTwo n = + let a = n - 1 +- b = a .|. (a `shiftR` 1) +- c = b .|. (b `shiftR` 2) +- d = c .|. (c `shiftR` 4) +- e = d .|. (d `shiftR` 8) +- f = e .|. (e `shiftR` 16) +- g = f .|. (f `shiftR` 32) -- in case we're on a 64-bit host ++ b = a .|. (a `unsafeShiftR` 1) ++ c = b .|. (b `unsafeShiftR` 2) ++ d = c .|. (c `unsafeShiftR` 4) ++ e = d .|. (d `unsafeShiftR` 8) ++ f = e .|. (e `unsafeShiftR` 16) ++ g = f .|. (f `unsafeShiftR` 32) -- in case we're on a 64-bit host + !h = g + 1 + in h +- +--- | This is a workaround for poor optimisation in GHC 6.8.2. It +--- fails to notice constant-width shifts, and adds a test and branch +--- to every shift. This imposes about a 10% performance hit. +-class FastShift a where +- shiftL :: a -> Int -> a +- shiftR :: a -> Int -> a +- +-instance FastShift Word32 where +- {-# INLINE shiftL #-} +- shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftL#` i#) +- +- {-# INLINE shiftR #-} +- shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#) +- +-instance FastShift Word64 where +- {-# INLINE shiftL #-} +- shiftL (W64# x#) (I# i#) = W64# (x# `uncheckedShiftL64#` i#) +- +- {-# INLINE shiftR #-} +- shiftR (W64# x#) (I# i#) = W64# (x# `uncheckedShiftRL64#` i#) +- +-instance FastShift Int where +- {-# INLINE shiftL #-} +- shiftL (I# x#) (I# i#) = I# (x# `iShiftL#` i#) +- +- {-# INLINE shiftR #-} +- shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#) +- +-instance FastShift Integer where +- {-# INLINE shiftL #-} +- shiftL = Bits.shiftL +- +- {-# INLINE shiftR #-} +- shiftR = Bits.shiftR +diff --git a/bloomfilter.cabal b/bloomfilter.cabal +index 821a5d7..c621f7f 100644 +--- a/bloomfilter.cabal ++++ b/bloomfilter.cabal +@@ -18,7 +18,7 @@ extra-source-files: README.markdown cbits/lookup3.c cbits/lookup3.h + library + build-depends: + array, +- base >= 4.4 && < 5, ++ base >= 4.5 && < 5, + bytestring >= 0.9, + deepseq + exposed-modules: Data.BloomFilter diff --git a/gnu/packages/patches/ghc-bytestring-handle-ghc9.patch b/gnu/packages/patches/ghc-bytestring-handle-ghc9.patch new file mode 100644 index 0000000000..43dd472bf6 --- /dev/null +++ b/gnu/packages/patches/ghc-bytestring-handle-ghc9.patch @@ -0,0 +1,67 @@ +Taken from https://raw.githubusercontent.com/archlinux/svntogit-community/packages/haskell-bytestring-handle/trunk/ghc9.patch + +--- bytestring-handle-0.1.0.6/src/Data/ByteString/Handle/Write.hs.orig 2021-06-21 14:54:12.217134401 +0800 ++++ bytestring-handle-0.1.0.6/src/Data/ByteString/Handle/Write.hs 2021-06-21 15:24:01.794796505 +0800 +@@ -17,7 +17,7 @@ + + import GHC.IO.Buffer ( BufferState(..), emptyBuffer, Buffer(..) ) + import GHC.IO.BufferedIO ( BufferedIO(..) ) +-import GHC.IO.Device ( IODevice(..), IODeviceType(..), SeekMode(..) ) ++import GHC.IO.Device ( IODevice(..), IODeviceType(..), SeekMode(..), RawIO(..) ) + #if MIN_VERSION_base(4,5,0) + import GHC.IO.Encoding ( getLocaleEncoding ) + #else +@@ -138,6 +138,7 @@ + seek_base = error "seek_base needs to be updated" + }) + modifyIORef (write_size ws) (`max` newSeekPos) ++ pure newSeekPos + + tell ws = do + ss <- readIORef (write_seek_state ws) +@@ -152,6 +153,12 @@ + + devType _ = return RegularFile -- TODO: is this correct? + ++instance RawIO WriteState where ++ read _ _ _ _ = return 0 ++ readNonBlocking _ _ _ _ = return Nothing ++ write _ _ _ _ = return () ++ writeNonBlocking _ _ _ _ = return 0 ++ + ioe_seekOutOfRange :: IO a + ioe_seekOutOfRange = + ioException $ IOError Nothing InvalidArgument "" +--- bytestring-handle-0.1.0.6/src/Data/ByteString/Handle/Read.hs.orig 2021-06-21 14:53:55.433129276 +0800 ++++ bytestring-handle-0.1.0.6/src/Data/ByteString/Handle/Read.hs 2021-06-21 15:24:25.998784996 +0800 +@@ -24,7 +24,7 @@ + , emptyBuffer, isEmptyBuffer, newBuffer, newByteBuffer + , bufferElems, withBuffer, withRawBuffer ) + import GHC.IO.BufferedIO ( BufferedIO(..) ) +-import GHC.IO.Device ( IODevice(..), IODeviceType(..), SeekMode(..) ) ++import GHC.IO.Device ( IODevice(..), IODeviceType(..), SeekMode(..), RawIO(..) ) + #if MIN_VERSION_base(4,5,0) + import GHC.IO.Encoding ( getLocaleEncoding ) + #else +@@ -155,7 +155,7 @@ + (seek_before_length curSeekState) + (fromIntegral (seek_pos curSeekState) + seekPos) + SeekFromEnd -> normalisedSeekState (read_chunks_backwards rs) [] (read_length rs) seekPos +- maybe ioe_seekOutOfRange (writeIORef (read_seek_state rs)) newSeekState ++ maybe ioe_seekOutOfRange (\nss -> writeIORef (read_seek_state rs) nss >> pure (fromIntegral(seek_pos nss))) newSeekState + + tell rs = do + ss <- readIORef (read_seek_state rs) +@@ -166,6 +166,12 @@ + + devType _ = return RegularFile -- TODO: is this correct? + ++instance RawIO ReadState where ++ read _ _ _ _ = return 0 ++ readNonBlocking _ _ _ _ = return Nothing ++ write _ _ _ _ = return () ++ writeNonBlocking _ _ _ _ = return 0 ++ + ioe_seekOutOfRange :: IO a + ioe_seekOutOfRange = + ioException $ IOError Nothing InvalidArgument "" diff --git a/gnu/packages/patches/ngless-unliftio.patch b/gnu/packages/patches/ngless-unliftio.patch deleted file mode 100644 index 87f5e79fcf..0000000000 --- a/gnu/packages/patches/ngless-unliftio.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 919565adc1216b9d3108b3043e8d307292b37393 Mon Sep 17 00:00:00 2001 -From: Luis Pedro Coelho -Date: Fri, 7 May 2021 11:42:56 +0800 -Subject: [PATCH] BLD Update to LTS-17.10 - -- Updates the GHC version -- Requires `extra-deps` for `diagrams` package -- Simplifies code for NGLessIO monad as UnliftIO can now be auto-derived ---- - NGLess/NGLess/NGError.hs | 8 ++------ - stack.yaml | 11 ++++++++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/NGLess/NGLess/NGError.hs b/NGLess/NGLess/NGError.hs -index a22e557f..c7eddf5b 100644 ---- a/NGLess/NGLess/NGError.hs -+++ b/NGLess/NGLess/NGError.hs -@@ -50,7 +50,8 @@ type NGLess = Either NGError - - newtype NGLessIO a = NGLessIO { unwrapNGLessIO :: ResourceT IO a } - deriving (Functor, Applicative, Monad, MonadIO, -- MonadResource, MonadThrow, MonadCatch, MonadMask) -+ MonadResource, MonadThrow, MonadCatch, MonadMask, -+ MonadUnliftIO) - - - instance MonadError NGError NGLessIO where -@@ -62,11 +63,6 @@ instance PrimMonad NGLessIO where - primitive act = NGLessIO (primitive act) - {-# INLINE primitive #-} - --instance MonadUnliftIO NGLessIO where -- askUnliftIO = NGLessIO $ do -- u <- askUnliftIO -- return $ UnliftIO (\(NGLessIO act) -> unliftIO u act) -- - instance MonadFail NGLessIO where - fail err = throwShouldNotOccur err - -diff --git a/stack.yaml b/stack.yaml -index 051d973d..11b65887 100644 ---- a/stack.yaml -+++ b/stack.yaml -@@ -1,14 +1,19 @@ - # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md - --resolver: lts-14.20 -+resolver: lts-17.10 - compiler-check: newer-minor - - # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) - extra-deps: - - git: "https://github.com/ngless-toolkit/interval-to-int" - commit: "78289f6b48d41f7cc48169520ec9b77b050a0029" -- -- -+ - diagrams-core-1.4.2@sha256:47de45658e8a805b7cb7f535e7b093daf7e861604fa3c70e25bd4ef481bf1571,2997 -+ - diagrams-lib-1.4.3@sha256:04f77778d4b550d3c8e54440800685f88467bef91075e82e009a8a6f45c51033,8232 -+ - diagrams-svg-1.4.3@sha256:36708b0b4cf35507ccf689f1a25f6f81b8f41c2c4c2900793de820f66d4e241c,3181 -+ - active-0.2.0.14@sha256:e618aba4a7881eb85dc1585e0a01230af6b4fbab6693931e4a5d0d3a5b184406,1823 -+ - dual-tree-0.2.2.1@sha256:9ff31e461d873ae74ba51d93b454c0c4094726d7cb78a0c454394c965e83539d,2830 -+ - monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333 -+ - svg-builder-0.1.1@sha256:22de54d326a6b6912e461e1302edb9108b02aac0b6a6368fcdc3c4a224d487fd,1440 - allow-newer: true - - # Override default flag values for local packages and extra-deps diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch b/gnu/packages/patches/xmonad-dynamic-linking.patch index 4f3386e53a..a1d71825b6 100644 --- a/gnu/packages/patches/xmonad-dynamic-linking.patch +++ b/gnu/packages/patches/xmonad-dynamic-linking.patch @@ -2,15 +2,15 @@ This patch is required for xmonad to make use of shared libraries. Without it, xmonad will not work since we do not (by default) use statically linked Haskell libraries. -diff -ruN xmonad-0.15-a/src/XMonad/Core.hs xmonad-0.15-b/src/XMonad/Core.hs ---- xmonad-0.15-a/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -+++ xmonad-0.15-b/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -@@ -681,6 +681,8 @@ - compileGHC bin dir errHandle = - runProcess "ghc" ["--make" - , "xmonad.hs" -+ , "-dynamic" -+ , "-fPIC" - , "-i" - , "-ilib" - , "-fforce-recomp" +index 46a0939..5ad4f8f 100644 +--- a/src/XMonad/Core.hs ++++ b/src/XMonad/Core.hs +@@ -664,6 +664,8 @@ compile dirs method = + where + ghcArgs = [ "--make" + , "xmonad.hs" ++ , "-dynamic" ++ , "-fPIC" + , "-i" -- only look in @lib@ + , "-ilib" + , "-fforce-recomp" diff --git a/gnu/packages/patches/xmonad-next-dynamic-linking.patch b/gnu/packages/patches/xmonad-next-dynamic-linking.patch deleted file mode 100644 index a1d71825b6..0000000000 --- a/gnu/packages/patches/xmonad-next-dynamic-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch is required for xmonad to make use of shared libraries. -Without it, xmonad will not work since we do not (by default) use -statically linked Haskell libraries. - -index 46a0939..5ad4f8f 100644 ---- a/src/XMonad/Core.hs -+++ b/src/XMonad/Core.hs -@@ -664,6 +664,8 @@ compile dirs method = - where - ghcArgs = [ "--make" - , "xmonad.hs" -+ , "-dynamic" -+ , "-fPIC" - , "-i" -- only look in @lib@ - , "-ilib" - , "-fforce-recomp" diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index dd048197b4..d968a6f0e6 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -34,79 +34,67 @@ (define-public purescript (package (name "purescript") - (version "0.14.5") + (version "0.15.7") (source (origin (method url-fetch) (uri (hackage-uri "purescript" version)) (sha256 - (base32 "06f318hdah076vkviw1ryyg2p0gpbabsp8lbm5x03f2qv92n9j1n")))) + (base32 "1krjkgmxpfqf5a1jqs7qbg6r7ball1464zw6vgrdfzl9057c6l4f")))) (build-system haskell-build-system) (properties '((upstream-name . "purescript"))) - (inputs - (list ghc-glob - ghc-aeson - ghc-aeson-better-errors - ghc-aeson-pretty - ghc-ansi-terminal - ghc-base-compat - ghc-blaze-html - ghc-bower-json - ghc-boxes - ghc-cborg - ghc-cheapskate - ghc-clock - ghc-cryptonite - ghc-data-ordlist - ghc-dlist - ghc-edit-distance - ghc-file-embed - ghc-fsnotify - ghc-happy - ghc-language-javascript - ghc-lifted-async - ghc-lifted-base - ghc-memory - ghc-microlens-platform - ghc-monad-control - ghc-monad-logger - ghc-network - ghc-parallel - ghc-pattern-arrows - ghc-protolude - ghc-purescript-cst - ghc-regex-tdfa - ghc-safe - ghc-scientific - ghc-semialign - ghc-semigroups - ghc-serialise - ghc-sourcemap - ghc-split - ghc-stringsearch - ghc-syb - ghc-these - ghc-transformers-base - ghc-transformers-compat - ghc-unordered-containers - ghc-utf8-string - ghc-vector - ghc-ansi-wl-pprint - ghc-http-types - ghc-network - ghc-optparse-applicative-0.15.1.0 ; XXX: needs specific version - ghc-wai - ghc-wai-websockets - ghc-warp - ghc-websockets)) - (native-inputs - (list ghc-happy - ghc-hunit - ghc-hspec - hspec-discover - ghc-tasty - ghc-tasty-golden - ghc-tasty-hspec)) + (inputs (list ghc-aeson + ghc-aeson-better-errors + ghc-ansi-terminal + ghc-blaze-html + ghc-bower-json + ghc-boxes + ghc-cborg + ghc-serialise + ghc-cheapskate + ghc-clock + ghc-cryptonite + ghc-data-ordlist + ghc-dlist + ghc-edit-distance + ghc-file-embed + ghc-glob + ghc-language-javascript + ghc-lens + ghc-lifted-async + ghc-lifted-base + ghc-memory + ghc-monad-control + ghc-monad-logger + ghc-monoidal-containers + ghc-parallel + ghc-pattern-arrows + ghc-protolude + ghc-regex-tdfa + ghc-safe + ghc-scientific + ghc-semigroups + ghc-semialign + ghc-sourcemap + ghc-stringsearch + ghc-these + ghc-transformers-base + ghc-utf8-string + ghc-vector + ghc-witherable + ghc-ansi-wl-pprint + ghc-network + ghc-optparse-applicative + ghc-gitrev)) + (native-inputs (list ghc-generic-random + ghc-hspec + ghc-hunit + ghc-newtype + ghc-quickcheck + ghc-regex-base + ghc-split + ghc-typed-process + ghc-happy)) (arguments `(;; Tests require npm #:tests? #f @@ -116,7 +104,7 @@ (add-before 'configure 'update-constraints (lambda _ (substitute* "purescript.cabal" - (("\\b(ansi-terminal|cryptonite|dlist|language-javascript)\\s+[^,]+" all dep) + (("\\b(language-javascript|process)\\s+[^,]+" all dep) dep))))))) (home-page "https://www.purescript.org/") (synopsis "Haskell inspired programming language compiling to JavaScript") @@ -125,39 +113,3 @@ expressive types, inspired by Haskell and compiling to JavaScript.") (license license:bsd-3))) -(define-public ghc-purescript-cst - (package - (name "ghc-purescript-cst") - (version "0.4.0.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "purescript-cst" version)) - (sha256 - (base32 "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g")))) - (build-system haskell-build-system) - (properties '((upstream-name . "purescript-cst"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "purescript-cst.cabal" - (("\\b(dlist)\\s+[^,]+" all dep) - dep))))))) - (inputs - (list ghc-aeson - ghc-base-compat - ghc-dlist - ghc-microlens - ghc-protolude - ghc-scientific - ghc-semigroups - ghc-serialise - ghc-vector)) - (native-inputs (list ghc-happy)) - (home-page "https://www.purescript.org/") - (synopsis "PureScript Programming Language Concrete Syntax Tree") - (description - "This package implements parser for the PureScript programming language.") - (license license:bsd-3))) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f7a4a3214f..6594a48273 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -801,40 +801,26 @@ background wallpaper manager with transparency support, a simple session manager and a system tray.") (license license:lgpl2.0))) - -(define-public xmonad-next +(define-public xmonad (package - (name "xmonad-next") - (version "0.17.0") - (synopsis "Tiling window manager") + (name "xmonad") + (version "0.17.1") (source (origin (method url-fetch) (uri (hackage-uri "xmonad" version)) (sha256 (base32 - "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) - (patches (search-patches "xmonad-next-dynamic-linking.patch")))) + "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8")) + (patches (search-patches "xmonad-dynamic-linking.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "xmonad"))) - (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) + (inputs (list ghc-x11 ghc-data-default-class ghc-setlocale)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append #$output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append xsessions - "/xmonad.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a/bin/xmonad~@ - Type=Application~%" #$name #$synopsis #$output))))))))) - (home-page "https://xmonad.org") + `(#:cabal-revision ("2" + "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"))) + (home-page "http://xmonad.org") + (synopsis "Tiling window manager") (description "Xmonad is a tiling window manager for X. Windows are arranged automatically to tile the screen without gaps or overlap, maximising screen @@ -846,42 +832,16 @@ used on each workspace. Xinerama is fully supported, allowing windows to be tiled on several screens.") (license license:bsd-3))) -(define-public xmonad - (package - (inherit xmonad-next) - (name "xmonad") - (version "0.15") - (source (origin - (method url-fetch) - (uri (hackage-uri "xmonad" version)) - (sha256 - (base32 - "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) - (patches (search-patches "xmonad-dynamic-linking.patch")))) - (inputs - (list ghc-extensible-exceptions - ghc-data-default - ghc-quickcheck - ghc-semigroups - ghc-setlocale - ghc-utf8-string - ghc-x11)) - (native-inputs '()) - (arguments - `(#:cabal-revision - ("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd") - ,@(package-arguments xmonad-next))))) - (define-public xmobar (package (name "xmobar") - (version "0.44.2") + (version "0.46") (source (origin (method url-fetch) (uri (hackage-uri "xmobar" version)) (sha256 (base32 - "0gdphjn5ll5lkb2psdsb34563wsz6g0y2gg3z8cj4jy8lvbbv808")))) + "0glpiq7c0qwfcxnc2flgzj7afm5m1a9ghzwwcq7f8q27m21kddrd")))) (build-system haskell-build-system) (properties '((upstream-name . "xmobar"))) (native-inputs @@ -904,6 +864,8 @@ tiled on several screens.") ghc-timezone-olson ghc-x11 ghc-x11-xft + ghc-cairo + ghc-pango libxpm)) (arguments `(#:configure-flags (list "--flags=all_extensions") @@ -945,53 +907,30 @@ Unlike dmenu, it mangles the input before it presents its choices. In particular, it displays commonly-chosen options before uncommon ones.") (license license:bsd-3))) -(define-public ghc-xmonad-contrib-next +(define-public ghc-xmonad-contrib (package - (name "ghc-xmonad-contrib-next") - (version "0.17.0") - (source - (origin - (method url-fetch) - (uri (hackage-uri "xmonad-contrib" version)) - (sha256 - (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) + (name "ghc-xmonad-contrib") + (version "0.17.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "xmonad-contrib" version)) + (sha256 + (base32 + "0lwj8xkyaw6h0rv3lz2jdqrwzz7yghfmnhpndygkb3wgyhvq6dxb")))) (build-system haskell-build-system) (properties '((upstream-name . "xmonad-contrib"))) - (propagated-inputs (list ghc-random ghc-x11 ghc-utf8-string ghc-x11-xft xmonad-next)) + (inputs (list ghc-random ghc-x11 xmonad ghc-utf8-string ghc-x11-xft)) (native-inputs (list ghc-quickcheck ghc-hspec)) - (home-page "https://xmonad.org") + (arguments + `(#:cabal-revision ("1" + "0dc9nbn0kaw98rgpi1rq8np601zjhdr1y0ydg6yb82wwaqawql6z"))) + (home-page "https://xmonad.org/") (synopsis "Third party extensions for xmonad") (description "Third party tiling algorithms, configurations, and scripts to Xmonad, a tiling window manager for X.") (license license:bsd-3))) -(define-public ghc-xmonad-contrib - (package - (inherit ghc-xmonad-contrib-next) - (name "ghc-xmonad-contrib") - (version "0.16") - (source - (origin - (method url-fetch) - (uri (hackage-uri "xmonad-contrib" version)) - (sha256 - (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) - (arguments - `(#:cabal-revision - ("1" "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011") - ,@(package-arguments ghc-xmonad-contrib-next))) - (native-inputs '()) - (propagated-inputs - (list ghc-old-time - ghc-random - ghc-utf8-string - ghc-extensible-exceptions - ghc-semigroups - ghc-x11 - ghc-x11-xft - xmonad)))) - (define-public evilwm (package (name "evilwm") -- cgit 1.4.1 From d603946d38a7b62cf1bb2616285b61cca8d169e9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 24 Jan 2023 12:27:21 +0100 Subject: gnu: ghc-9.2: Increase make verbosity. Tests time out on ci.guix.gnu.org. * gnu/packages/haskell.scm (ghc-9.2)[arguments]: Modify #:make-flags. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3955e20f88..6e00a756a8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1295,7 +1295,10 @@ interactive environment for the functional language Haskell.") (replace 'fix-cc-reference (lambda _ (substitute* "utils/hsc2hs/src/Common.hs" - (("\"cc\"") "\"gcc\"")))))))) + (("\"cc\"") "\"gcc\"")))))) + ;; Increase verbosity, so running the test suite does not time out on CI. + ((#:make-flags make-flags ''()) + #~(cons "VERBOSE=4" #$make-flags)))) (native-inputs `(;; GHC 9.2 must be built with GHC >= 8.6. ("ghc-bootstrap" ,base) -- cgit 1.4.1 From 9ce5ec5397ae29220326516b348243ee085bc40d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 25 Jan 2023 09:27:32 +0100 Subject: gnu: Remove unused Haskell packages. * gnu/packages/haskell-xyz.scm (ghc-attoparsec-bootstrap): Remove variable. (ghc-integer-logarithms-bootstrap): Likewise. (ghc-scientific-bootstrap): Likewise. (ghc-wcwidth-bootstrap): Likewise. (ghc-optparse-applicative-0.15.1.0): Likewise. --- gnu/packages/haskell-xyz.scm | 59 -------------------------------------------- 1 file changed, 59 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 69ff954ce4..1ecb377ffc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -581,16 +581,6 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) -(define-public ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap))) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-attoparsec-iso8601 (package (name "ghc-attoparsec-iso8601") @@ -5825,14 +5815,6 @@ minimal overhead. No FFI required.") in migrated modules.") (license license:expat))) -(define-public ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-interpolate (package (name "ghc-interpolate") @@ -8052,27 +8034,6 @@ easily work with command-line options.") command line options in Haskell.") (license license:bsd-3))) -(define-public ghc-optparse-applicative-0.15.1.0 - (package - (inherit ghc-optparse-applicative) - (name "ghc-optparse-applicative") - (version "0.15.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/optparse-applicative/optparse-applicative-" - version - ".tar.gz")) - (sha256 - (base32 "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd")))) - (inputs - (list ghc-transformers-compat ghc-ansi-wl-pprint)) - (native-inputs (list ghc-quickcheck)) - (arguments - `(#:cabal-revision - ("1" "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9"))))) - (define-public ghc-jira-wiki-markup (package (name "ghc-jira-wiki-markup") @@ -10179,18 +10140,6 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) -(define-public ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive))) - (native-inputs '()) - (properties '((hidden? #t))))) - (define-public ghc-sdl (package (name "ghc-sdl") @@ -13424,14 +13373,6 @@ The command line tool can compile a width table to Haskell code that assigns widths to the Char type.") (license license:bsd-3))) -(define-public ghc-wcwidth-bootstrap - (package - (inherit ghc-wcwidth) - (name "ghc-wcwidth-bootstrap") - (inputs - (list ghc-setlocale ghc-utf8-string ghc-attoparsec-bootstrap)) - (properties '((hidden? #t))))) - (define-public ghc-weigh (package (name "ghc-weigh") -- cgit 1.4.1 From 7d60b97a6f3997600d6b95901c2c223dea24b3d6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 25 Jan 2023 09:35:11 +0100 Subject: gnu: ghc-parsec: Update to 3.1.15.0. Missed by automation. * gnu/packages/haskell-xyz.scm (ghc-parsec)[version]: Update to 3.1.15.0. [native-inputs]: Switch from HUnit to tasty. --- gnu/packages/haskell-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1ecb377ffc..03d670fa92 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8342,18 +8342,15 @@ building up, manipulating and serialising @code{Pandoc} structures.") (define-public ghc-parsec (package (name "ghc-parsec") - (version "3.1.14.0") + (version "3.1.15.0") (source (origin (method url-fetch) (uri (hackage-uri "parsec" version)) (sha256 (base32 - "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67")))) + "1v8zs8zv1rk16lag2yqaxfwanjpgnh4gxw1vd70py0n04d20z0lq")))) (build-system haskell-build-system) - (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) - (arguments - `(#:cabal-revision - ("4" "0p65q054iaz2117a5qk1428dic4sb41acclys9k00zna24ks7iq3"))) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://github.com/haskell/parsec") (synopsis "Monadic parser combinators") (description "Parsec is designed from scratch as an industrial-strength -- cgit 1.4.1 From 92caedb60c8fb6961446d223b623c41bed808acd Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 25 Jan 2023 10:01:36 +0100 Subject: gnu: idris: Fix overly zealous regular expression. * gnu/packages/idris.scm (idris)[arguments]: Limit characters matched after package name in cabal file substitutions. --- gnu/packages/idris.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 5e4979edc3..2a5f63c174 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -99,7 +99,7 @@ (add-before 'configure 'update-constraints (lambda _ (substitute* "idris.cabal" - (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[^,]+" all dep) + (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[<>=0-9. &|]+" all dep) dep)))) (add-before 'configure 'set-cc-command (lambda _ -- cgit 1.4.1 From ebea18357b325dc96e68bfd7103497571b2cbd77 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 25 Jan 2023 13:03:43 +0100 Subject: gnu: elm: Support GHC 9.2. * gnu/packages/elm.scm (elm-sans-reactor)[source]: Add patch to support GHC 9.2. * gnu/packages/patches/elm-ghc9.2.patch: This one. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/elm.scm | 3 +- gnu/packages/patches/elm-ghc9.2.patch | 187 ++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/elm-ghc9.2.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 04a7320960..89dee3cf6a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1055,6 +1055,7 @@ dist_patch_DATA = \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ + %D%/packages/patches/elm-ghc9.2.patch \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index 6d301cf51c..a74d294ae5 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -56,7 +56,8 @@ (base32 "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w")) (patches (search-patches "elm-reactor-static-files.patch" - "elm-offline-package-registry.patch")))) + "elm-offline-package-registry.patch" + "elm-ghc9.2.patch")))) (build-system haskell-build-system) (arguments (list diff --git a/gnu/packages/patches/elm-ghc9.2.patch b/gnu/packages/patches/elm-ghc9.2.patch new file mode 100644 index 0000000000..7b1e653e80 --- /dev/null +++ b/gnu/packages/patches/elm-ghc9.2.patch @@ -0,0 +1,187 @@ +From f88043586337ba33cf3e852908003a71dfe493ec Mon Sep 17 00:00:00 2001 +From: vlkrs +Date: Sat, 7 May 2022 17:51:15 +0200 +Subject: [PATCH] Quick hack to build on ghc-9.2.2 + +Taken from +https://codeberg.org/vlkrs/elm-compiler/commit/f88043586337ba33cf3e852908003a71dfe493ec.patch + +diff --git a/compiler/src/Data/Name.hs b/compiler/src/Data/Name.hs +index beecf114..39b64029 100644 +--- a/compiler/src/Data/Name.hs ++++ b/compiler/src/Data/Name.hs +@@ -47,6 +47,7 @@ import qualified Data.Utf8 as Utf8 + import GHC.Exts + ( Int(I#), Ptr + , MutableByteArray# ++ , int8ToInt# + , isTrue# + , newByteArray# + , sizeofByteArray# +@@ -241,7 +242,7 @@ fromTypeVariable name@(Utf8.Utf8 ba#) index = + else + let + len# = sizeofByteArray# ba# +- end# = indexWord8Array# ba# (len# -# 1#) ++ end# = word8ToWord# (indexWord8Array# ba# (len# -# 1#)) + in + if isTrue# (leWord# 0x30## end#) && isTrue# (leWord# end# 0x39##) then + runST +@@ -316,11 +317,11 @@ fromManyNames names = + ST $ \s -> + case newByteArray# (len# +# 3#) s of + (# s, mba# #) -> +- case writeWord8Array# mba# 0# 0x5F## {-_-} s of ++ case writeWord8Array# mba# 0# (wordToWord8# 0x5F##) {-_-} s of + s -> +- case writeWord8Array# mba# 1# 0x4D## {-M-} s of ++ case writeWord8Array# mba# 1# (wordToWord8# 0x4D##) {-M-} s of + s -> +- case writeWord8Array# mba# 2# 0x24## {-$-} s of ++ case writeWord8Array# mba# 2# (wordToWord8# 0x24##) {-$-} s of + s -> + case copyByteArray# ba# 0# mba# 3# len# s of + s -> +diff --git a/compiler/src/Data/Utf8.hs b/compiler/src/Data/Utf8.hs +index e985aa64..472777df 100644 +--- a/compiler/src/Data/Utf8.hs ++++ b/compiler/src/Data/Utf8.hs +@@ -109,10 +109,10 @@ contains (W8# word#) (Utf8 ba#) = + containsHelp word# ba# 0# (sizeofByteArray# ba#) + + +-containsHelp :: Word# -> ByteArray# -> Int# -> Int# -> Bool ++containsHelp :: Word8# -> ByteArray# -> Int# -> Int# -> Bool + containsHelp word# ba# !offset# len# = + if isTrue# (offset# <# len#) then +- if isTrue# (eqWord# word# (indexWord8Array# ba# offset#)) ++ if isTrue# (eqWord8# word# (indexWord8Array# ba# offset#)) + then True + else containsHelp word# ba# (offset# +# 1#) len# + else +@@ -147,10 +147,10 @@ startsWithChar isGood bytes@(Utf8 ba#) = + let + !w# = indexWord8Array# ba# 0# + !char +- | isTrue# (ltWord# w# 0xC0##) = C# (chr# (word2Int# w#)) +- | isTrue# (ltWord# w# 0xE0##) = chr2 ba# 0# w# +- | isTrue# (ltWord# w# 0xF0##) = chr3 ba# 0# w# +- | True = chr4 ba# 0# w# ++ | isTrue# (ltWord8# w# (wordToWord8# 0xC0##)) = C# (chr# (int8ToInt# (word8ToInt8# w#))) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xE0##)) = chr2 ba# 0# (word8ToWord# w#) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xF0##)) = chr3 ba# 0# (word8ToWord# w#) ++ | True = chr4 ba# 0# (word8ToWord# w#) + in + isGood char + +@@ -164,7 +164,7 @@ endsWithWord8 (W8# w#) (Utf8 ba#) = + let len# = sizeofByteArray# ba# in + isTrue# (len# ># 0#) + && +- isTrue# (eqWord# w# (indexWord8Array# ba# (len# -# 1#))) ++ isTrue# (eqWord8# w# (indexWord8Array# ba# (len# -# 1#))) + + + +@@ -186,11 +186,11 @@ splitHelp str start offsets = + unsafeSlice str start offset : splitHelp str (offset + 1) offsets + + +-findDividers :: Word# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int] ++findDividers :: Word8# -> ByteArray# -> Int# -> Int# -> [Int] -> [Int] + findDividers divider# ba# !offset# len# revOffsets = + if isTrue# (offset# <# len#) then + findDividers divider# ba# (offset# +# 1#) len# $ +- if isTrue# (eqWord# divider# (indexWord8Array# ba# offset#)) ++ if isTrue# (eqWord8# divider# (indexWord8Array# ba# offset#)) + then I# offset# : revOffsets + else revOffsets + else +@@ -353,10 +353,10 @@ toCharsHelp ba# offset# len# = + let + !w# = indexWord8Array# ba# offset# + !(# char, width# #) +- | isTrue# (ltWord# w# 0xC0##) = (# C# (chr# (word2Int# w#)), 1# #) +- | isTrue# (ltWord# w# 0xE0##) = (# chr2 ba# offset# w#, 2# #) +- | isTrue# (ltWord# w# 0xF0##) = (# chr3 ba# offset# w#, 3# #) +- | True = (# chr4 ba# offset# w#, 4# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xC0##)) = (# C# (chr# (int8ToInt# (word8ToInt8# w#))), 1# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xE0##)) = (# chr2 ba# offset# (word8ToWord# w#), 2# #) ++ | isTrue# (ltWord8# w# (wordToWord8# 0xF0##)) = (# chr3 ba# offset# (word8ToWord# w#), 3# #) ++ | True = (# chr4 ba# offset# (word8ToWord# w#), 4# #) + + !newOffset# = offset# +# width# + in +@@ -368,7 +368,7 @@ chr2 :: ByteArray# -> Int# -> Word# -> Char + chr2 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) + !c1# = uncheckedIShiftL# (i1# -# 0xC0#) 6# + !c2# = i2# -# 0x80# + in +@@ -380,8 +380,8 @@ chr3 :: ByteArray# -> Int# -> Word# -> Char + chr3 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) +- !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) ++ !i3# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 2#))) + !c1# = uncheckedIShiftL# (i1# -# 0xE0#) 12# + !c2# = uncheckedIShiftL# (i2# -# 0x80#) 6# + !c3# = i3# -# 0x80# +@@ -394,9 +394,9 @@ chr4 :: ByteArray# -> Int# -> Word# -> Char + chr4 ba# offset# firstWord# = + let + !i1# = word2Int# firstWord# +- !i2# = word2Int# (indexWord8Array# ba# (offset# +# 1#)) +- !i3# = word2Int# (indexWord8Array# ba# (offset# +# 2#)) +- !i4# = word2Int# (indexWord8Array# ba# (offset# +# 3#)) ++ !i2# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 1#))) ++ !i3# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 2#))) ++ !i4# = int8ToInt# (word8ToInt8# (indexWord8Array# ba# (offset# +# 3#))) + !c1# = uncheckedIShiftL# (i1# -# 0xF0#) 18# + !c2# = uncheckedIShiftL# (i2# -# 0x80#) 12# + !c3# = uncheckedIShiftL# (i3# -# 0x80#) 6# +@@ -471,7 +471,7 @@ toEscapedBuilderHelp before after !name@(Utf8 ba#) k = + escape :: Word8 -> Word8 -> Ptr a -> Utf8 t -> Int -> Int -> Int -> IO () + escape before@(W8# before#) after ptr name@(Utf8 ba#) offset@(I# offset#) len@(I# len#) i@(I# i#) = + if isTrue# (i# <# len#) then +- if isTrue# (eqWord# before# (indexWord8Array# ba# (offset# +# i#))) ++ if isTrue# (eqWord8# before# (indexWord8Array# ba# (offset# +# i#))) + then + do writeWordToPtr ptr i after + escape before after ptr name offset len (i + 1) +diff --git a/compiler/src/Parse/Primitives.hs b/compiler/src/Parse/Primitives.hs +index bb973193..3747cfac 100644 +--- a/compiler/src/Parse/Primitives.hs ++++ b/compiler/src/Parse/Primitives.hs +@@ -82,7 +82,7 @@ instance Functor (Parser x) where + + instance Applicative.Applicative (Parser x) where + {-# INLINE pure #-} +- pure = return ++ pure = pure + + {-# INLINE (<*>) #-} + (<*>) (Parser parserFunc) (Parser parserArg) = +diff --git a/compiler/src/Parse/Variable.hs b/compiler/src/Parse/Variable.hs +index f3d86145..5e0ea802 100644 +--- a/compiler/src/Parse/Variable.hs ++++ b/compiler/src/Parse/Variable.hs +@@ -22,6 +22,7 @@ import qualified Data.Set as Set + import Data.Word (Word8) + import Foreign.Ptr (Ptr, plusPtr) + import GHC.Exts (Char(C#), Int#, (+#), (-#), chr#, uncheckedIShiftL#, word2Int#) ++import GHC.Prim + import GHC.Word (Word8(W8#)) + + import qualified AST.Source as Src +@@ -384,4 +385,4 @@ chr4 pos firstWord = + + unpack :: Word8 -> Int# + unpack (W8# word#) = +- word2Int# word# ++ int8ToInt# (word8ToInt8# word#) -- cgit 1.4.1 From 4bb40b098d81e70ebaf86250cb0162bb285ef6ca Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:43:05 +0100 Subject: build-system: haskell: Drop default "static" output. * guix/build-system/haskell.scm (lower): Pass outputs to lowered bag. * guix/build/haskell-build-system.scm (install): Remove static library moving code. * gnu/packages/haskell-check.scm (ghc-hunit): Remove "static" output. * gnu/packages/haskell-crypto.scm (ghc-crypto-api-tests): Likewise. * gnu/packages/haskell-xyz.scm (ghc-case-insensitive): Likewise. (ghc-cmdargs): Likewise. (ghc-conduit): Likewise. (ghc-fgl): Likewise. (ghc-haskell-src-exts): Likewise. (ghc-lib-parser): Likewise. (ghc-mono-traversable): Likewise. (ghc-parallel): Likewise. (ghc-paths): Likewise. (ghc-profunctors): Likewise. (ghc-tf-random): Likewise. (ghc-vector): Likewise. --- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-crypto.scm | 1 - gnu/packages/haskell-xyz.scm | 24 ++++++++++++------------ guix/build-system/haskell.scm | 5 +---- guix/build/haskell-build-system.scm | 12 +----------- 5 files changed, 15 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 6b7fe878e2..23727fc0b8 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -629,7 +629,7 @@ using Template Haskell") (package (name "ghc-hunit") (version "1.6.2.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 0046e0481a..42e2a15709 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -141,7 +141,6 @@ algorithm (ex: padding) is within scope of this package.") "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl")))) (build-system haskell-build-system) (properties '((upstream-name . "crypto-api-tests"))) - (outputs '("out" "static" "doc")) (inputs (list ghc-test-framework-quickcheck2 ghc-crypto-api ghc-cereal diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 03d670fa92..475db5c275 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1395,7 +1395,7 @@ call stacks with different versions of the compiler.") (package (name "ghc-case-insensitive") (version "1.2.1.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -1993,7 +1993,7 @@ of the C library.") "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) (build-system haskell-build-system) (properties '((upstream-name . "cmdargs"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (home-page "http://community.haskell.org/~ndm/cmdargs/") (synopsis "Command line argument processing") @@ -2171,7 +2171,7 @@ concurrent threads. Can be used for progress displays etc.") "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-exceptions ghc-lifted-base @@ -3855,7 +3855,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (package (name "ghc-fgl") (version "5.7.0.3") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -4958,7 +4958,7 @@ package are to parse or generate Haskell 98 code.") "01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src-exts"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list cpphs ghc-happy ghc-pretty-show)) (native-inputs @@ -6349,7 +6349,7 @@ Music Player Daemon.") "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser"))) - (outputs '("out" "static" "doc")) ; documentation is 39M + (outputs '("out" "doc")) ; documentation is 39M (native-inputs (list ghc-alex ghc-happy)) (home-page "https://github.com/digital-asset/ghc-lib") (synopsis "The GHC API, decoupled from GHC versions") @@ -7314,7 +7314,7 @@ the @code{mtl-tf} package.") "1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq")))) (build-system haskell-build-system) (properties '((upstream-name . "mono-traversable"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-unordered-containers ghc-hashable ghc-vector ghc-vector-algorithms ghc-split)) (native-inputs (list ghc-hspec ghc-hunit ghc-quickcheck ghc-foldl)) @@ -8320,7 +8320,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") (package (name "ghc-parallel") (version "3.2.2.0") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -8480,7 +8480,7 @@ files/directories, and more.") (package (name "ghc-paths") (version "0.1.0.12") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -9118,7 +9118,7 @@ API.") "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5")))) (build-system haskell-build-system) (properties '((upstream-name . "profunctors"))) - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (inputs (list ghc-base-orphans ghc-bifunctors @@ -11894,7 +11894,7 @@ string metrics efficiently.") (package (name "ghc-tf-random") (version "0.5") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) @@ -13163,7 +13163,7 @@ representing a store for a single element.") (package (name "ghc-vector") (version "0.12.3.1") - (outputs '("out" "static" "doc")) + (outputs '("out" "doc")) (source (origin (method url-fetch) diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index dc83512d30..a37b3a938c 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -109,10 +109,7 @@ version REVISION." ,@(standard-packages))) (build-inputs `(("haskell" ,haskell) ,@native-inputs)) - ;; XXX: this is a hack to get around issue #41569. - (outputs (match outputs - (("out") (cons "static" outputs)) - (_ outputs))) + (outputs outputs) (build haskell-build) (arguments (substitute-keyword-arguments diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 759d3c5d17..d77f55da19 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -129,17 +129,7 @@ and parameters ~s~%" (define* (install #:key outputs #:allow-other-keys) "Install a given Haskell package." - (run-setuphs "copy" '()) - (when (assoc-ref outputs "static") - (let ((static (assoc-ref outputs "static")) - (lib (or (assoc-ref outputs "lib") - (assoc-ref outputs "out")))) - (for-each (lambda (static-lib) - (let* ((subdir (string-drop static-lib (string-length lib))) - (new (string-append static subdir))) - (mkdir-p (dirname new)) - (rename-file static-lib new))) - (find-files lib "\\.a$"))))) + (run-setuphs "copy" '())) (define* (setup-compiler #:key system inputs outputs #:allow-other-keys) "Setup the compiler environment." -- cgit 1.4.1 From 7df12c8ca631cc46f59da9ceeb883a28044dbb9e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:45:45 +0100 Subject: gnu: ghc-9.2: Support static linking with glibc < 2.34. * gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/haskell.scm (ghc-9.2)[origin]: Use it. --- gnu/local.mk | 1 + gnu/packages/haskell.scm | 3 +- .../patches/ghc-9.2-glibc-2.33-link-order.patch | 35 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 89dee3cf6a..4ccf015316 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1198,6 +1198,7 @@ dist_patch_DATA = \ %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e00a756a8..3406161c7c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1286,7 +1286,8 @@ interactive environment for the functional language Haskell.") "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")))) + "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")) + (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) diff --git a/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch b/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch new file mode 100644 index 0000000000..5d4afa28c1 --- /dev/null +++ b/gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch @@ -0,0 +1,35 @@ +Slightly modified version of +https://gitlab.haskell.org/ghc/ghc/-/issues/19029#note_447989, required +for older, buggy glibc versions < 2.34. + +diff -Naur ghc-9.2.5/compiler/GHC/Linker/Unit.hs ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs +--- ghc-9.2.5/compiler/GHC/Linker/Unit.hs 2022-11-06 20:40:29.000000000 +0100 ++++ ghc-9.2.5.patched/compiler/GHC/Linker/Unit.hs 2023-01-15 14:52:57.511275338 +0100 +@@ -31,11 +31,26 @@ + ps <- mayThrowUnitErr $ preloadUnitsInfo' unit_env pkgs + return (collectLinkOpts dflags ps) + ++fixOrderLinkOpts :: [String] -> [String] ++fixOrderLinkOpts opts ++ | have_bad_glibc_version -- glibc version strictly less than 2.34 ++ , let (before, rest) = break (== libc) opts ++ , not (pthread `elem` before) ++ , pthread `elem` rest -- optional if we know pthread is definitely present ++ = before ++ pthread_and_deps ++ rest ++ | otherwise ++ = opts ++ where ++ pthread = "-lpthread" ++ libc = "-lc" ++ pthread_and_deps = [ "-lrt", pthread ] -- should depend on the environment ++ have_bad_glibc_version = True ++ + collectLinkOpts :: DynFlags -> [UnitInfo] -> ([String], [String], [String]) + collectLinkOpts dflags ps = + ( + concatMap (map ("-l" ++) . unitHsLibs (ghcNameVersion dflags) (ways dflags)) ps, +- concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps, ++ fixOrderLinkOpts $ concatMap (map ("-l" ++) . map ST.unpack . unitExtDepLibsSys) ps, + concatMap (map ST.unpack . unitLinkerOptions) ps + ) + -- cgit 1.4.1 From 8a4ee0c113d33be376afd701d6cd1b94821f2cd2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:58:45 +0100 Subject: gnu: ghc-lua: Disable symbol export. This turns on the linker flag -Wl,-E for all libraries depending on it, resulting in large binaries, because --gc-sections cannot clean exported symbols. * gnu/packages/haskell-xyz.scm (ghc-lua)[arguments]: Disable export-dynamic feature. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 475db5c275..b4a327b2cc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -15454,6 +15454,9 @@ embeddable scripting language .") "07wni3ji46ndqabwffgwzij2jk34dq2d66z15hcd6jg33sqnym45")))) (build-system haskell-build-system) (properties '((upstream-name . "lua"))) + (arguments + ;; Allow creating fully static binaries. Avoids issues with linking pandoc statically. + `(#:configure-flags (list "-f-export-dynamic"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page "https://hslua.org/") (synopsis "Lua, an embeddable scripting language") -- cgit 1.4.1 From baf9e0a33685eea208132f374df6756dc2aaf89c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:52:58 +0100 Subject: gnu: ngless: Drop Haskell libraries and documentation. * gnu/packages/bioinformatics.scm (ngless)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/bioinformatics.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b20191bb3..9e8f7e92f8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14832,7 +14832,8 @@ datasets.") "0pljyrlpr9r3cl5311dhgxdl8y40szyi4vprn34i3piy0qrldymi")))) (build-system haskell-build-system) (arguments - `(#:phases + `(#:haddock? #f + #:phases (modify-phases %standard-phases (add-before 'configure 'update-constraints (lambda _ @@ -14876,7 +14877,10 @@ datasets.") (add-after 'wrap-program 'check-install (lambda* (#:key outputs #:allow-other-keys) (let* ((ngless (string-append (assoc-ref outputs "out") "/bin/ngless"))) - (invoke ngless "--check-install"))))))) + (invoke ngless "--check-install")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (inputs (list prodigal bwa samtools -- cgit 1.4.1 From 503998ac7ae16bf5587c69db18e70abdd2f14565 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:54:15 +0100 Subject: gnu: hledger: Drop Haskell libraries and documentation. * gnu/packages/finance.scm (ghc-hledger): New variable. (hledger): Inherit from ghc-hledger and add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/finance.scm | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 192d1d2817..d2da017091 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -214,9 +214,9 @@ line client and a client based on Qt.") (define-public bitcoin-core bitcoin-core-23.0) -(define-public hledger +(define-public ghc-hledger (package - (name "hledger") + (name "ghc-hledger") (version "1.27.1") (source (origin (method url-fetch) @@ -225,14 +225,6 @@ line client and a client based on Qt.") (base32 "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb")))) (build-system haskell-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda _ - (install-file "hledger.info" (string-append #$output "/share/info")) - (install-file "hledger.1" (string-append #$output "/man/man1"))))))) (properties '((upstream-name . "hledger"))) (inputs (list ghc-decimal ghc-diff @@ -275,6 +267,23 @@ rewrite of Ledger, and one of the leading implementations of Plain Text Accounting.") (license license:gpl3))) +(define-public hledger + (package + (inherit ghc-hledger) + (name "hledger") + (arguments + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (install-file "hledger.info" (string-append #$output "/share/info")) + (install-file "hledger.1" (string-append #$output "/man/man1")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))))) + (define-public homebank (package (name "homebank") @@ -1991,7 +2000,7 @@ generate a variety of reports from them, and provides a web interface.") ghc-data-default ghc-extra ghc-hjsmin - hledger + ghc-hledger ghc-hledger-lib ghc-hspec ghc-http-client @@ -2015,12 +2024,17 @@ generate a variety of reports from them, and provides a web interface.") ghc-yesod-static ghc-yesod-test)) (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Tests write to $HOME. - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + ;; Tests write to $HOME. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp"))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "http://hledger.org") (synopsis "Web-based user interface for the hledger accounting system") (description -- cgit 1.4.1 From 47673272c46cd73c03b067e81ddf0d952a874040 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:55:28 +0100 Subject: gnu: darcs: Drop Haskell libraries and documentation. * gnu/packages/haskell-apps.scm (darcs)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/haskell-apps.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5a6bae5281..ad71713f92 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -187,6 +187,7 @@ unlit literate code files; and an option to turn off macro-expansion.") #:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" "-fnetwork-uri" "-fhttp" "--flag=executable" "--flag=library") + #:haddock? #f #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-sh @@ -198,7 +199,10 @@ unlit literate code files; and an option to turn off macro-expansion.") (lambda _ (substitute* "darcs.cabal" (("(attoparsec|base|bytestring|constraints|cryptonite|hashable|memory|regex-tdfa|time)\\s+[^,]+" all dep) - dep))))))) + dep)))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (inputs (list ghc-regex-base ghc-regex-tdfa ghc-regex-applicative -- cgit 1.4.1 From be398aa2b4ed24e73cb2d6865a2040bb12eae1e4 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:56:05 +0100 Subject: gnu: git-annex: Drop Haskell documentation. * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Disable #:haddock?. --- gnu/packages/haskell-apps.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index ad71713f92..12a7985116 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -306,6 +306,7 @@ to @code{cabal repl}).") (arguments `(#:configure-flags '("--flags=-Android -Webapp") + #:haddock? #f #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -386,17 +387,7 @@ to @code{cabal repl}).") (symlink (string-append bin "/git-annex") (string-append bin "/git-annex-shell")) (symlink (string-append bin "/git-annex") - (string-append bin "/git-remote-tor-annex"))))) - (add-after 'install 'touch-static-output - (lambda* (#:key outputs #:allow-other-keys) - ;; The Haskell build system adds a "static" output by - ;; default, and there is no way to override this until - ;; is fixed. Without - ;; this phase, the daemon complains because we do not - ;; create the "static" output. - (with-output-to-file (assoc-ref outputs "static") - (lambda () - (display "static output not used\n")))))))) + (string-append bin "/git-remote-tor-annex")))))))) (inputs (list curl ghc-aeson -- cgit 1.4.1 From a38901c01e3e0e07803ddd74509745b8c24e9e38 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:57:15 +0100 Subject: gnu: shellcheck: Drop Haskell libraries. * gnu/packages/haskell-apps.scm (shellcheck)[arguments]: Add 'remove-libraries phase. --- gnu/packages/haskell-apps.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 12a7985116..02dc437abd 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -836,7 +836,10 @@ too slow and you'll get wound up in the scroll and crushed.") (lambda* (#:key outputs #:allow-other-keys) (install-file "shellcheck.1" (string-append (assoc-ref outputs "out") - "/share/man/man1/"))))))) + "/share/man/man1/")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (native-inputs (list pandoc)) (inputs -- cgit 1.4.1 From 7996bd3955bc3ce799bf41a3195f6188b44b7234 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 18:57:48 +0100 Subject: gnu: pandoc: Drop Haskell libraries and documentation. * gnu/packages/haskell-xyz.scm (ghc-pandoc): Renamed from pandoc. (pandoc) [arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/haskell-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b4a327b2cc..b6c3a71045 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8189,9 +8189,9 @@ with several features not present in pretty-printing libraries designed for code. It was designed for use in @code{Pandoc}.") (license license:bsd-3))) -(define-public pandoc +(define-public ghc-pandoc (package - (name "pandoc") + (name "ghc-pandoc") (version "2.19.2") (source (origin (method url-fetch) @@ -8289,8 +8289,19 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -(define-public ghc-pandoc - (deprecated-package "ghc-pandoc" pandoc)) +(define-public pandoc + (package + (inherit ghc-pandoc) + (name "pandoc") + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))) + ;; Haddock documentation is for the library. + #:haddock? #f)))) (define-public ghc-pandoc-types (package -- cgit 1.4.1 From 169237aae530bff4c7322dec863d2189879a0af6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 19:00:31 +0100 Subject: gnu: purescript: Drop Haskell libraries and documentation. * gnu/packages/purescript.scm (purescript)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/purescript.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index d968a6f0e6..0a5eccc459 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -99,13 +99,17 @@ `(;; Tests require npm #:tests? #f #:configure-flags '("--flags=release") + #:haddock? #f #:phases (modify-phases %standard-phases (add-before 'configure 'update-constraints (lambda _ (substitute* "purescript.cabal" (("\\b(language-javascript|process)\\s+[^,]+" all dep) - dep))))))) + dep)))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "https://www.purescript.org/") (synopsis "Haskell inspired programming language compiling to JavaScript") (description -- cgit 1.4.1 From 6188fe26334bb023363e484ffb7729a366c6f1a2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 29 Jan 2023 19:00:57 +0100 Subject: gnu: xmobar: Drop Haskell libraries and documentation. * gnu/packages/wm.scm (xmobar)[arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/wm.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6594a48273..9ba2841817 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -869,13 +869,17 @@ tiled on several screens.") libxpm)) (arguments `(#:configure-flags (list "--flags=all_extensions") + ;; Haddock documentation is for the library. + #:haddock? #f #:phases (modify-phases %standard-phases + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))) (add-before 'build 'patch-test-shebang (lambda* (#:key inputs #:allow-other-keys) (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" - (("/bin/bash") (which "bash"))) - #t))))) + (("/bin/bash") (which "bash")))))))) (home-page "https://xmobar.org") (synopsis "Minimalistic text based status bar") (description -- cgit 1.4.1 From 2c0537d3741447b02914beb8beab100e3464b181 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 09:48:06 +0100 Subject: gnu: idris: Adapt to changed haskell-build-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …which does not support the “static” output any more. * gnu/packages/idris.scm (idris)[arguments]: Remove phase restore-libidris_rts. --- gnu/packages/idris.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 2a5f63c174..85fb6cc2d2 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -122,17 +122,7 @@ (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count))) (setenv "IDRIS_CC" ,(cc-for-target)) ;Needed for creating executables (setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) - (apply (assoc-ref %standard-phases 'check) args)))) - (add-before 'check 'restore-libidris_rts - (lambda* (#:key outputs #:allow-other-keys) - ;; The Haskell build system moves this library to the - ;; "static" output. Idris only knows how to find it in the - ;; "out" output, so we restore it here. - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static")) - (filename "/lib/idris/rts/libidris_rts.a")) - (rename-file (string-append static filename) - (string-append out filename)))))))) + (apply (assoc-ref %standard-phases 'check) args))))))) (native-search-paths (list (search-path-specification (variable "IDRIS_LIBRARY_PATH") -- cgit 1.4.1 From 156da54a5059a124ac208f164ed08c8c322c7480 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Feb 2023 12:45:09 +0200 Subject: gnu: moe: Update to 1.13. * gnu/packages/moe.scm (moe): Update to 1.13. --- gnu/packages/moe.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/moe.scm b/gnu/packages/moe.scm index 82db1621db..a1926f738b 100644 --- a/gnu/packages/moe.scm +++ b/gnu/packages/moe.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2017 Eric Bavier -;;; Copyright © 2016, 2019, 2021 Efraim Flashner +;;; Copyright © 2016, 2019, 2021, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-public moe (package (name "moe") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/moe/moe-" version ".tar.lz")) (sha256 - (base32 "1s51swk8h5k32r2z4i1pla2l15b0v0mh35lwsd5f1y16whmmz24a")))) + (base32 "0sql4r5g60k3rsz8vsr04rl5b873rwli1x75333xd29ga6y5g9a3")))) (build-system gnu-build-system) (native-inputs (list lzip)) (inputs (list ncurses)) -- cgit 1.4.1 From 9beaf9ba82f31c05971a6d48a9b7457f65d46e48 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 12:51:50 +0100 Subject: gnu: adwaita-icon-theme: Update to 43. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 43. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 620f5953d9..d933e1fbfa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2922,7 +2922,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (define-public adwaita-icon-theme (package (name "adwaita-icon-theme") - (version "42.0") + (version "43") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2930,7 +2930,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1q5i31zd5jzr12p6vn831afwnzbzf6x73wna1y86drnyr2nvb1ay")))) + "1iiflc6rfpshipl23mszlv2lzm8d1a7pxwsx2ma5bam669ywffif")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 9928b6c49565d130599d92d5f6b906c260534d36 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 12:43:01 +0100 Subject: gnu: xarchiver: Update to 0.5.4.20. * gnu/packages/compression.scm (xarchiver): Update to 0.5.4.20. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0d14078fb7..e58fd65e49 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2577,7 +2577,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.17") + (version "0.5.4.20") (source (origin (method git-fetch) @@ -2586,7 +2586,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v")))) + (base32 "1bgc8r2ii96ghslfscpjhswjgscvw65h2rjr0zvfqn8saqh1ydrv")))) (build-system glib-or-gtk-build-system) (native-inputs (list gettext-minimal intltool libxslt pkg-config)) -- cgit 1.4.1 From 517740d1ddc2b795a380857731860e44018a1b34 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 12:20:02 +0100 Subject: gnu: network-manager-applet: Update to 1.30.0. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.30.0. [inputs]: Remove libnotify. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d933e1fbfa..1805fcafcb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8901,7 +8901,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -8909,7 +8909,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "17742kgmbj9w545zwnirgr0i40zl0xzp8jx7b8c1krp93mc4h0sw")))) + "1lswxfxjfbiknspwli8d65i0bnyfazzcnrqckaw0s44zkm7bh5lm")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -8930,7 +8930,6 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") (list gcr libappindicator libgudev - libnotify libsecret libselinux jansson ; for team support -- cgit 1.4.1 From bf9db382915d3b8d16c6332c90c4b2f50f212ebd Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 12:11:30 +0100 Subject: gnu: simple-scan: Update to 42.5. * gnu/packages/gnome.scm (simple-scan): Update to 42.5. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1805fcafcb..a13fbb2436 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7255,7 +7255,7 @@ USB transfers with your high-level application or system daemon.") (define-public simple-scan (package (name "simple-scan") - (version "42.1") + (version "42.5") (source (origin (method url-fetch) @@ -7263,7 +7263,7 @@ USB transfers with your high-level application or system daemon.") (version-major version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "09i23f8j3knppyxmikzfq9s09xarsgp9sqx9mfyvas8p3ihw16w5")))) + (base32 "0l201qjig6bk34bw8d77jcbhjhn4swfqdj84sjlyy1p2x6jdzx85")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit 1.4.1 From a52074001ffe01d6d864f0b70d624b6a0a64bba7 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 11:55:37 +0100 Subject: gnu: mpg123: Update to 1.31.2. * gnu/packages/mp3.scm (mpg123): Update to 1.31.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 3aa24c75ab..80e3b35469 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -409,7 +409,7 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.28.2") + (version "1.31.2") (source (origin (method url-fetch) @@ -419,7 +419,7 @@ This package contains the binary.") "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 - (base32 "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy")))) + (base32 "1pn777l9m7qbsx4v93gnav8bf6yi3skzdz8x81mkpx1ibs824zxi")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs -- cgit 1.4.1 From 8d0a8ca1a9fcf1e2ee99db5c4f3b31b8afd480dd Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 11:30:24 +0100 Subject: gnu: perl-cgi: Update to 4.55 * gnu/packages/web.scm (perl-cgi): Update to 4.55. [native-inputs]: Remove perl-test-deep. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fd0e68c591..861f3e0419 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2994,17 +2994,17 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.52") + (version "4.55") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/L/LE/LEEJO/" "CGI-" version ".tar.gz")) (sha256 - (base32 "1bxrpxv95js8yinicminxdg41xvd85haj2gvlywg3zqdb66smqy8")))) + (base32 "1ck4ik5i0v394qgg9qah4p6x9hyls311g6iwi6ildprzn6a5x2b7")))) (build-system perl-build-system) (native-inputs - (list perl-test-deep perl-test-nowarnings perl-test-warn)) + (list perl-test-nowarnings perl-test-warn)) (propagated-inputs (list perl-html-parser)) (home-page "https://metacpan.org/release/CGI") -- cgit 1.4.1 From 53a739ae5d05c3278f09e05f0cba13d698031d92 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu via Guix-patches via Date: Sun, 26 Feb 2023 12:59:51 +0100 Subject: gnu: nano: Update to 7.2. * gnu/packages/nano.scm (nano): Update to 7.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index e386c78118..0fd08f8031 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -31,13 +31,13 @@ (define-public nano (package (name "nano") - (version "7.1") + (version "7.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "0dk8820w631ip6hpl7qc8kg5viw7wc154l7fvpvg06bmkcg7bfjp")))) + (base32 "09j5gb44yiv18fvn0iy17jnl9d5lh3gkry4kqv776a5xd0kl9ww6")))) (build-system gnu-build-system) (inputs (list gettext-minimal ncurses)) -- cgit 1.4.1 From 226103fdd1256ae372250fc95163307e14f34d58 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Sun, 26 Feb 2023 01:18:27 -0500 Subject: gnu: clamav: Update to 0.103.8 [security fixes]. Fixes CVE-2023-20032 and CVE-2023-20052. * gnu/packages/antivirus.scm (clamav): Update to 0.103.8. Signed-off-by: Leo Famulari --- gnu/packages/antivirus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index f72ffea1ff..750db04040 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -45,14 +45,14 @@ (define-public clamav (package (name "clamav") - (version "0.103.7") + (version "0.103.8") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "0l3yn4dl4zgpq2qmj29kkd0fksyy1icr0rpp3fyvbcqcc0gw6d0y")) + "0gwcikzfdswrdh5vhh3x4lx8w92476fmb7im7phnv4r7x5pdljbg")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 1a550c93e54aa2ba39cd12af5b0348019e315dd4 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Sun, 26 Feb 2023 20:13:19 +0100 Subject: gnu: Add go-golang.org-x-sync-semaphore. * gnu/packages/golang.scm (go-golang.org-x-sync-semaphore): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c4b6bcd874..7268b661cf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2022 ( ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Timo Wilken ;;; ;;; This file is part of GNU Guix. ;;; @@ -7409,6 +7410,17 @@ common task.") (home-page "https://godoc.org/golang.org/x/sync/errgroup") (license license:bsd-3)))) +(define-public go-golang.org-x-sync-semaphore + (package + (inherit go-golang.org-x-sync-errgroup) + (name "go-golang.org-x-sync-semaphore") + (arguments + '(#:import-path "golang.org/x/sync/semaphore" + #:unpack-path "golang.org/x/sync")) + (synopsis "Weighted semaphore implementation in Go") + (description "Weighted semaphore implementation in Go.") + (home-page "https://godoc.org/golang.org/x/sync/semaphore"))) + (define (go-gotest-tools-source version sha256-base32-hash) (origin (method git-fetch) -- cgit 1.4.1 From ec8c7370dfd66136f7cb517d31fa6fda31e2cb74 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Sun, 26 Feb 2023 20:13:20 +0100 Subject: gnu: Add go-github-com-robfig-cron-1.2. * gnu/packages/check.scm (go-github-com-robfig-cron-1.2): New variable. Signed-off-by: Leo Famulari --- gnu/packages/check.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0866558ac2..c928d11f64 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo +;;; Copyright © 2023 Timo Wilken ;;; ;;; This file is part of GNU Guix. ;;; @@ -1028,6 +1029,24 @@ C++ but is used in C and C++ projects and frequently used in embedded systems but it works for any C/C++ project.") (license license:bsd-3))) +;; Required by actionlint. The version of `go-github-com-robfig-cron' +;; packaged in Guix is newer and changed some error messages, causing +;; unit tests in actionlint to fail. +(define-public go-github-com-robfig-cron-1.2 + (package + (inherit go-github-com-robfig-cron) + (name "go-github-com-robfig-cron") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robfig/cron") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) + (define-public python-parameterized (package (name "python-parameterized") -- cgit 1.4.1 From eb87d2c4a0b5d817e50a43d9f16d204650dc02e8 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Sun, 26 Feb 2023 20:13:21 +0100 Subject: gnu: Add actionlint. Actionlint is a linter for GitHub Action workflow files. * gnu/packages/check.scm (actionlint): New variable. Signed-off-by: Leo Famulari --- gnu/packages/check.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c928d11f64..4e907afeb6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1047,6 +1047,58 @@ but it works for any C/C++ project.") (base32 "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) +(define-public actionlint + (package + (name "actionlint") + (version "1.6.23") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rhysd/actionlint") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/rhysd/actionlint/cmd/actionlint" + #:unpack-path "github.com/rhysd/actionlint" + #:install-source? #f)) + (inputs (list go-github-com-fatih-color + go-github-com-mattn-go-colorable + go-github-com-mattn-go-runewidth + go-github-com-robfig-cron-1.2 + go-golang.org-x-sync-errgroup + go-golang.org-x-sync-semaphore + go-gopkg-in-yaml-v3)) + (native-inputs (list go-github-com-google-go-cmp-cmp)) + (home-page "https://rhysd.github.io/actionlint/") + (synopsis "Static checker for GitHub Actions workflow files") + (description + "actionlint is a static checker for GitHub Actions +workflow files. Features include: + +@itemize +@item Syntax check for workflow files to check unexpected or missing +keys following workflow syntax +@item Strong type check for @code{$@{@{ @}@}} expressions to catch +several semantic errors like access to not existing property, type +mismatches, ... +@item Actions usage check to check that inputs at @code{with:} and +outputs in @code{steps.@{id@}.outputs} are correct +@item Reusable workflow check to check inputs/outputs/secrets of +reusable workflows and workflow calls +@item shellcheck and pyflakes integrations for scripts at @code{run:} +@item Security checks; script injection by untrusted inputs, +hard-coded credentials +@item Other several useful checks; glob syntax validation, +dependencies check for @code{needs:}, runner label validation, cron +syntax validation, ... +@end itemize +") + (license license:expat))) + (define-public python-parameterized (package (name "python-parameterized") -- cgit 1.4.1 From 6bae14f61479f04a40fee44b1d1d89a33d9e93c0 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 26 Feb 2023 18:29:55 +0000 Subject: gnu: perl-encode: Update to 3.19 [fixes CVE-2021-36770]. * gnu/packages/perl.scm (perl-encode): Update to 3.19. [propagated-inputs]: Remove. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/perl.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7b97e7adfa..41b68baea8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4144,17 +4144,15 @@ the programmer to be mindfulof the space of platform variations.") (define-public perl-encode (package (name "perl-encode") - (version "3.10") + (version "3.19") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DANKOGAI/" "Encode-" version ".tar.gz")) (sha256 - (base32 "1a8rwcrxxhq81jcdvdwns05c65jwr5r6bxvby6vdcr3ny5m91my2")))) + (base32 "1x9f0naqskv9v7dif480vrzfmn8zhvq9g0w3r164v7pnxr4ghqwi")))) (build-system perl-build-system) - (propagated-inputs - (list perl-exporter perl-storable perl-parent)) (home-page "https://metacpan.org/dist/Encode") (synopsis "Character encodings in Perl") (description "Encode module provides the interface between Perl strings and -- cgit 1.4.1 From 3f81ec18e4177f6bbc709b7319ec7d15147b3f1d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Feb 2023 01:04:03 +0100 Subject: gnu: libssh: Fix compilation on GNU/Hurd. * gnu/packages/ssh.scm (libssh)[source]: Add snippet. --- gnu/packages/ssh.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d4a73df335..886cb74070 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022 Ludovic Courtès +;;; Copyright © 2012-2023 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021, 2022 Efraim Flashner @@ -140,7 +140,16 @@ file names. "/libssh-" version ".tar.xz")) (sha256 (base32 - "0zfr9fy4vg1bmz1k836hg9wi20mmaz2sgw61s6464iv1mda2qf87")))) + "0zfr9fy4vg1bmz1k836hg9wi20mmaz2sgw61s6464iv1mda2qf87")) + (modules '((guix build utils))) + (snippet + ;; 'PATH_MAX' is undefined on GNU/Hurd; work around it. + #~(substitute* (find-files "examples" "\\.c$") + (("#include \"examples_common\\.h\"" all) + (string-append all "\n" + "#ifndef PATH_MAX\n" + "# define PATH_MAX 4096\n" + "#endif\n")))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments -- cgit 1.4.1 From 81fbf5d71fb95367a0a93e45a86de5e930589a05 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Feb 2023 01:17:04 +0100 Subject: gnu: texlive-apa6: Update reference to deprecated package. * gnu/packages/tex.scm (texlive-apa6)[inputs]: Replace 'texlive-generic-xstring' with 'texlive-xstring'. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1dc74d848d..f178bafcc2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11294,7 +11294,7 @@ and selecting references used in a publication.") texlive-booktabs texlive-endnotes texlive-etoolbox - texlive-generic-xstring + texlive-xstring texlive-latex-draftwatermark texlive-latex-fancyhdr texlive-latex-float -- cgit 1.4.1 From 17bd0243310754045cdc6cc362c804db4a8f9317 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 27 Feb 2023 07:25:10 +0400 Subject: gnu: Remove emacs-transient from propagated-inputs. emacs-transient is built into emacs already and not required as an explicit dependency anymore, but having it in propagated-inputs can break things in various ways: for example emacs-next have a newer version and automatically pulling older emacs-transient into profile breaks emoji-insert, or emacs-docker. * gnu/packages/emacs-xyz.scm (emacs-piem, emacs-clj-deps-new, emacs-dirvish): Remove emacs-transient from propagated-inputs. --- gnu/packages/emacs-xyz.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bfbf5b1abd..cd4a36beda 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7871,8 +7871,7 @@ Tracker as well as bug identifiers prepared for @code{bug-reference-mode}.") (list b4)) (propagated-inputs (list emacs-elfeed - emacs-notmuch - emacs-transient)) + emacs-notmuch)) (home-page "https://docs.kyleam.com/piem") (synopsis "Glue for working with public-inbox archives") (description "This package provides a collection of Emacs libraries for @@ -11892,7 +11891,6 @@ It is recommended to use @code{clojure-mode} with Paredit or Smartparens.") (base32 "03db3l5klc20wgdaj44scgjfi2mha85bip07ls6pwbi039ls7rvx")))) (build-system emacs-build-system) - (propagated-inputs (list emacs-transient)) (home-page "https://github.com/jpe90/emacs-clj-deps-new") (synopsis "Create Clojure projects from templates") (description @@ -18241,7 +18239,6 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") "1nmp5ci4dvcpih6phfhk66s98lf8b49qd35ymy29kqkf5v4cnwga")) (file-name (git-file-name name version)))) (build-system emacs-build-system) - (propagated-inputs (list emacs-transient)) (arguments (list #:phases -- cgit 1.4.1 From 9ae4846c502b75867b83180bb65d422ff838e4e6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 27 Feb 2023 09:34:09 +0000 Subject: gnu: Fix openmpi related packages. This makes these package definitions compatible with the openmpi package which uses gexps as of f45fc72c282bc14da7212b4acb8fe9707e53aad0. * gnu/packages/mpi.scm (openmpi-c++, java-openmpi, openmpi-thread-multiple)[arguments]: Use gexps. --- gnu/packages/mpi.scm | 55 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e8c20919d7..7918941a79 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -311,7 +311,7 @@ software vendors, application developers and computer science researchers.") (arguments (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) - `(cons "--enable-mpi-cxx" ,flags)))) + #~(cons "--enable-mpi-cxx" #$flags)))) (synopsis "C++ bindings for MPI"))) ;; TODO: javadoc files contain timestamps. @@ -327,34 +327,35 @@ software vendors, application developers and computer science researchers.") ,@(package-native-inputs openmpi))) (outputs '("out")) (arguments - `(#:modules ((guix build gnu-build-system) + (cons* + #:modules '((guix build gnu-build-system) ((guix build ant-build-system) #:prefix ant:) (guix build utils)) - #:imported-modules ((guix build ant-build-system) + #:imported-modules `((guix build ant-build-system) ,@%gnu-build-system-modules) - ,@(substitute-keyword-arguments (package-arguments openmpi) - ((#:configure-flags flags) - `(cons "--enable-mpi-java" ,flags)) - ((#:make-flags flags ''()) - `(append '("-C" "ompi/mpi/java") - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - ;; We could provide the location of the JDK in the configure - ;; flags, but since the configure flags are embedded in the - ;; info binaries that would leave a reference to the JDK in - ;; the "out" output. To avoid this we set JAVA_HOME. - (add-after 'unpack 'set-JAVA_HOME - (lambda* (#:key inputs #:allow-other-keys) - (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) - #t)) - (add-after 'unpack 'link-with-existing-mpi-libraries - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "ompi/mpi/java/c/Makefile.in" - (("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la") - (search-input-file inputs "/lib/libmpi.la"))))) - (add-after 'install 'strip-jar-timestamps - (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) + (substitute-keyword-arguments (package-arguments openmpi) + ((#:configure-flags flags) + #~(cons "--enable-mpi-java" #$flags)) + ((#:make-flags flags ''()) + #~(append '("-C" "ompi/mpi/java") + #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + ;; We could provide the location of the JDK in the configure + ;; flags, but since the configure flags are embedded in the + ;; info binaries that would leave a reference to the JDK in + ;; the "out" output. To avoid this we set JAVA_HOME. + (add-after 'unpack 'set-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + #t)) + (add-after 'unpack 'link-with-existing-mpi-libraries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ompi/mpi/java/c/Makefile.in" + (("\\$\\(top_builddir\\)/ompi/lib@OMPI_LIBMPI_NAME@.la") + (search-input-file inputs "/lib/libmpi.la"))))) + (add-after 'install 'strip-jar-timestamps + (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))))) (synopsis "Java bindings for MPI"))) (define-public openmpi-thread-multiple @@ -363,7 +364,7 @@ software vendors, application developers and computer science researchers.") (arguments (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) - `(cons "--enable-mpi-thread-multiple" ,flags)))) + #~(cons "--enable-mpi-thread-multiple" #$flags)))) (description "This version of Open@tie{}MPI has an implementation of @code{MPI_Init_thread} that provides @code{MPI_THREAD_MULTIPLE}. This won't work correctly with all transports (such as @code{openib}), and the -- cgit 1.4.1 From 4ca869d151637382e8c74908e6d2671d9cea805c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:45 +0000 Subject: gnu: cl-sdl2: Update to 0.0.0-2.80410b5. * gnu/packages/lisp-xyz.scm (sbcl-sdl2): Update to 0.0.0-2.80410b5. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a4e0c89694..648141b19b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20122,8 +20122,8 @@ except system libraries.") (sbcl-package->cl-source-package sbcl-glop)) (define-public sbcl-sdl2 - (let ((commit "bb2aa2a41cf799e3bb1ddf50de41fe389c6db668") - (revision "1")) + (let ((commit "80410b514570ca06894675d4a2a5fc93287ea7b6") + (revision "2")) (package (name "sbcl-sdl2") (version (git-version "0.0.0" revision commit)) @@ -20135,7 +20135,7 @@ except system libraries.") (commit commit))) (file-name (git-file-name "cl-sdl2" version)) (sha256 - (base32 "1a4904310z2wwq80grnlixmyz30452vgd4lh74y105j2yrr43z97")))) + (base32 "0sjy4k04k0hdhwpr57ns16ag3za0kz4laclbk17i91ql7qdjw9z2")))) (build-system asdf-build-system/sbcl) (arguments `(#:phases -- cgit 1.4.1 From 945edb86543d06fb7809d9c0c405a60ea03e7556 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:46 +0000 Subject: gnu: cl-sdl2: Remove input labels. * gnu/packages/lisp.scm (sbcl-sdl2): [arguments]{asd-systems}: Add sdl2/examples. {phases}: Remove trailing #f from lambda, use search-input-file to link SO library. [inputs]: Remove labels, add sbcl-cl-opengl. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 648141b19b..4772be6cef 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20138,21 +20138,22 @@ except system libraries.") (base32 "0sjy4k04k0hdhwpr57ns16ag3za0kz4laclbk17i91ql7qdjw9z2")))) (build-system asdf-build-system/sbcl) (arguments - `(#:phases + `(#:asd-systems '("sdl2" "sdl2/examples") + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/library.lisp" - (("libSDL2-2.0.so.0" all) - (string-append (assoc-ref inputs "libsdl2") "/lib/" all))) - #t))))) + (("libSDL2-2.0.so.0") + (search-input-file inputs "/lib/libSDL2-2.0.so.0")))))))) (inputs - `(("alexandria" ,sbcl-alexandria) - ("cl-autowrap" ,sbcl-cl-autowrap) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("libsdl2" ,sdl2) - ("trivial-channels" ,sbcl-trivial-channels) - ("trivial-features" ,sbcl-trivial-features))) + (list sbcl-alexandria + sbcl-cl-autowrap + sbcl-cl-opengl + sbcl-cl-ppcre + sbcl-trivial-channels + sbcl-trivial-features + sdl2)) (home-page "https://github.com/lispgames/cl-sdl2") (synopsis "Common Lisp bindings for SDL2 using C2FFI") (description -- cgit 1.4.1 From ad854e06b4300d70bcb04ca8ed483d864f3114c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:47 +0000 Subject: gnu: Add cl-sdl2-mixer. * gnu/packages/lisp-xyz.scm (cl-sdl2-mixer, ecl-sdl2-mixer, sbcl-sdl2-mixer): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4772be6cef..94abb1c1e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20209,6 +20209,49 @@ C Library.") (define-public cl-sdl2-image (sbcl-package->cl-source-package sbcl-sdl2-image)) +(define-public sbcl-sdl2-mixer + (let ((commit "fdcc7ee7935dd01fd338e22690451db2cf126156") + (revision "1")) + (package + (name "sbcl-sdl2-mixer") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lispgames/cl-sdl2-mixer") + (commit commit))) + (file-name (git-file-name "cl-sdl2-mixer" version)) + (sha256 + (base32 "0g6ywb3gqr0rif4z6kkz6m8vyv8nrr5wr1w9sc6d3zypbbnqgbp6")))) + (build-system asdf-build-system/sbcl) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/library.lisp" + (("libSDL2_mixer-2.0.so.0") + (search-input-file inputs "/lib/libSDL2_mixer-2.0.so.0")))))))) + (inputs + (list sbcl-alexandria + sbcl-cl-autowrap + sbcl-sdl2 + sbcl-trivial-garbage + sdl2-mixer)) + (home-page "https://github.com/lispgames/cl-sdl2-mixer") + (synopsis "Bindings for sdl2_mixer using autowrap for Common Lisp") + (description + "This package provides a Common Lisp wrapper system for the SDL 2.0 Mixer C +Library.") + (license license:expat)))) + +(define-public ecl-sdl2-mixer + (sbcl-package->ecl-package sbcl-sdl2-mixer)) + +(define-public cl-sdl2-mixer + (sbcl-package->cl-source-package sbcl-sdl2-mixer)) + (define-public sbcl-sdl2-ttf (let ((commit "6dd2df2fb3a79ec4f835e3bc882e60e8da039878") (revision "1")) -- cgit 1.4.1 From a71e4554419e48cf24bb7f96b6e3f74427d65de5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:48 +0000 Subject: gnu: Add cl-cairo2. * gnu/packages/lisp-xyz.scm (cl-cairo2, ecl-cl-cairo2, sbcl-cl-cairo2): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 94abb1c1e9..102437c2bf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3567,6 +3567,57 @@ not counting tests) (define-public ecl-let-plus (sbcl-package->ecl-package sbcl-let-plus)) +(define-public sbcl-cl-cairo2 + (let ((commit "41ae45aac86553c46f4bb460f80e1fb620930f5b") + (revision "1")) + (package + (name "sbcl-cl-cairo2") + (version (git-version "0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpav/cl-cairo2") + (commit commit))) + (file-name (git-file-name "cl-cairo2" version)) + (sha256 + (base32 "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-systems '(;; "cl-cairo2-gtk2" ; cl-gtk2 is not packed and quite old. + ;; "cl-cairo2-quartz" ; Failing when enabled. + ;; "cl-cairo2-xlib" ; cl-xcb-xlib is not packed yet and quite old. + ;; "cl-cairo2-xcb" + "cl-cairo2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/load-libraries.lisp" + (("libcairo.so.2") + (search-input-file inputs "/lib/libcairo.so.2")))))))) + (inputs + (list cairo + sbcl-cffi + sbcl-cl-colors + sbcl-cl-freetype2 + sbcl-cl-utilities + sbcl-metabang-bind + sbcl-trivial-features + sbcl-trivial-garbage)) + (home-page "https://github.com/rpav/cl-cairo2") + (synopsis "Cairo bindings for Common Lisp") + (description + "This package provides CFFI bindings for Common Lisp to the Cairo +C library.") + (license license:boost1.0)))) + +(define-public ecl-cl-cairo2 + (sbcl-package->ecl-package sbcl-cl-cairo2)) + +(define-public cl-cairo2 + (sbcl-package->cl-source-package sbcl-cl-cairo2)) + (define-public sbcl-cl-colors (let ((commit "827410584553f5c717eec6182343b7605f707f75")) (package -- cgit 1.4.1 From 55054c1235ff2048079d4b83840cf22a61d04e5a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:49 +0000 Subject: gnu: Add cl-calm. * gnu/packages/lisp-xyz.scm (cl-calm, ecl-calm, sbcl-calm): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 102437c2bf..dcc0778975 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2801,6 +2801,40 @@ libraries such as Bordeaux-Threads and Eager Future.") (define-public ecl-calispel (sbcl-package->ecl-package sbcl-calispel)) +(define-public sbcl-calm + (package + (name "sbcl-calm") + (version "0.0.35") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/VitoVan/calm") + (commit version))) + (file-name (git-file-name "cl-calm" version)) + (sha256 + (base32 "1k1kwpiq7ikk1mgfi26sd968d623jl6xffngd9vwswnaiwihk4dp")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-cl-cairo2 + sbcl-cl-str + sbcl-sdl2 + sbcl-sdl2-image + sbcl-sdl2-mixer + sbcl-slime-swank)) + (home-page "https://github.com/VitoVan/calm") + (synopsis "Vector graphic library for Common Lisp") + (description + "This package provides a SDL2 based vector graphic library for Common +Lisp.") + (license license:gpl2))) + +(define-public cl-calm + (sbcl-package->cl-source-package sbcl-calm)) + +(define-public ecl-calm + (sbcl-package->ecl-package sbcl-calm)) + (define-public sbcl-esrap (let ((commit "4c82a863871e117f0041b9ef37e61c0b62318aa7") (revision "3")) -- cgit 1.4.1 From 90188a66b420ef9d700c053f99ade2bc393b43e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Feb 2023 15:06:20 +0200 Subject: gnu: debian-ports-archive-keyring: Update to 2023.02.21. * gnu/packages/debian.scm (debian-ports-archive-keyring): Update to 2023.02.01. [arguments]: Remove trailing #t from phases. --- gnu/packages/debian.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index c962adf27f..dd2d68d482 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2018, 2020-2023 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; @@ -89,7 +89,7 @@ contains the archive keys used for that.") (define-public debian-ports-archive-keyring (package (name "debian-ports-archive-keyring") - (version "2022.02.15") + (version "2023.02.01") (source (origin (method url-fetch) @@ -98,7 +98,7 @@ contains the archive keys used for that.") "/debian-ports-archive-keyring_" version ".tar.xz")) (sha256 (base32 - "096m45l7g8vbk67gwc6bmkzpx8mhn6xfglgrzlg9xkgcs5gxqyc0")))) + "1xq7i6plgfbf4drqdmmk1yija48x11jmhnk2av3cajn2cdhkw73s")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; No test suite. @@ -127,8 +127,7 @@ contains the archive keys used for that.") (string-append "trusted.gpg/" (basename key ".key") ".gpg") (lambda _ (apply invoke "gpg" (append gpg-options (list key)))))) - (find-files "active-keys")) - #t))) + (find-files "active-keys"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -138,8 +137,7 @@ contains the archive keys used for that.") (install-file "debian-ports-archive-keyring-removed.gpg" key) (for-each (lambda (file) (install-file file apt)) - (find-files "trusted.gpg" "\\.gpg$"))) - #t))))) + (find-files "trusted.gpg" "\\.gpg$")))))))) (native-inputs (list gnupg)) (home-page "https://tracker.debian.org/pkg/debian-ports-archive-keyring") -- cgit 1.4.1 From 5e23071aa9fc57b471d301fba7a981720743eb6b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Feb 2023 15:06:59 +0200 Subject: gnu: debootstrap: Update to 1.0.128. * gnu/packages/debian.scm (debootstrap): Update to 1.0.128. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index dd2d68d482..0f57328249 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -192,7 +192,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.126") + (version "1.0.128") (source (origin (method git-fetch) @@ -201,7 +201,7 @@ contains the archive keys used for that.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7")))) + (base32 "0hc7xc6qvnmjlpf3j6bm25kf0j1ifvv5j7a0iljfmbag4idxc9jv")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 2cf07434d8ae1751c1dc940ebeb33a586604566e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Feb 2023 15:07:32 +0200 Subject: gnu: dpkg: Update to 1.21.21. * gnu/packages/debian.scm (dpkg): Update to 1.21.21. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 0f57328249..0fe137de7c 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -337,7 +337,7 @@ distributions such as Debian and Trisquel.") (define-public dpkg (package (name "dpkg") - (version "1.21.12") + (version "1.21.21") (source (origin (method git-fetch) @@ -346,7 +346,7 @@ distributions such as Debian and Trisquel.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08a72lhkgz4iiimdkqlmf58m31zrwqcs0741nbxxq1x3s9phc25m")))) + (base32 "0vgc5irrjyyb5y5hza2hbq3dgfylrxvfdzysw8zzlhgf4bhm69zq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 47a14185b1bcf11c4949e3bca95d5136d73e1e40 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Sat, 11 Feb 2023 00:29:31 +1000 Subject: gnu: Add scheme48-prescheme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scheme.scm (scheme48-prescheme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/scheme.scm | 132 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index d2f369282a..ddf77c53c6 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Morgan Smith ;;; Copyright © 2022 jgart ;;; Copyright © 2022 Robby Zambito +;;; Copyright © 2023 Andrew Whatson ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ asl2.0 bsd-3 cc-by-sa4.0 non-copyleft expat public-domain)) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -409,6 +411,136 @@ implementation techniques and as an expository tool.") ;; Most files are BSD-3; see COPYING for the few exceptions. (license bsd-3))) +(define-public scheme48-prescheme + (package + (inherit scheme48) + (name "scheme48-prescheme") + (arguments + (list + #:tests? #f ; tests only cover scheme48 + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'patch-prescheme-version + (lambda _ + ;; Ensure the Pre-Scheme version matches the package version + (call-with-output-file "ps-compiler/minor-version-number" + (lambda (port) + (let* ((version #$(package-version this-package)) + (vparts (string-split version #\.)) + (vminor (string-join (drop vparts 1) "."))) + (write vminor port)))))) + (add-after 'configure 'patch-prescheme-headers + (lambda _ + ;; Rename "io.h" to play nicely with others + (copy-file "c/io.h" "c/prescheme-io.h") + (substitute* "c/prescheme.h" + (("^#include \"io\\.h\"") + "#include \"prescheme-io.h\"")))) + (add-after 'configure 'generate-pkg-config + (lambda _ + ;; Generate a pkg-config file + (call-with-output-file "prescheme.pc" + (lambda (port) + (let ((s48-version #$(package-version scheme48)) + (version #$(package-version this-package))) + (format port (string-join + '("prefix=~a" + "exec_prefix=${prefix}" + "libdir=${prefix}/lib/scheme48-~a" + "includedir=${prefix}/include" + "" + "Name: Pre-Scheme (Scheme 48)" + "Description: Pre-Scheme C runtime" + "Version: ~a" + "Libs: -L${libdir} -lprescheme" + "Cflags: -I${includedir}") + "\n" 'suffix) + #$output s48-version version)))))) + (add-after 'configure 'generate-prescheme-wrapper + (lambda _ + ;; Generate a wrapper to load and run ps-compiler.image + (call-with-output-file "prescheme" + (lambda (port) + (let ((s48-version #$(package-version scheme48))) + (format port (string-join + '("#!/bin/sh" + "scheme48=~a/lib/scheme48-~a/scheme48vm" + "prescheme=~a/lib/scheme48-~a/prescheme.image" + "exec ${scheme48} -i ${prescheme} \"$@\"") + "\n" 'suffix) + #$scheme48 s48-version #$output s48-version)))) + (chmod "prescheme" #o755))) + (replace 'build + (lambda _ + ;; Build a minimal static library for linking Pre-Scheme code + (let ((lib "c/libprescheme.a") + (objs '("c/unix/io.o" + "c/unix/misc.o"))) + (apply invoke "make" objs) + (apply invoke "ar" "rcs" lib objs)) + ;; Dump a Scheme 48 image with both the Pre-Scheme compatibility + ;; library and compiler pre-loaded, courtesy of Taylor Campbell's + ;; Pre-Scheme Manual: + ;; https://groups.scheme.org/prescheme/1.3/#Invoking-the-Pre_002dScheme-compiler + (with-directory-excursion "ps-compiler" + (let ((version #$(package-version this-package)) + (port (open-pipe* OPEN_WRITE "scheme48"))) + (format port (string-join + '(",batch" + ",config ,load ../scheme/prescheme/interface.scm" + ",config ,load ../scheme/prescheme/package-defs.scm" + ",exec ,load load-ps-compiler.scm" + ",in prescheme-compiler prescheme-compiler" + ",user (define prescheme-compiler ##)" + ",dump ../prescheme.image \"(Pre-Scheme ~a)\"" + ",exit") + "\n" 'suffix) + version) + (close-pipe port))))) + (replace 'install + (lambda _ + (let* ((s48-version #$(package-version scheme48)) + (bin-dir (string-append #$output "/bin")) + (lib-dir (string-append #$output "/lib/scheme48-" s48-version)) + (pkgconf-dir (string-append #$output "/lib/pkgconfig")) + (share-dir (string-append #$output "/share/scheme48-" s48-version)) + (include-dir (string-append #$output "/include"))) + ;; Install Pre-Scheme compiler image + (install-file "prescheme" bin-dir) + (install-file "prescheme.image" lib-dir) + ;; Install Pre-Scheme config, headers, and lib + (install-file "prescheme.pc" pkgconf-dir) + (install-file "c/prescheme.h" include-dir) + (install-file "c/prescheme-io.h" include-dir) + (install-file "c/libprescheme.a" lib-dir) + ;; Install Pre-Scheme sources + (copy-recursively "scheme/prescheme" + (string-append share-dir "/prescheme")) + (copy-recursively "ps-compiler" + (string-append share-dir "/ps-compiler")) + ;; Remove files specific to building the Scheme 48 VM + (for-each (lambda (file) + (delete-file (string-append share-dir "/" file))) + '("ps-compiler/compile-bibop-gc-32.scm" + "ps-compiler/compile-bibop-gc-64.scm" + "ps-compiler/compile-gc.scm" + "ps-compiler/compile-twospace-gc-32.scm" + "ps-compiler/compile-twospace-gc-64.scm" + "ps-compiler/compile-vm-no-gc-32.scm" + "ps-compiler/compile-vm-no-gc-64.scm")))))))) + (propagated-inputs (list scheme48)) + (home-page "http://s48.org/") + (synopsis "Pre-Scheme compiler from Scheme 48") + (description + "Pre-Scheme is a statically compilable dialect of Scheme, used to implement the +Scheme 48 virtual machine. Scheme 48 ships with a Pre-Scheme to C compiler written +in Scheme, and a runtime library which allows Pre-Scheme code to run as Scheme.") + (license bsd-3))) + (define-public gambit-c (package (name "gambit-c") -- cgit 1.4.1 From 137390e66cf2e0f835200861376667f24518bdea Mon Sep 17 00:00:00 2001 From: Jake Leporte Date: Sun, 26 Feb 2023 18:47:41 -0600 Subject: gnu: Add font-microsoft-cascadia. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-microsoft-cascadia): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4e7b7d0ac3..13699cdfce 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1266,6 +1266,30 @@ work well in user interface (UI) environments.") Sans Pro family.") (license license:silofl1.1))) +(define-public font-microsoft-cascadia + (package + (name "font-microsoft-cascadia") + (version "2111.01") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append + "https://github.com/microsoft/cascadia-code/" + "releases/download/v" + version + "/CascadiaCode-" + version + ".zip")) + (sha256 + (base32 + "04p72jmbafblrliy5phqi6sqi52wgzpilf3rphppxf7zdlbnizai")))) + (build-system font-build-system) + (home-page "https://github.com/microsoft/cascadia-code") + (synopsis "Monospaced font with programming ligatures") + (description + "Cascadia is a fun new coding font that comes bundled with Windows +Terminal, and is now the default font in Visual Studio as well.") + (license license:silofl1.1))) + (define-public font-fira-sans ;; Fira Sans v4.203 (which corresponds to Fira Mono v3.206) is the final ;; version to include UFO sources. It is the same version packaged by other -- cgit 1.4.1 From 5ed49cc42bb47fec92dea694d10d9698915b0a6f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 9 Feb 2023 16:43:02 +0800 Subject: gnu: podman: Update to 4.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/containers.scm (podman): Update to 4.4.1. [native-inputs]: Replace go to go-1.19. Signed-off-by: Ludovic Courtès --- gnu/packages/containers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 272b67c38d..b402bbde6a 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -311,7 +311,7 @@ configure network interfaces in Linux containers.") (define-public podman (package (name "podman") - (version "4.3.1") + (version "4.4.1") (source (origin (method git-fetch) @@ -323,7 +323,7 @@ configure network interfaces in Linux containers.") (snippet '(substitute* "Makefile" ((".*hack/btrfs.*") ""))) (sha256 - (base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h")) + (base32 "0qbr6rbyig3c2hvdvmd94jjkg820hpdz6j7dgyv62dl6wfwvj5jj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -385,7 +385,7 @@ configure network interfaces in Linux containers.") (native-inputs (list bats git - go + go-1.19 ; strace ; XXX debug pkg-config python)) -- cgit 1.4.1 From 7c4c61919c7977930347ca5950b0f6a68b870561 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 10 Feb 2023 15:06:53 +0000 Subject: gnu: Add libnvme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (libnvme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f9d75f8c6b..3635cee1fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5039,6 +5039,35 @@ IDE driver subsystem. Many external USB drive enclosures with SCSI-ATA Command Translation (@dfn{SAT}) are also supported.") (license (license:non-copyleft "file://LICENSE.TXT")))) +(define-public libnvme + (package + (name "libnvme") + (version "1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linux-nvme/libnvme.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1fngj5acp2sl4162xalq5simfasnika6gy0xrbi41x09wikvhn7y")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (arguments + (list + #:configure-flags #~(list (format #f "-Dhtmldir=~a/share/doc/~a/html" + #$output #$name) + "-Ddocs-build=true" "-Ddocs=all"))) + (native-inputs (list pkg-config perl python python-sphinx)) + ;; libnvme.pc, libnvme-mi.pc lists these in Requires.private. + (propagated-inputs (list dbus json-c openssl)) + (home-page "https://github.com/linux-nvme/libnvme") + (synopsis "C Library for NVM Express on Linux") + (description "libnvme provides type definitions for NVMe specification +structures, enumerations, and bit fields, helper functions to construct, +dispatch, and decode commands and payloads, and utilities to connect, scan, +and manage nvme devices on a Linux system.") + (license license:lgpl2.1+))) + (define-public nvme-cli (package (name "nvme-cli") -- cgit 1.4.1 From 7edf42ddf7c452c1071113ed0913240535f50df2 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 10 Feb 2023 15:06:54 +0000 Subject: gnu: nvme-cli: Update to 2.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (nvme-cli): Update to 2.3. [build-system]: Switch to meson-build-system. [arguments]: Remove stages. Build documentation. [native-inputs]: Add pkg-config. [inputs]: Add libnvme, json-c and zlib. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3635cee1fa..3601744c51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5071,7 +5071,7 @@ and manage nvme devices on a Linux system.") (define-public nvme-cli (package (name "nvme-cli") - (version "1.16") + (version "2.3") (home-page "https://github.com/linux-nvme/nvme-cli") (source (origin (method git-fetch) @@ -5079,22 +5079,16 @@ and manage nvme devices on a Linux system.") (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "130x5cf6kkcnyg5qd35igii249ysfjnbxp1pxfwkickmqg3d007z")) + (base32 "1f3bhxh2kr94s6glzibrmgxxgs66qyabn8plnw5y0v9cpi78b3qs")) (file-name (git-file-name name version)))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - (list #:make-flags - #~(list (string-append "CC=" #$(cc-for-target))) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) ; no ./configure script - (replace 'install - (lambda _ - (invoke "make" "install-spec" "PREFIX=" - (string-append "DESTDIR=" #$output))))) - ;; The tests require sysfs, which is not accessible from from the - ;; build environment. - #:tests? #f)) + (list + #:configure-flags #~(list (format #f "-Dhtmldir=~a/share/doc/~a/html" + #$output #$name) + "-Ddocs=all"))) + (native-inputs (list pkg-config)) + (inputs (list libnvme json-c zlib)) (synopsis "NVM-Express user space tooling for Linux") (description "Nvme-cli is a utility to provide standards compliant tooling for NVM-Express drives. It was made specifically for Linux as it relies on the -- cgit 1.4.1 From be8714b07af70d9bc72f9798970627d0a696ce94 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 13 Feb 2023 16:01:11 -0500 Subject: gnu: hwloc: Remove obsolete comments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hwloc 2.x become the default with commit 8ec7ca22d3, "gnu: hwloc: Default to 2.x.". * gnu/packages/mpi.scm (hwloc-1): Remove obsolete comment. (hwloc-2): Remove obsolete comment. Signed-off-by: Ludovic Courtès --- gnu/packages/mpi.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 7918941a79..b318acd4b9 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -54,8 +54,6 @@ #:use-module (ice-9 match)) (define-public hwloc-1 - ;; Note: For now we keep 1.x as the default because many packages have yet - ;; to migrate to 2.0. (package (name "hwloc") (version "1.11.13") @@ -141,7 +139,6 @@ bind processes, and much more.") (license license:bsd-3))) (define-public hwloc-2 - ;; Note: 2.x isn't the default yet, see above. (package (inherit hwloc-1) (version "2.9.0") -- cgit 1.4.1 From cf9e0508b26196dc985302776d860a0359652c59 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 13 Feb 2023 16:01:12 -0500 Subject: gnu: hwloc: Skip failing test on non-x86 systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpi.scm (hwloc-2)[arguments]<#:phases>: Rename "skip-test-that-requires-/sys" phase to "skip-tests-that-require-/sys" and expand to skip additional test requiring /sys on non-x86 systems. Signed-off-by: Ludovic Courtès --- gnu/packages/mpi.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index b318acd4b9..baef62616f 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -165,10 +165,19 @@ bind processes, and much more.") (substitute* "tests/hwloc/linux-libnuma.c" (("numa_available\\(\\)") "-1")))) - (add-before 'check 'skip-test-that-requires-/sys + (add-before 'check 'skip-tests-that-require-/sys (lambda _ ;; 'test-gather-topology.sh' requires /sys as of 2.9.0; skip it. - (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0"))) + (setenv "HWLOC_TEST_GATHER_TOPOLOGY" "0") + + ;; 'hwloc_backends' also requires /sys on non-x86 systems, for + ;; which hwloc lacks a topology backend not reliant on the + ;; operating system; skip it also on these machines. + (substitute* "tests/hwloc/hwloc_backends.c" + ,@(if (not (target-x86?)) + '((("putenv\\(\\(char \\*\\) \"HWLOC_L" all) + (string-append "exit (77);\n" all))) + '())))) (add-before 'check 'skip-test-that-fails-on-qemu (lambda _ ;; Skip test that fails on emulated hardware due to QEMU bug: -- cgit 1.4.1 From e0ea8fb1ea3fdc88829561059ac4f2bece9637b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:07:28 +0100 Subject: gnu: Add gst-plugins-espeak. * gnu/packages/gstreamer.scm (gst-plugins-espeak): New variable. --- gnu/packages/gstreamer.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index ecaf291d6f..2bb4d48991 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2016, 2017, 2022 Efraim Flashner ;;; Copyright © 2016, 2018 Leo Famulari -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2023 Ricardo Wurmus ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Liliana Marie Prikler @@ -1158,3 +1158,29 @@ framework. It plays all file formats gstreamer supports, so if you have a music collection which contains different file formats, like flac, ogg and mp3, you can use gst123 to play all your music files.") (license license:lgpl2.0+))) + +(define-public gst-plugins-espeak + (let ((commit "7f6e41274fb833a487a7ee8ac0c236f0821330cc") + (revision "1")) + (package + (name "gst-plugins-espeak") + (version (git-version "0.5.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/gst-plugins-espeak") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0va4ghcdda8cbqzv376hgmv1ay79va4kyazibfj8m5n52bhxxqgz")))) + (build-system gnu-build-system) + (inputs + (list espeak-ng gstreamer gst-plugins-base)) + (native-inputs + (list autoconf automake libtool pkg-config)) + (home-page "http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak") + (synopsis "Use espeak ") + (description "This is a Gstreamer @code{src} plugin to use the espeak +speech synthesizer as a sound source.") + (license license:lgpl2.0+)))) -- cgit 1.4.1 From c8c0d53fafb9cfb2b832b435d564dbbe0dd04f19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:08:56 +0100 Subject: gnu: sugar: Patch global location of Sugar activities. * gnu/packages/sugar.scm (sugar)[arguments]: Update build phase 'fix-references to patch activities directory. --- gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index d2df6be012..40a22ffd58 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -101,10 +101,9 @@ (substitute* "extensions/cpsection/background/model.py" (("\\('/usr', 'share', 'backgrounds'\\)") "('TODO')")) - #; (substitute* "src/jarabe/view/viewhelp.py" - (("/usr/share/sugar/activities/Help.activity") - "TODO")))) + (("/usr/share/sugar/activities/") + "/run/current-system/profile/share/sugar/activities/")))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key inputs outputs #:allow-other-keys) (for-each -- cgit 1.4.1 From f14f2752fce03d93400102548f03260a2d11208b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:10:09 +0100 Subject: gnu: sugar-toolkit-gtk3: Add missing inputs. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[propagated-inputs]: Add gstreamer and gst-plugins-espeak. --- gnu/packages/sugar.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 40a22ffd58..7cfdf49b14 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -300,6 +300,8 @@ and metadata, and the journal with querying and full text search.") ;; The gi typelib files are needed by users of this library. (list gdk-pixbuf gobject-introspection + gstreamer ;for speech + gst-plugins-espeak gtk+ (librsvg-for-system) -- cgit 1.4.1 From 596a4db9f99e49d87aa4ee44b7c5fad0c4da0adc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:10:45 +0100 Subject: gnu: sugar: Patch brightness module. * gnu/packages/sugar.scm (sugar)[arguments]: Fix syntax error; disable brightness module. --- gnu/packages/sugar.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 7cfdf49b14..dc1dc912a0 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -95,6 +95,15 @@ (dirname (search-input-file inputs "/share/mobile-broadband-provider-info/serviceproviders.xml")))) + ;; XXX: spawn_command_line_sync is not used correctly here, so + ;; we need to patch invocations. + (substitute* '("extensions/cpsection/aboutcomputer/model.py" + "src/jarabe/model/brightness.py") + (("spawn_command_line_sync\\(cmd\\)") + "spawn_command_line_sync(cmd, 0)")) + ;; XXX: The brightness component crashes, so we disable it here. + (substitute* "src/jarabe/main.py" + (("brightness.get_instance\\(\\)") "")) ;; TODO: these locations should be set to places that exist on ;; Guix System. #; -- cgit 1.4.1 From 37049110a31f4f258ec9635b3e80f4f70023e643 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:11:40 +0100 Subject: gnu: sugar: Propagate sugar packages. * gnu/packages/sugar.scm (sugar)[inputs]: Move sugar-artwork and sugar-datastore from here... [propagated-inputs]: ...to here. --- gnu/packages/sugar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index dc1dc912a0..d43ac9756c 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -127,8 +127,6 @@ metacity mobile-broadband-provider-info python - sugar-artwork - sugar-datastore sugar-toolkit-gtk3 tzdata)) (propagated-inputs @@ -139,6 +137,8 @@ libwnck libxklavier network-manager + sugar-artwork ;for cursor theme + sugar-datastore ;for org.laptop.sugar.DataStore telepathy-glib webkitgtk-with-libsoup2 python-gwebsockets)) -- cgit 1.4.1 From 20aae9ad31b073fec64177d0da399503d11c8c72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:12:18 +0100 Subject: gnu: sugar: Add missing inputs. * gnu/packages/sugar.scm (sugar)[propagated-inputs]: Add gsettings-desktop-schemas, telepathy-mission-control, and upower. --- gnu/packages/sugar.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index d43ac9756c..7c72c1cbfe 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -129,19 +129,27 @@ python sugar-toolkit-gtk3 tzdata)) + ;; Some packages are propagated so that they can be used with gobject + ;; introspection at runtime; others are propagated for their dbus + ;; services. (propagated-inputs - (list gstreamer + (list gsettings-desktop-schemas + gstreamer gtk+ gtksourceview-3 libsoup-minimal-2 libwnck libxklavier network-manager + python-gwebsockets sugar-artwork ;for cursor theme sugar-datastore ;for org.laptop.sugar.DataStore telepathy-glib - webkitgtk-with-libsoup2 - python-gwebsockets)) + ;; This is for org.freedesktop.Telepathy.AccountManager at runtime + telepathy-mission-control + ;; This is for the UPowerGlib namespace + upower + webkitgtk-with-libsoup2)) (native-inputs (list autoconf automake gettext-minimal -- cgit 1.4.1 From c21a2aa1f7f1e291906881c71888b62eeed2faec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:13:04 +0100 Subject: gnu: Add sugar-help-activity. * gnu/packages/sugar.scm (sugar-help-activity): New variable. --- gnu/packages/sugar.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 7c72c1cbfe..fbc8da4206 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -344,3 +344,43 @@ and metadata, and the journal with querying and full text search.") build activities and other Sugar components. This is the GTK+ 3 binding of the Sugar Toolkit.") (license license:lgpl2.1+))) + + +(define-public sugar-help-activity + (let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3") + (revision "1")) + (package + (name "sugar-help-activity") + (version (git-version "20" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/help-activity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0awjbqyc9f74dx0d7fgjk42vfsygxr8jhwqiv4hpggqcawc02xv8")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'install + (lambda _ + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + (native-inputs + (list sugar-toolkit-gtk3)) + (home-page "https://github.com/sugarlabs/help-activity") + (synopsis "Sugar activity for accessing documentation and manuals") + (description "This is an activity for the Sugar environment which aims +to provide users with easy access to documentation and manuals.") + (license license:gpl3+)))) -- cgit 1.4.1 From 6b6e05cd23fba4d9c6191b0713019faf870c3516 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 16:46:06 +0100 Subject: gnu: Add sugar-typing-turtle-activity. * gnu/packages/sugar.scm (sugar-typing-turtle-activity): New variable. --- gnu/packages/sugar.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index fbc8da4206..de5b304497 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -384,3 +384,41 @@ the Sugar Toolkit.") (description "This is an activity for the Sugar environment which aims to provide users with easy access to documentation and manuals.") (license license:gpl3+)))) + +(define-public sugar-typing-turtle-activity + (package + (name "sugar-typing-turtle-activity") + (version "32") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/typing-turtle-activity") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0shadv9wgddjvl97kvsqb8iw1wmmfw5lzcqk78hd70pzvh4c1hmd")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'install + (lambda _ + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + (native-inputs + (list gettext-minimal sugar-toolkit-gtk3)) + (home-page "https://help.sugarlabs.org/en/typing_turtle.html") + (synopsis "Learn typing") + (description "Need some help typing? In this activity for the Sugar +environment you will learn the best way to hold your hands in order for you to +become a faster typist.") + (license license:gpl3+))) -- cgit 1.4.1 From 29a278f65c39032fa8ab503ba603b1c226068aa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Feb 2023 01:00:01 +0100 Subject: gnu: sudo: Update to 1.9.13p2. * gnu/packages/admin.scm (sudo): Update to 1.9.13p2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2d70a13511..35a0162f02 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1970,7 +1970,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.13p1") + (version "1.9.13p2") (source (origin (method url-fetch) (uri @@ -1980,7 +1980,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0hxxagc2v35rzf8jgjdyf92axxbm3mvxm2bx5jhmysz5mj1knak7")) + "0kapjhgyzaqk2nfzzz04ss9x6cy61s79afd3vhgkn0y1wkyh886z")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 086e426d20e84be90f2066b4b5d51f24df7441cf Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 27 Feb 2023 19:49:03 +0100 Subject: gnu: ghc: Disable failing test on i686 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conditionally, so we don’t rebuild GHC on amd64. * gnu/packages/haskell.scm (ghc-9.2)[arguments]: Conditionally add phase 'skip-T21694-i686. --- gnu/packages/haskell.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3406161c7c..16f4e2d530 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1296,7 +1296,16 @@ interactive environment for the functional language Haskell.") (replace 'fix-cc-reference (lambda _ (substitute* "utils/hsc2hs/src/Common.hs" - (("\"cc\"") "\"gcc\"")))))) + (("\"cc\"") "\"gcc\"")))) + ;; FIXME: Remove i686-specific match on the next rebuild cycle. + #$@(match (%current-system) + ("i686-linux" + #~((add-after 'skip-more-tests 'skip-T21694-i686 + (lambda _ + (substitute* '("testsuite/tests/simplCore/should_compile/all.T") + (("^test\\('T21694', \\[ " all) + (string-append all "when(arch('i386'), skip), "))))))) + (_ #~())))) ;; Increase verbosity, so running the test suite does not time out on CI. ((#:make-flags make-flags ''()) #~(cons "VERBOSE=4" #$make-flags)))) -- cgit 1.4.1 From 4db367f8ae4e704784ced52b552437ca00b94b89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 20:28:53 +0100 Subject: gnu: Add r-msa. * gnu/packages/bioconductor.scm (r-msa): New variable. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fa4b8ef89b..8abbdfd026 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6850,6 +6850,37 @@ characterization and visualization of a wide range of mutational patterns in SNV base substitution data.") (license license:expat))) +(define-public r-msa + (package + (name "r-msa") + (version "1.30.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "msa" version)) + (sha256 + (base32 + "064hmry0zhmpchxgjsw0krsybr9v9gbsz26zmj2a39pg1nggwbq4")))) + (properties `((upstream-name . "msa"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocgenerics + r-biostrings + r-iranges + r-rcpp + r-s4vectors)) + (native-inputs (list r-knitr)) + (home-page "http://www.bioinf.jku.at/software/msa/") + (synopsis "Multiple sequence alignment") + (description + "The msa package provides a unified R/Bioconductor interface to the +multiple sequence alignment algorithms ClustalW, ClustalOmega, and Muscle. +All three algorithms are integrated in the package, therefore, they do not +depend on any external software tools and are available for all major +platforms. The multiple sequence alignment algorithms are complemented by a +function for pretty-printing multiple sequence alignments using the LaTeX +package TeXshade.") + (license license:gpl2+))) + (define-public r-msnbase (package (name "r-msnbase") -- cgit 1.4.1 From ac90609644a95952aef2b024f2358bfa94c1249d Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Mon, 27 Feb 2023 08:08:35 -0800 Subject: gnu: parallel: Update to 20230222 * gnu/packages/parallel.scm (parallel): Update to 20230222 Signed-off-by: Leo Famulari --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 2c81f4d50a..58b78f27f6 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -64,14 +64,14 @@ (define-public parallel (package (name "parallel") - (version "20230122") + (version "20230222") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0162xprlxka96k4nlsz5qckvwqinrjv6q2404gkihcfa1h3l8z4w")) + (base32 "03lqkhh9pa9kyrpfkcd4jlwidnjj0bq2ykp7h2vxss3n17maadkd")) (snippet '(begin (use-modules (guix build utils)) -- cgit 1.4.1 From dfcf1d5d6a56d0cabeec4836bab1f1f1f063a0e1 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sun, 26 Feb 2023 22:39:58 -0800 Subject: gnu: opencl-headers, opencl-clhpp and opencl-icd-loader: Update to 2023.02.06 These packages should be updated together. * gnu/packages/opencl.scm (opencl-clhpp): Update to 2023.02.06. [arguments]: Add configure flag to disable CTest building that cause errors as tests are meant to be disabled. (opencl-headers): Update to 2023.02.06. (opencl-icd-loader): Update to 2023.02.06. Signed-off-by: Leo Famulari --- gnu/packages/opencl.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 8cf90698ea..2e506156b2 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,7 +55,7 @@ (define-public opencl-headers (package (name "opencl-headers") - (version "2021.06.30") + (version "2023.02.06") (source (origin (method git-fetch) @@ -63,7 +64,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1nrvx0x9r1nz1qpmzbgffnn9h9pn2fwcxsksf101bkpmqziq5lii")))) + (base32 "1jxpx15gwxc6i7vp64xlzcxf57nl0qnaiip6jyr0j7iji47dm404")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Not enabled during build. (synopsis "The Khronos OpenCL headers") @@ -95,7 +96,7 @@ (define-public opencl-clhpp (package (name "opencl-clhpp") - (version "2.0.15") + (version "2023.02.06") (source (origin (method git-fetch) @@ -103,14 +104,15 @@ (url "https://github.com/KhronosGroup/OpenCL-CLHPP") (commit (string-append "v" version)))) (sha256 - (base32 "1wycdbvwbdn7lqdd3sby8471qg2zdisr70218ava6cfvxdsqcp83")) + (base32 "1m3v5apjv3qagym32xqg38pq6i8j5d8svz11clsx408nrlyngrj0")) (file-name (git-file-name name version)))) (native-inputs `(("python" ,python-wrapper))) (propagated-inputs (list opencl-headers)) (arguments - `(#:configure-flags (list "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF") + `(#:configure-flags (list "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF" + "-DBUILD_TESTING=OFF") ;; CTest needs this to be turned off ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) @@ -123,7 +125,7 @@ (define-public opencl-icd-loader (package (name "opencl-icd-loader") - (version "2021.06.30") + (version "2023.02.06") (source (origin (method git-fetch) (uri (git-reference @@ -132,7 +134,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "007ws357n1ijrxal1bf9lwy68p0dz1sm9cfcfnnz5f88iwc9xd6m")))) + "1cmbcm6bz6kfvr0dy9hzf2vgfwcz8gbm8rxspqqpva6z74dz0qxr")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Tests need stub loader setup. (native-search-paths -- cgit 1.4.1 From a31225badbd9422b8394d19c039a1851a3f93e04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 27 Feb 2023 23:15:51 +0100 Subject: gnu: sugar-toolkit-gtk3: Propagate missing inputs. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[propagated-inputs]: Add telepathy-glib and webkitgtk-with-libsoup2. --- gnu/packages/sugar.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index de5b304497..4e0ef24960 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -329,7 +329,10 @@ and metadata, and the journal with querying and full text search.") python-dbus python-decorator python-pygobject - python-six)) + python-six + + telepathy-glib + webkitgtk-with-libsoup2)) (native-inputs (list autoconf automake gettext-minimal -- cgit 1.4.1 From 064d3310689754a8846a6e67cb27e6d985232f70 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 19 Feb 2023 15:51:30 +0800 Subject: gnu: hyfetch: Update to 1.4.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (hyfetch): Update to 1.4.7. * gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch, * gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/admin.scm | 9 +- ...h-fix-generator-script-quotation-escaping.patch | 115 --------------------- .../patches/hyfetch-remove-old-catchy-os-py.patch | 48 --------- 4 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch delete mode 100644 gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4ccf015316..dd1d546be5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1326,8 +1326,6 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-xattr.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ - %D%/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch \ - %D%/packages/patches/hyfetch-remove-old-catchy-os-py.patch \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 35a0162f02..e0d2147eb3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3918,7 +3918,7 @@ you are running, what theme or icon set you are using, etc.") (define-public hyfetch (package (name "hyfetch") - (version "1.4.6") + (version "1.4.7") (source (origin (method git-fetch) @@ -3926,14 +3926,9 @@ you are running, what theme or icon set you are using, etc.") (url "https://github.com/hykilpikonna/hyfetch") (commit version))) (file-name (git-file-name name version)) - (patches - (search-patches - ;; XXX: Cherry-picked from upstream, remove when updating. - "hyfetch-fix-generator-script-quotation-escaping.patch" - "hyfetch-remove-old-catchy-os-py.patch")) (sha256 (base32 - "1cnjvkil40bipia8gvs32q0lbqyi5j0nrsr7k4s0c55rh5bhkc3d")))) + "1w0wzai73rr7iliii77f15ck5ki03xcvrhgzbp72nn7xcpix9wqd")))) (build-system python-build-system) (inputs (list python-typing-extensions)) (home-page "https://github.com/hykilpikonna/HyFetch") diff --git a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch b/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch deleted file mode 100644 index dc09864707..0000000000 --- a/gnu/packages/patches/hyfetch-fix-generator-script-quotation-escaping.patch +++ /dev/null @@ -1,115 +0,0 @@ -From db69285ec161452c11ae490266e84211bec38c0d Mon Sep 17 00:00:00 2001 -From: Azalea Gui -Date: Fri, 10 Feb 2023 23:05:23 -0500 -Subject: [PATCH] [F] Fix generator script quotation escaping #91 #90 - ---- - hyfetch/distros/debian.py | 4 ++-- - hyfetch/distros/haiku.py | 2 +- - hyfetch/distros/puffos.py | 2 +- - hyfetch/distros/skiffos.py | 2 +- - hyfetch/distros/trisquel.py | 4 ++-- - tools/list_distros.py | 4 +++- - 6 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/hyfetch/distros/debian.py b/hyfetch/distros/debian.py -index 8aab161d..7b4a2a9c 100644 ---- a/hyfetch/distros/debian.py -+++ b/hyfetch/distros/debian.py -@@ -4,7 +4,7 @@ from . import AsciiArt - debian = AsciiArt(match=r'''"Debian"*''', color='1 7 3', ascii=r""" - ${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. -- ,g$$P" \"""Y$$.". -+ ,g$$P" "\""Y$$.". - ,$$P' `$$$. - ',$$P ,ggs. `$$b: - `d$$' ,$P"' ${c1}.${c2} $$$ -@@ -18,6 +18,6 @@ ${c2} `Y$$ - `$$b. - `Y$$b. - `"Y$b._ -- `\""" -+ `"\"" - """) - -\ No newline at end of file -diff --git a/hyfetch/distros/haiku.py b/hyfetch/distros/haiku.py -index cf10cfc5..198cd142 100644 ---- a/hyfetch/distros/haiku.py -+++ b/hyfetch/distros/haiku.py -@@ -15,6 +15,6 @@ ${c3} MMMM${c4} .cOMMMMM|/MMMMM/` - MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM - MMMM MMMM - MMMM MMMM -- \"""" \"""" -+ "\"\"" "\"\"" - """) - -\ No newline at end of file -diff --git a/hyfetch/distros/puffos.py b/hyfetch/distros/puffos.py -index 789d3994..0e61def4 100644 ---- a/hyfetch/distros/puffos.py -+++ b/hyfetch/distros/puffos.py -@@ -7,7 +7,7 @@ ${c1} - ,/' '""; - / ". - ,'mmmMMMMmm. \ -- _/-"^^^^^\"""%#%mm, ; -+ _/-"^^^^^"\""%#%mm, ; - ,m,_,' "###) ;, - (###% \#/ ;##mm. - ^#/ __ ___ ; (######) -diff --git a/hyfetch/distros/skiffos.py b/hyfetch/distros/skiffos.py -index 49d311c0..93a846a7 100644 ---- a/hyfetch/distros/skiffos.py -+++ b/hyfetch/distros/skiffos.py -@@ -11,6 +11,6 @@ ${c2} - ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==, - ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}|| - ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@ -- ${c1}````'\"""\""""${c2}'\"""\""""" -+ ${c1}````'"\"\""\"\""${c2}'"\"\""\"\"\"" - """) - -\ No newline at end of file -diff --git a/hyfetch/distros/trisquel.py b/hyfetch/distros/trisquel.py -index c92a5938..b15eb1f4 100644 ---- a/hyfetch/distros/trisquel.py -+++ b/hyfetch/distros/trisquel.py -@@ -3,7 +3,7 @@ from . import AsciiArt - - trisquel = AsciiArt(match=r'''"Trisquel"*''', color='4 6', ascii=r""" - ${c1} ,o$$$o. -- ,o$$Y\"""Y$$b -+ ,o$$Y"\""Y$$b - ,o$$$$$$o. ,$$' , Y$$b - ,o$$$$$$$$$$$$o. :$ b Y$$. - ,$$"' "Y$$$$o. 'b. ,b d$$$ -@@ -11,7 +11,7 @@ $$' .d$$$$b '$$$$o 'Y$$$Y d$$$' - $$' q' 'b '$$$$$o._ _.o$$$$' - .$$,_ _,d$ ,$$$$$$$$$$$$${c2}$$$$Y' - ${c1} '$$$$aaa$$$' .$$$$$$${c2}$$$$$$$$' --${c1} \"""" ${c2}d$$$$"' -+${c1} "\"\"" ${c2}d$$$$"' - d$$$' .d$$b. - $$$$ .$" 'a$. - $$$$ $b $$. -diff --git a/tools/list_distros.py b/tools/list_distros.py -index d781b581..63fb5288 100755 ---- a/tools/list_distros.py -+++ b/tools/list_distros.py -@@ -140,7 +140,9 @@ def export_distro(d: AsciiArt) -> str: - varname = varname.replace(s, '_') - - # Escape/unescape ascii -- ascii = d.ascii.replace('"""', '\\"""').replace("\\\\", "\\") -+ ascii = d.ascii.replace("\\\\", "\\") -+ while '"""' in ascii: -+ ascii = ascii.replace('"""', '"\\""') - - script = f""" - from . import AsciiArt --- -2.39.1 - diff --git a/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch b/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch deleted file mode 100644 index 253730ce22..0000000000 --- a/gnu/packages/patches/hyfetch-remove-old-catchy-os-py.patch +++ /dev/null @@ -1,48 +0,0 @@ -From be475f02112e75a7ff72a594f75eb63b0a5ac29b Mon Sep 17 00:00:00 2001 -From: Azalea Gui -Date: Fri, 10 Feb 2023 23:25:16 -0500 -Subject: [PATCH] [-] Remove old catchy_os.py (Fixes #92) - ---- - hyfetch/distros/cachy_os.py | 28 ---------------------------- - 1 file changed, 28 deletions(-) - delete mode 100644 hyfetch/distros/cachy_os.py - -diff --git a/hyfetch/distros/cachy_os.py b/hyfetch/distros/cachy_os.py -deleted file mode 100644 -index 75df6106..00000000 ---- a/hyfetch/distros/cachy_os.py -+++ /dev/null -@@ -1,28 +0,0 @@ -- --from hyfetch.distro import AsciiArt -- --cachy_os = AsciiArt(match=r'''"Cachy OS"*''', color='2 8 6', ascii=r""" --${c3} ${c2}.${c3}-------------------------: --${c3} .${c1}+=${c3}========================. --${c3} :${c1}++${c3}===${c1}++===${c3}===============- :${c1}++${c3}- --${c3} :${c1}*++${c3}====${c1}+++++==${c3}===========- .==: --${c3} -${c1}*+++${c3}=====${c1}+***++=${c3}=========: --${c3} =${c1}*++++=${c3}=======------------: --${c3} =${c1}*+++++=${c3}====- ${c2}...${c3} --${c3} .${c1}+*+++++${c3}=-===: .${c1}=+++=${c3}: --${c3} :${c1}++++${c3}=====-==: -***${c1}**${c3}+ --${c3} :${c1}++=${c3}=======-=. .=+**+${c2}.${c3} --${c3}.${c1}+${c3}==========-. ${c2}.${c3} --${c3} :${c1}+++++++${c3}====- ${c2}.${c3}--==-${c2}.${c3} --${c3} :${c1}++${c3}==========. ${c2}:${c1}+++++++${c3}${c2}: --${c3} .-===========. =*****+*+ --${c3} .-===========: .+*****+: --${c3} -=======${c1}++++${c3}:::::::::::::::::::::::::-: ${c2}.${c3}---: --${c3} :======${c1}++++${c3}====${c1}+++******************=. --${c3} :=====${c1}+++${c3}==========${c1}++++++++++++++*- --${c3} .====${c1}++${c3}==============${c1}++++++++++*- --${c3} .===${c1}+${c3}==================${c1}+++++++: --${c3} .-=======================${c1}+++: --${c3} ${c2}.......................... --""") -- -\ No newline at end of file --- -2.39.1 - -- cgit 1.4.1 From fb9124cb049061b2a51589420dd528962972b04b Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 15 Feb 2023 11:44:10 -0500 Subject: gnu: leptonica: Use new package style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (leptonica)[inputs]: Remove labels. [arguments]<#:phases>: Use gexps; use "this-package-input" to locate package input; do not explicitly return #t from phases. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5071dd588f..8212407cc1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -619,33 +619,31 @@ collection of tools for doing simple manipulations of TIFF images.") libtool pkg-config)) (inputs - `(("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) - ("zlib" ,zlib))) + (list giflib + libjpeg-turbo + libpng + libtiff + libwebp + openjpeg + zlib)) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-reg-wrapper - (lambda _ - (substitute* "prog/reg_wrapper.sh" - ((" /bin/sh ") - (string-append " " (which "sh") " ")) - (("which gnuplot") - "true")) - #t)) - (add-after 'install 'provide-absolute-giflib-reference - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (giflib (assoc-ref inputs "giflib"))) - ;; Add an absolute reference to giflib to avoid propagation. - (with-directory-excursion (string-append out "/lib") - (substitute* '("liblept.la" "pkgconfig/lept.pc") - (("-lgif") (string-append "-L" giflib "/lib -lgif")))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-reg-wrapper + (lambda _ + (substitute* "prog/reg_wrapper.sh" + ((" /bin/sh ") + (string-append " " (which "sh") " ")) + (("which gnuplot") + "true")))) + (add-after 'install 'provide-absolute-giflib-reference + (lambda _ + (let ((giflib #$(this-package-input "giflib"))) + ;; Add an absolute reference to giflib to avoid propagation. + (with-directory-excursion (string-append #$output "/lib") + (substitute* '("liblept.la" "pkgconfig/lept.pc") + (("-lgif") (string-append "-L" giflib "/lib -lgif")))))))))) (home-page "http://www.leptonica.com/") (synopsis "Library and tools for image processing and analysis") (description -- cgit 1.4.1 From a7458a627827a3047aed1560d0afd454296422bc Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 15 Feb 2023 11:44:11 -0500 Subject: gnu: leptonica: Update to 1.83.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (leptonica): Update to 1.83.1. [arguments]<#:phases>: Update file name in "provide-absolute-giflib-reference" phase. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8212407cc1..228a31c7d0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -601,7 +601,7 @@ collection of tools for doing simple manipulations of TIFF images.") (define-public leptonica (package (name "leptonica") - (version "1.80.0") + (version "1.83.1") (source (origin (method git-fetch) @@ -610,7 +610,7 @@ collection of tools for doing simple manipulations of TIFF images.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ddln72z5l3icz0i9rpsfkg5xik8fcwcn8lb0cp3jigjxi8gvkg")))) + (base32 "1j7qf9flb48q0aymf0yx9rypy3bs6hfjcln08zmy8qn2qcjzrmvi")))) (build-system gnu-build-system) (native-inputs (list gnuplot ;needed for test suite @@ -642,7 +642,7 @@ collection of tools for doing simple manipulations of TIFF images.") (let ((giflib #$(this-package-input "giflib"))) ;; Add an absolute reference to giflib to avoid propagation. (with-directory-excursion (string-append #$output "/lib") - (substitute* '("liblept.la" "pkgconfig/lept.pc") + (substitute* '("libleptonica.la" "pkgconfig/lept.pc") (("-lgif") (string-append "-L" giflib "/lib -lgif")))))))))) (home-page "http://www.leptonica.com/") (synopsis "Library and tools for image processing and analysis") -- cgit 1.4.1 From ff5fbcc19bce6e94ead0cc79b27ae8ed0307463d Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Wed, 15 Feb 2023 15:59:58 -0500 Subject: gnu: Add barectf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/instrumentation.scm (barectf): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/instrumentation.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 133d684567..c25086127a 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) @@ -53,6 +54,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -120,6 +122,32 @@ 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 barectf + (package + (name "barectf") + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "barectf" version)) + (sha256 + (base32 + "0zhc9d4qnnl4fjj6354qb4bng4ykywn8x3l3acpv6sx439q6ylwd")))) + (build-system python-build-system) + (native-inputs (list gcc-toolchain + gnu-make + python-jinja2 + python-jsonschema + python-pyyaml-5 + python-termcolor + python-tox)) + (home-page "https://barectf.org") + (synopsis "CTF tracer generator") + (description + "@command{barectf} is a generator of tracer which produces CTF data +streams. The generated C source code has no other dependencies than a few C +standard library headers.") + (license license:expat))) + (define-public dyninst (package (name "dyninst") -- cgit 1.4.1 From 60e03bb5e75be35440fb64a626d3e71918dc465c Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:27:52 +0400 Subject: gnu: emacs-corfu: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-corfu)[native-inputs]: Add texinfo. [arguments]: Migrate to gexps, generate info from README.org. --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cd4a36beda..35399fce38 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3798,16 +3798,27 @@ of bibliographic references.") (base32 "1xqg796844wk6kvn3xw4bqlxn9ra6jlwk7rsc5gy4j77l0gwl441")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Move the extensions source files to the top level, which is included - ;; in the EMACSLOADPATH. - (add-after 'unpack 'move-source-files - (lambda _ - (let ((el-files (find-files "./extensions" ".*\\.el$"))) - (for-each (lambda (f) - (rename-file f (basename f))) - el-files))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; Move the extensions source files to the top level, which is included + ;; in the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./extensions" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)))) + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "corfu.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/minad/corfu") -- cgit 1.4.1 From 699936485ab2fd495cc58f7fcce69d8f49bc9931 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:30:30 +0400 Subject: gnu: emacs-cape: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-cape)[native-inputs]: Add texinfo. [arguments]: Generate info from README.org. --- gnu/packages/emacs-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35399fce38..8d259914dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3867,6 +3867,20 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (sha256 (base32 "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya")))) (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "cape.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/minad/cape") -- cgit 1.4.1 From 62e8ba15d755bbba0ac37b0d17103618e5aa2e2b Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:31:05 +0400 Subject: gnu: emacs-embark: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-embark)[native-inputs]: Add texinfo. [arguments]: Generate info from README.org. --- gnu/packages/emacs-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d259914dd..6212d3958f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10466,6 +10466,20 @@ them easier to distinguish from other, less important buffers.") (base32 "14qp46wa1xgmb09jyk9cadj0b3m7bwspqnprk3zbfc6gw1r53235")) (file-name (git-file-name name version)))) (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "embark.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) (propagated-inputs (list emacs-avy emacs-consult)) (home-page "https://github.com/oantolin/embark") -- cgit 1.4.1 From bc3280190b925e1a63984acea00fccb15777a185 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:31:23 +0400 Subject: gnu: emacs-consult: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-consult)[native-inputs]: Add texinfo. [arguments]: Generate info from README.org. --- gnu/packages/emacs-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6212d3958f..f7c1ad3fc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10599,6 +10599,20 @@ style, or as multiple word prefixes.") (base32 "00cgc3bzj37319ds027rpj60wfk0c10cgp5xish2g1cq5ny74q32")) (file-name (git-file-name name version)))) (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "consult.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/minad/consult") (synopsis "Consulting completing-read") -- cgit 1.4.1 From eed41fbcddbbc1f56e6595ba9f471f590ccb96b7 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:33:20 +0400 Subject: gnu: emacs-marginalia: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-marginalia)[native-inputs]: Add texinfo. [arguments]: Generate info from README.org. --- gnu/packages/emacs-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f7c1ad3fc2..f5a907324c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10839,6 +10839,20 @@ expansion and overwriting the marked region with a new snippet completion.") (sha256 (base32 "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q")))) (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "marginalia.info" + (string-append #$output "/share/info"))))))) + (native-inputs (list texinfo)) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/minad/marginalia") -- cgit 1.4.1 From 2369e8b0ac623aec5508e6eec7246c642787c0d8 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:33:42 +0400 Subject: gnu: emacs-vertico: Generate info from README.org. * gnu/packages/emacs-xyz.scm (emacs-vertico)[arguments]: Migrate to gexps, generate info from README.org. --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f5a907324c..c585dbe6e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34696,16 +34696,26 @@ and preferred services can easily be configured.") (base32 "0djc1im6caa67aq0bi8d607ycb1lq4lsirfqsx8kqbfl46852f60")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Move the extensions source files to the top level, which is - ;; included in the EMACSLOADPATH. - (add-after 'unpack 'move-source-files - (lambda _ - (let ((el-files (find-files "./extensions" ".*\\.el$"))) - (for-each (lambda (f) - (rename-file f (basename f))) - el-files))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; Move the extensions source files to the top level, which is + ;; included in the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./extensions" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)))) + (add-after 'install 'makeinfo + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "vertico.info" + (string-append #$output "/share/info"))))))) (native-inputs (list texinfo)) (propagated-inputs -- cgit 1.4.1 From a79950af1568c262a79fc0cdfd391b7328c058cf Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 28 Feb 2023 06:34:30 +0400 Subject: gnu: emacs-eat: Update to 0.6. * gnu/packages/emacs-xyz.scm (emacs-eat): Update to 0.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c585dbe6e5..d2ad6a8cf7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27431,7 +27431,7 @@ tabulated-lists).") (define-public emacs-eat (package (name "emacs-eat") - (version "0.4") + (version "0.6") (source (origin (method git-fetch) @@ -27441,7 +27441,7 @@ tabulated-lists).") (file-name (git-file-name name version)) (sha256 (base32 - "0zs1fwbapgsap8vai97f1inginb896gl15kyjm521nvaywk4rc12")) + "1279dcagg01vb5izd95lm7i6z5zck136vw3lb06kam8xagrkvfjf")) (modules '((guix build utils))) (snippet #~(begin -- cgit 1.4.1 From 3bb2078a12d78a13f1e1520fe3705333a74ef6e3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 28 Feb 2023 09:28:58 +0100 Subject: gnu: ghc-9.2: Increase max-silent-time. Times out on i686 CI, but not locally. * gnu/packages/haskell.scm (ghc-9.2)[properties]: Add max-silent-time. --- gnu/packages/haskell.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 16f4e2d530..dddc85459a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1309,6 +1309,7 @@ interactive environment for the functional language Haskell.") ;; Increase verbosity, so running the test suite does not time out on CI. ((#:make-flags make-flags ''()) #~(cons "VERBOSE=4" #$make-flags)))) + (properties '((max-silent-time . 36000))) ; 10 hours, for i686. (native-inputs `(;; GHC 9.2 must be built with GHC >= 8.6. ("ghc-bootstrap" ,base) -- cgit 1.4.1 From 5e22f8962a737c52268034a70f2353f293bf20ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 12:17:14 +0100 Subject: gnu: sugar-typing-turtle-activity: Add setxkbmap to inputs. * gnu/packages/sugar.scm (sugar-typing-turtle-activity)[inputs]: Add setxkbmap. [arguments]: Patch invocation of setxkbmap. --- gnu/packages/sugar.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 4e0ef24960..3c5b7e0a55 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -407,6 +407,11 @@ to provide users with easy access to documentation and manuals.") #:test-target "check" #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-reference-to-executables + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "keyboard.py" + (("setxkbmap") + (search-input-file inputs "/bin/setxkbmap"))))) (add-after 'unpack 'patch-launcher (lambda* (#:key inputs #:allow-other-keys) (substitute* "activity/activity.info" @@ -419,6 +424,8 @@ to provide users with easy access to documentation and manuals.") (string-append "--prefix=" #$output))))))) (native-inputs (list gettext-minimal sugar-toolkit-gtk3)) + (inputs + (list setxkbmap)) (home-page "https://help.sugarlabs.org/en/typing_turtle.html") (synopsis "Learn typing") (description "Need some help typing? In this activity for the Sugar -- cgit 1.4.1 From b8f6cffb1151fc44da4e66e7a1ea0070b8984111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 12:18:02 +0100 Subject: gnu: sugar-toolkit-gtk3: Include output directory in GI_TYPELIB_PATH. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]: Include package output directory in search path for GI_TYPELIB_PATH. --- gnu/packages/sugar.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 3c5b7e0a55..1257f6607a 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -293,18 +293,19 @@ and metadata, and the journal with querying and full text search.") ((guix build python-build-system) #:prefix python:) (guix build utils)) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-build-system - (lambda _ - (substitute* "autogen.sh" - (("^\"\\$srcdir/configure" m) - (string-append "#" m))))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/sugar-activity3") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-build-system + (lambda _ + (substitute* "autogen.sh" + (("^\"\\$srcdir/configure" m) + (string-append "#" m))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/sugar-activity3") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0"))))))))) (inputs (list alsa-lib libice -- cgit 1.4.1 From 23a2faf5c9797fcb9404723156edd76b1a9e3cd8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 12:47:42 +0100 Subject: gnu: sugar-help-activity: Build English HTML. * gnu/packages/sugar.scm (sugar-help-activity)[arguments]: Replace 'build phase to generate HTML files. [native-inputs]: Add python-sphinx. --- gnu/packages/sugar.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 1257f6607a..04c7bc5fe2 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages search) + #:use-module (gnu packages sphinx) #:use-module (gnu packages time) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) @@ -377,12 +378,15 @@ the Sugar Toolkit.") (("exec = sugar-activity3") (string-append "exec = " (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'build + (lambda _ (invoke "make" "html"))) (replace 'install (lambda _ (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) (native-inputs - (list sugar-toolkit-gtk3)) + (list sugar-toolkit-gtk3 + python-sphinx)) (home-page "https://github.com/sugarlabs/help-activity") (synopsis "Sugar activity for accessing documentation and manuals") (description "This is an activity for the Sugar environment which aims -- cgit 1.4.1 From 93fb9cb02fca94d407d994465644f7db58d2a439 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 18:07:16 +0100 Subject: gnu: Add sugar-browse-activity. * gnu/packages/sugar.scm (sugar-browse-activity): New variable. --- gnu/packages/sugar.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 04c7bc5fe2..34f06f8d38 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -351,6 +351,64 @@ the Sugar Toolkit.") (license license:lgpl2.1+))) +(define-public sugar-browse-activity + (package + (name "sugar-browse-activity") + (version "207") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/browse-activity") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01p1gfdw9fhn92didc9sq23n6a3krs6findbbmicijz91kx8kfb2")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-reference-to-gschema-compiler + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "browser.py" + (("glib-compile-schemas") + (search-input-file inputs "/bin/glib-compile-schemas"))))) + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list evince + gobject-introspection + gtk+ + (librsvg-for-system) + libsoup-minimal-2 + python-pygobject + sugar-toolkit-gtk3 + telepathy-glib + webkitgtk-with-libsoup2)) + (inputs + (list (list glib "bin"))) + (native-inputs + (list gettext-minimal)) + (home-page "https://help.sugarlabs.org/browse.html") + (synopsis "Sugar activity to browse the internet") + (description "Browse is a web browser activity for the Sugar desktop.") + (license (list license:cc0 ;metadata + license:lgpl2.0+ + license:gpl2+ + license:gpl3+)))) + (define-public sugar-help-activity (let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3") (revision "1")) -- cgit 1.4.1 From 03c5b8933dd84ce3ab108ab2e56776181517ad7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 18:18:26 +0100 Subject: gnu: sugar: Add bash-minimal to inputs. This is needed when using wrap-program. * gnu/packages/sugar.scm (sugar)[inputs]: Add bash-minimal. --- gnu/packages/sugar.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 34f06f8d38..f78d6016be 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -124,7 +124,8 @@ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) (find-files (string-append #$output "/bin") "^sugar.*"))))))) (inputs - (list gtk+ + (list bash-minimal + gtk+ metacity mobile-broadband-provider-info python -- cgit 1.4.1 From dc44f8d1ce7ca9b19c348705c4f4f7e13ed2a541 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 18:18:55 +0100 Subject: gnu: sugar-datastore: Add bash-minimal to inputs. This is needed due to the use of wrap-program. * gnu/packages/sugar.scm (sugar-datastore)[inputs]: Add bash-minimal. --- gnu/packages/sugar.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index f78d6016be..26aed2b58e 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -255,7 +255,8 @@ activities and other Sugar components.") (search-input-file outputs "bin/copy-to-journal") (search-input-file outputs "bin/datastore-service")))))))) (inputs - (list python + (list bash-minimal + python sugar-toolkit-gtk3)) (propagated-inputs (list python-dbus -- cgit 1.4.1 From 57180fc7b951dd29ba08484f8529689b90cc4f12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 18:19:22 +0100 Subject: gnu: sugar-toolkit-gtk3: Add bash-minimal to inputs. This is needed due to the use of wrap-program. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[inputs]: Add bash-minimal. --- gnu/packages/sugar.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 26aed2b58e..504b346f2f 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -311,6 +311,7 @@ and metadata, and the journal with querying and full text search.") ,(string-append #$output "/lib/girepository-1.0"))))))))) (inputs (list alsa-lib + bash-minimal libice libsm libx11 -- cgit 1.4.1 From 04919730eff474b6b7299bce8980daf18a2defec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 18:32:32 +0100 Subject: gnu: sugar: Add missing import. This is a follow-up to commit 03c5b8933dd84ce3ab108ab2e56776181517ad7d. * gnu/packages/sugar.scm: Add missing import of (gnu packages bash). --- gnu/packages/sugar.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 504b346f2f..628275d0c7 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -20,6 +20,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) -- cgit 1.4.1 From 19fc388d2b41ac8fd8b012bd603515efc51be1f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Feb 2023 20:51:33 +0200 Subject: gnu: qutebrowser: Update to 2.5.3. * gnu/packages/web-browsers.scm (qutebrowser): Update to 2.5.3. --- gnu/packages/web-browsers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a1c2294f7a..531bf9cb20 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2014, 2019 Mark H Weaver -;;; Copyright © 2015, 2016, 2019, 2021, 2022 Efraim Flashner +;;; Copyright © 2015, 2016, 2019, 2021-2023 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -468,7 +468,7 @@ interface.") (define-public qutebrowser (package (name "qutebrowser") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -476,7 +476,7 @@ interface.") "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "0279fi4lx8sfxz3mx6ar0wz01kiiqa1zkv9fxc6xw0y4vlacxgx9")))) + (base32 "10fpr414nadqba33xgvbpaacc5sn0xnpnnljf5a3n8yh6hjg4pl4")))) (build-system python-build-system) (native-inputs (list python-attrs)) ; for tests -- cgit 1.4.1 From 307d1b626be86ed21d48d44a131ce8490f370a17 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 28 Feb 2023 14:31:27 -0300 Subject: gnu: xmonad: Re-add xmonad.desktop file. * gnu/packages/wm.scm (xmonad)[arguments]: Add 'install-xsession phase that was removed in previous automated update. Fixes: Signed-off-by: Lars-Dominik Braun --- gnu/packages/wm.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 9ba2841817..e6b7df544e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -817,8 +817,24 @@ manager and a system tray.") (inputs (list ghc-x11 ghc-data-default-class ghc-setlocale)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments - `(#:cabal-revision ("2" - "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-xsession + (lambda _ + (let ((xsessions (string-append #$output "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append xsessions + "/xmonad.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=~a~@ + Comment=xmonad window manager~@ + Exec=~a/bin/xmonad~@ + Type=Application~%" #$name #$output))))))) + #:cabal-revision '("2" + "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"))) (home-page "http://xmonad.org") (synopsis "Tiling window manager") (description -- cgit 1.4.1 From 7dd45f86dca5042f93e5dcf932ae589b2d34e3c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 21:53:11 +0100 Subject: gnu: sugar-toolkit-gtk3: Extend GI_TYPELIB_PATH, don't replace it. This is convenient in case typelib files are needed by activities at runtime that are not available at build time. * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]: Extend GI_TYPELIB_PATH when wrapping. --- gnu/packages/sugar.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 628275d0c7..4f416eb84b 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -308,8 +308,9 @@ and metadata, and the journal with querying and full text search.") (wrap-program (search-input-file outputs "bin/sugar-activity3") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH") - ,(string-append #$output "/lib/girepository-1.0"))))))))) + `("GI_TYPELIB_PATH" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0"))))))))) (inputs (list alsa-lib bash-minimal -- cgit 1.4.1 From bf542dea072ef7c6fbc49f45ee27c99707bf5818 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 22:31:58 +0100 Subject: gnu: sugar: Augment GI_TYPELIB_PATH, don't replace it. This is important so that the typelib files of libraries that may have been propagated by Sugar activities are visible when launching the activities via sugar-toolkit-gtk3's "sugar-activity3" tool. Activities propagate their needed gobject introspection libraries; when installed to the system profile these libraries are available to the Sugar launchers. * gnu/packages/sugar.scm (sugar)[arguments]: Do not replace GI_TYPELIB_PATH but augment it. --- gnu/packages/sugar.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 4f416eb84b..589da64458 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -122,7 +122,8 @@ (wrap-program executable `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) + `("GI_TYPELIB_PATH" prefix + (,(getenv "GI_TYPELIB_PATH"))))) (find-files (string-append #$output "/bin") "^sugar.*"))))))) (inputs (list bash-minimal -- cgit 1.4.1 From 3ad3006c23b594cb47addbf175243f7f493a1922 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 28 Feb 2023 22:38:31 +0100 Subject: gnu: Add sugar-jukebox-activity. * gnu/packages/sugar.scm (sugar-jukebox-activity): New variable. --- gnu/packages/sugar.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 589da64458..64d01bbd90 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -457,6 +457,53 @@ the Sugar Toolkit.") to provide users with easy access to documentation and manuals.") (license license:gpl3+)))) +(define-public sugar-jukebox-activity + (let ((commit "e11f40c94c1c6302d3e36ddf4dc8101732ffb9d9") + (revision "1")) + (package + (name "sugar-jukebox-activity") + (version (git-version "36" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/jukebox-activity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gm1cj4vrwwdriyshd27w6vc0palwpg9pnnab5axinrnkzczyk1v")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list gtk+ + gstreamer + gst-plugins-base + sugar-toolkit-gtk3)) + (inputs + (list gettext-minimal)) + (home-page "https://help.sugarlabs.org/jukebox.html") + (synopsis "Media player for the Sugar learning environment") + (description "Jukebox is the media player to play different kinds of +audio and video files including online streams. It also supports playlists +like @file{.m3u} and @file{.pls}.") + (license license:gpl2+)))) + (define-public sugar-typing-turtle-activity (package (name "sugar-typing-turtle-activity") -- cgit 1.4.1 From 1c1d7e3db95d0250aba7b5a90ce22742f5070071 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 28 Feb 2023 10:15:48 +0800 Subject: gnu: herbstluftwm: Update to 0.9.5. * gnu/packages/wm.scm (herbstluftwm): Update to 0.9.5. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e6b7df544e..55838314db 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -190,14 +190,14 @@ the leaves of a full binary tree.") (define-public herbstluftwm (package (name "herbstluftwm") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-" version ".tar.gz")) (sha256 - (base32 "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f")) + (base32 "01c1f5041bblg8d7p12jkynd57xi1frxy61qsrdcxgp5144n1m5j")) (file-name (string-append "herbstluftwm-" version ".tar.gz")))) (build-system cmake-build-system) (inputs -- cgit 1.4.1 From f926fd50d1374b9a09f0855239a7bdede332cd9c Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 28 Feb 2023 11:02:06 +0800 Subject: gnu: herbstluftwm: Enable Xcursor support. * gnu/packages/wm.scm (herbstluftwm)[inputs]: Add libxcursor. [arguments]: Set 'LDFLAGS' to '-lXcursor'. --- gnu/packages/wm.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 55838314db..c656101159 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -208,6 +208,7 @@ the leaves of a full binary tree.") xterm xsetroot libx11 + libxcursor libxext libxfixes libxinerama @@ -224,6 +225,10 @@ the leaves of a full binary tree.") (string-append "-DBASHCOMPLETIONDIR=" out "/etc/bash_completion.d"))) #:phases (modify-phases %standard-phases + (add-before 'configure 'link-libxcursor + (lambda _ + ;; libX11 will dlopen libXcursor to load cursors. + (setenv "LDFLAGS" "-lXcursor"))) (add-after 'install 'install-xsession (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From f9925ad9c4b30ef7fe5fdb7b3ad93e1940d40cd3 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 28 Feb 2023 14:23:02 +0800 Subject: gnu: thunar: Update to 4.18.4. * gnu/packages/xfce.scm (thunar): Update to 4.18.4. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3ee728e710..716c32d1bb 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -725,7 +725,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.18.3") ;stable version = even minor + (version "4.18.4") ;stable version = even minor (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -733,7 +733,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "15rjbr9gdiqzpvy97vz8s9hhr35zvl2kr4q6iwxq0gwza4wfl0pl")))) + "1k7dkdhp353l1z2d55384c10iyp59n5qx0hawzf8lqhxzgi3qin4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-custom-thunarx-dirs-enabled"))) -- cgit 1.4.1 From bfb8a748809630bcdc1e3bf2194598b4d0a00167 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Wed, 15 Feb 2023 10:41:41 +0800 Subject: gnu: aspell: fix cross-compile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/aspell.scm (aspell): fix cross-compile. [inputs]: move perl to ... [native-inputs]: here. Signed-off-by: 宋文武 --- gnu/packages/aspell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 0f9a07895d..3482a756e0 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Noah Landis ;;; Copyright © 2021 Sergiu Ivanov ;;; Copyright © 2023 Yovan Naumovski +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ (string-append "\"filter-path" middle "\"" libdir "\""))) #t)))))) - (inputs (list perl)) + (native-inputs (list perl)) (native-search-paths ;; This is a Guix-specific environment variable that takes a single -- cgit 1.4.1 From ef7df2ca7bb212455f1d6bbef5bbf7b1ac5a189d Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Tue, 28 Feb 2023 01:40:19 +0100 Subject: gnu: Add r-sitar. * gnu/packages/cran.scm (r-sitar): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c80e98134a..abe89201b0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9652,6 +9652,40 @@ filtering functions, resampling routines, and visualization of filter models. It also includes interpolation functions.") (license license:gpl2))) +(define-public r-sitar + (package + (name "r-sitar") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "sitar" version)) + (sha256 + (base32 "0lhwbbpq6anqrk3818xw3nrl63bj3vwgsmxad0dpl8y50rkcc4cs")))) + (properties `((upstream-name . "sitar"))) + (build-system r-build-system) + (propagated-inputs + (list r-dplyr + r-forcats + r-ggplot2 + r-glue + r-magrittr + r-nlme + r-purrr + r-rlang + r-rsample + r-tibble + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/statist7/sitar") + (synopsis "Super imposition by translation and rotation growth curve analysis") + (description + "This package provides functions for fitting and plotting @acronym{SITAR, Super +Imposition by Translation And Rotation} growth curve models. SITAR is a shape- +invariant model with a regression B-spline mean curve and subject-specific random +effects on both the measurement and age scales.") + (license license:gpl2+))) + (define-public r-gsubfn (package (name "r-gsubfn") -- cgit 1.4.1 From 2eb750ab1f1175cb20483175afa8d5143b3158cd Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 21:42:49 +0100 Subject: gnu: Add r-simplermarkdown. * gnu/packages/cran.scm (r-simplermarkdown): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index abe89201b0..abf2868122 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9652,6 +9652,33 @@ filtering functions, resampling routines, and visualization of filter models. It also includes interpolation functions.") (license license:gpl2))) +(define-public r-simplermarkdown + (package + (name "r-simplermarkdown") + (version "0.0.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "simplermarkdown" version)) + (sha256 + (base32 "069pgx5m22rdqa21lyn5zqm9ym3g7w6z1d2wjwms8b1f2cp6266g")))) + (properties `((upstream-name . "simplermarkdown"))) + (build-system r-build-system) + (propagated-inputs + ;; We cannot patch references to pandoc because the patched files are + ;; compiled to an opaque rdb/rdx pair. "guix gc" would not be able to + ;; find the patched references in those files. + (list pandoc + r-rjson)) + (home-page "https://github.com/djvanderlaan/simplermarkdown") + (synopsis "Simple engine for generating reports using R") + (description + "This package runs R-code present in a pandoc markdown file and includes +the resulting output in the resulting markdown file. This file can then be +converted into any of the output formats supported by pandoc. The package can +also be used as an engine for writing package vignettes.") + (license license:gpl3+))) + (define-public r-sitar (package (name "r-sitar") -- cgit 1.4.1 From 5fdf7e9ab943e42ec8096d310791148652c82079 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 22:17:44 +0100 Subject: gnu: Add r-rcppspdlog. * gnu/packages/cran.scm (r-rcppspdlog): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index abf2868122..6db37eddf0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4992,6 +4992,30 @@ performs global optimization by differential evolution.") factorization and divisive clustering for large sparse and dense matrices.") (license license:gpl2+))) +(define-public r-rcppspdlog + (package + (name "r-rcppspdlog") + (version "0.0.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "RcppSpdlog" version)) + (sha256 + (base32 "1nan0hm49xdl2l1lskm1jf01clfh7aw2v6h57j35qysvg8219fcx")))) + (properties `((upstream-name . "RcppSpdlog"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp)) + (native-inputs (list r-simplermarkdown)) + (home-page "https://github.com/eddelbuettel/rcppspdlog") + (synopsis "R and C++ interfaces to spdlog C++ header library for logging") + (description + "The spdlog library is a widely-used and very capable header-only C++ +library for logging. This package includes its headers as an R package to +permit other R packages to deploy it via a simple @code{LinkingTo: +RcppSpdlog}. As of version 0.0.9, it also provides both simple R logging +functions and compiled functions callable by other packages.") + (license license:gpl2+))) + (define-public r-rcppthread (package (name "r-rcppthread") -- cgit 1.4.1 From 3efea1fc14bc2b7b95116676e0352119e3709392 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Tue, 28 Feb 2023 00:37:16 +0100 Subject: gnu: Add r-n2r. * gnu/packages/cran.scm (r-n2r): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6db37eddf0..e04b3e320f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8334,6 +8334,32 @@ features: ") (license license:gpl3))) +(define-public r-n2r + (package + (name "r-n2r") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "N2R" version)) + (sha256 + (base32 "12bv7xx6j6222qgpv6g61i68017fz0x6fjg9a9k5yhgw3zk05hpk")))) + (properties `((upstream-name . "N2R"))) + (build-system r-build-system) + (propagated-inputs + (list r-matrix + r-rcpp + r-rcppeigen + r-rcppspdlog)) + (home-page "https://github.com/kharchenkolab/N2R") + (synopsis "Fast and scalable approximate k-Nearest Neighbor search methods") + (description + "This package implements methods to perform fast approximate K-nearest +neighbor search on the input matrix. The algorithm is based on the N2 +implementation of an approximate nearest neighbor search using hierarchical +@acronym{NSW, Navigable Small World} graphs.") + (license license:asl2.0))) + (define-public r-network (package (name "r-network") -- cgit 1.4.1 From 7018092b0ea588ad04d0ae549c256dd9a480866b Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:41 +0100 Subject: gnu: Add r-sccore. * gnu/packages/cran.scm (r-sccore): New variable. --- gnu/packages/cran.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e04b3e320f..ceb84ba823 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22440,6 +22440,49 @@ errors and possible semantic issues. It supports on the fly checking of R code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.") (license license:expat))) +(define-public r-sccore + (package + (name "r-sccore") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "sccore" version)) + (sha256 + (base32 "12gm7pb6xbvf9kdsgl7ldw1c54ga9fgk99ps2kx2cq91q9m0ld4r")))) + (properties `((upstream-name . "sccore"))) + (build-system r-build-system) + (propagated-inputs + (list r-dplyr + r-ggplot2 + r-ggrepel + r-igraph + r-irlba + r-magrittr + r-matrix + r-pbmcapply + r-proc + r-rcpp + r-rcpparmadillo + r-rcppeigen + r-rcppprogress + r-rlang + r-scales + r-tibble + r-uwot + r-withr)) + (home-page "https://github.com/kharchenkolab/sccore") + (synopsis "Core utilities for single-cell RNA-Seq") + (description + "This package implements core utilities for single-cell RNA-seq data analysis. +Contained within are utility functions for working with @acronym{DE, +differential expression} matrices and count matrices, a collection of +functions for manipulating and plotting data via ggplot2, and functions to +work with cell graphs and cell embeddings. Graph-based methods include +embedding kNN cell graphs into a UMAP, collapsing vertices of each cluster in +the graph, and propagating graph labels.") + (license license:gpl3))) + (define-public r-scs (package (name "r-scs") -- cgit 1.4.1 From e59eb3fe63a5b0b73592c7c07f85dae90d785de0 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:42 +0100 Subject: gnu: Add r-leidenalg. * gnu/packages/cran.scm (r-leidenalg): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ceb84ba823..a1da9d229e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23348,6 +23348,41 @@ graph into communities. See also Traag et al (2018) \"From Louvain to Leiden: guaranteeing well-connected communities.\" .") (license license:gpl3))) +(define-public r-leidenalg + (package + (name "r-leidenalg") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "leidenAlg" version)) + (sha256 + (base32 "1z96zrsms93gspylmficaggb0xj94kq9rg3p2svdbb451jbga9an")))) + (properties `((upstream-name . "leidenAlg"))) + (build-system r-build-system) + (inputs + (list glpk gmp libxml2)) + (propagated-inputs + (list r-igraph + r-matrix + r-rcpp + r-rcpparmadillo + r-rcppeigen + r-sccore)) + (native-inputs (list gfortran)) + (home-page "https://github.com/kharchenkolab/leidenAlg") + (synopsis "Leiden algorithm via an R interface") + (description + "This package implements an R interface to the Leiden algorithm, an +iterative community detection algorithm on networks. The algorithm is +designed to converge to a partition in which all subsets of all communities +are locally optimally assigned, yielding communities guaranteed to be +connected. The implementation proves to be fast, scales well, and can be run +on graphs of millions of nodes (as long as they can fit in memory).") + ;; The DESCRIPTION file says GPL-3, but the code was copied from + ;; https://github.com/vtraag/leidenalg, which is under GPLv3+. + (license license:gpl3+))) + (define-public r-patchwork (package (name "r-patchwork") -- cgit 1.4.1 From fca17c0b2872017aa6bd979a7773b4a269489321 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:43 +0100 Subject: gnu: Add r-drat. * gnu/packages/cran.scm (r-drat): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1da9d229e..91a4797c43 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6380,6 +6380,30 @@ these progress updates.") variable models.") (license license:gpl3))) +(define-public r-drat + (package + (name "r-drat") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "drat" version)) + (sha256 + (base32 "191yxlj9jccakmz27g7n9izfcy19kj3fgnw4w6zl9iq66787qpm6")))) + (properties `((upstream-name . "drat"))) + (build-system r-build-system) + (native-inputs (list r-simplermarkdown)) + (home-page "https://github.com/eddelbuettel/drat") + (synopsis "Drat R archive template") + (description + "This package helps you with creation and use of R repositories via +helper functions to insert packages into a repository, and to add repository +information to the current R session. Two primary types of repositories are +supported: gh-pages at GitHub, as well as local repositories on either the +same machine or a local network. Drat is a recursive acronym: Drat R Archive +Template.") + (license license:gpl2+))) + (define-public r-drr (package (name "r-drr") -- cgit 1.4.1 From c7a25ee3de555f78b4726d9dc0693104ade32c92 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:44 +0100 Subject: gnu: Add r-dendsort. * gnu/packages/cran.scm (r-dendsort): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 91a4797c43..d4acc8cfdc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5333,6 +5333,33 @@ compare different dendrograms to one another.") ;; Any of these versions (license (list license:gpl2 license:gpl3)))) +(define-public r-dendsort + (package + (name "r-dendsort") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "dendsort" version)) + (sha256 + (base32 "0rs7y471wrhkgibxdmfh5xhp3pa004rrlm2w08b6qli5gq4im5d2")))) + (properties `((upstream-name . "dendsort"))) + (build-system r-build-system) + (native-inputs (list r-knitr)) + (home-page "https://github.com/evanbiederstedt/dendsort") + (synopsis "Modular leaf ordering methods for dendrogram nodes") + (description + "This package represents an implementation of functions to optimize +ordering of nodes in a dendrogram, without affecting the meaning of the +dendrogram. A dendrogram can be sorted based on the average distance of +subtrees, or based on the smallest distance value. These sorting methods +improve readability and interpretability of tree structure, especially for +tasks such as comparison of different distance measures or linkage types and +identification of tight clusters and outliers. As a result, it also +introduces more meaningful reordering for a coupled heatmap visualization.") + ;; Any of these versions + (license (list license:gpl2 license:gpl3)))) + (define-public r-getoptlong (package (name "r-getoptlong") -- cgit 1.4.1 From 020e5ac362e3dbb578da40adeaa929a2f5fd3929 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:45 +0100 Subject: gnu: Add r-pagoda2. * gnu/packages/cran.scm (r-pagoda2): New variable. --- gnu/packages/cran.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4acc8cfdc..5e69b7e3f6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2031,6 +2031,59 @@ consistent fashion. It seeks to combine functionality from lower level functions which can speed up workflow.") (license license:gpl2))) +(define-public r-pagoda2 + (package + (name "r-pagoda2") + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (cran-uri "pagoda2" version)) + (sha256 + (base32 "18ip8j5l5c3hqw1xsf5wnyas55i2mhk09phy68kjkjdgcymmpg7c")))) + (properties `((upstream-name . "pagoda2"))) + (build-system r-build-system) + (propagated-inputs + (list r-dendsort + r-drat + r-fastcluster + r-igraph + r-irlba + r-magrittr + r-mass + r-matrix + r-mgcv + r-n2r + r-plyr + r-r-utils + r-r6 + r-rcpp + r-rcpparmadillo + r-rcppeigen + r-rcppprogress + r-rjson + r-rlang + r-rmtstat + r-rook + r-rtsne + r-sccore + r-urltools)) + (home-page "https://github.com/kharchenkolab/pagoda2") + (synopsis "Single cell analysis and differential expression") + (description + "The package offers functions for analyzing and interactively exploring +large-scale single-cell RNA-seq datasets. Pagoda2 primarily performs +normalization and differential gene expression analysis, with an interactive +application for exploring single-cell RNA-seq datasets. It performs basic +tasks such as cell size normalization, gene variance normalization, and can be +used to identify subpopulations and run differential expression within +individual samples. pagoda2 was written to rapidly process modern large-scale +scRNAseq datasets of approximately 1e6 cells. The companion web application +allows users to explore which gene expression patterns form the different +subpopulations within your data. The package also serves as the primary +method for preprocessing data for conos.") + (license license:gpl3))) + (define-public r-pals (package (name "r-pals") -- cgit 1.4.1 From 1fb43d1d19515692b65986a16777b42ddb2fac5c Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:46 +0100 Subject: gnu: Add r-conos. * gnu/packages/bioconductor.scm (r-conos): New variable. --- gnu/packages/bioconductor.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8abbdfd026..45798e191f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5581,6 +5581,57 @@ provides a highly flexible way to arrange multiple heatmaps and supports self-defined annotation graphics.") (license license:gpl2+))) +;; This is a CRAN package, but it depends on r-complexheatmap from +;; Bioconductor. +(define-public r-conos + (package + (name "r-conos") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "conos" version)) + (sha256 + (base32 "1wdhb3jxh4id6xaghawzip8s264g9jxp4i5xy7jfhi67yfxszx6w")))) + (properties `((upstream-name . "conos"))) + (build-system r-build-system) + (propagated-inputs + (list r-abind + r-complexheatmap + r-cowplot + r-dendextend + r-dplyr + r-ggplot2 + r-ggrepel + r-gridextra + r-igraph + r-irlba + r-leidenalg + r-magrittr + r-matrix + r-n2r + r-r6 + r-rcpp + r-rcpparmadillo + r-rcppeigen + r-rcppprogress + r-reshape2 + r-rlang + r-rtsne + r-sccore)) + (home-page "https://github.com/kharchenkolab/conos") + (synopsis "Clustering on network of samples") + (description + "This package wires together large collections of single-cell RNA-seq +datasets, which allows for both the identification of recurrent cell clusters +and the propagation of information between datasets in multi-sample or +atlas-scale collections. Conos focuses on the uniform mapping of homologous +cell types across heterogeneous sample collections. For instance, users could +investigate a collection of dozens of peripheral blood samples from cancer +patients combined with dozens of controls, which perhaps includes samples of a +related tissue such as lymph nodes.") + (license license:gpl3))) + (define-public r-copywriter (package (name "r-copywriter") -- cgit 1.4.1 From df74c746887e903ef2a6ef9ce37f57a4aa5de1be Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:47 +0100 Subject: gnu: Add r-conospanel. * gnu/packages/bioinformatics.scm (r-conospanel): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9e8f7e92f8..ce998fb438 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -719,6 +719,30 @@ suite native in R.") for all types of microbial diversity analyses.") (license license:expat)))) +(define-public r-conospanel + (let ((commit "39e76b201a783b4e92fd615010a735a61746fbb9") + (revision "1")) + (package + (name "r-conospanel") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kharchenkolab/conosPanel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zf0aj5d4iaxc3ghvjnaja5qby1avlmljzh94bpyvxbd359z9snn")))) + (properties `((upstream-name . "conosPanel"))) + (build-system r-build-system) + (home-page "https://github.com/kharchenkolab/conosPanel") + (synopsis "Data for the conos package") + (description "The data within this package is a panel of four samples, +each with 3000 cells. There are two samples which are bone marrow (BM), and +two samples which are cord blood (CB).") + (license license:gpl3)))) + (define-public r-rhtslib12 (let ((commit "ee186daf04876969c7f31c16a0e0fda8e7c16a30") (revision "1")) -- cgit 1.4.1 From 60652a8efa7a0b22243ff29ceb4aa44a865a3c38 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:48 +0100 Subject: gnu: Add r-p2data. * gnu/packages/bioinformatics.scm (r-p2data): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ce998fb438..858fd1e975 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -743,6 +743,29 @@ each with 3000 cells. There are two samples which are bone marrow (BM), and two samples which are cord blood (CB).") (license license:gpl3)))) +(define-public r-p2data + (let ((commit "7d4c0e17d7899f9d9b08ab2bf455abe150912f4c") + (revision "1")) + (package + (name "r-p2data") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kharchenkolab/p2data") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hadrldldxvhqs43aqs3c88bqfgql3wcfkbll3jz7fh6z7p3x324")))) + (properties `((upstream-name . "p2data"))) + (build-system r-build-system) + (home-page "https://github.com/kharchenkolab/p2data") + (synopsis "Data for pagoda2") + (description "This package contains data used by pagoda2. The data +within this package are the 3000 bone marrow cells used for vignettes.") + (license license:gpl3)))) + (define-public r-rhtslib12 (let ((commit "ee186daf04876969c7f31c16a0e0fda8e7c16a30") (revision "1")) -- cgit 1.4.1 From 9ba8dd3bd2e4385fd099004a395d2a66c629f916 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:49 +0100 Subject: gnu: Add r-pma. * gnu/packages/cran.scm (r-pma): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5e69b7e3f6..412b46bc01 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -905,6 +905,26 @@ pronounceable identifiers.") can read and write both the metadata and the cell data in a Sheet.") (license license:expat))) +(define-public r-pma + (package + (name "r-pma") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "PMA" version)) + (sha256 + (base32 "1rhiylm3jfarnqdkv7nwg536sgsa30ic80dk9byks9w0wf4mn59s")))) + (properties `((upstream-name . "PMA"))) + (build-system r-build-system) + (home-page "https://github.com/bnaras/PMA") + (synopsis "Penalized multivariate analysis") + (description + "This package performs penalized multivariate analysis: a penalized +matrix decomposition, sparse principal components analysis, and sparse +canonical correlation analysis.") + (license license:gpl2+))) + (define-public r-proj4 (package (name "r-proj4") -- cgit 1.4.1 From f01b5299db6031174f05124b843c936388cd872a Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 27 Feb 2023 11:28:50 +0100 Subject: gnu: Add r-rmumps. * gnu/packages/cran.scm (r-rmumps): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 412b46bc01..a74432a29f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5867,6 +5867,33 @@ matrices.") provides an interactive R manager and worker environment.") (license license:gpl2+))) +(define-public r-rmumps + (package + (name "r-rmumps") + (version "5.2.1-22") + (source + (origin + (method url-fetch) + (uri (cran-uri "rmumps" version)) + (sha256 + (base32 "18wqy82hwnbiwqcyldg8ci0jmxfiaj65ila0fjzzv40d3kl8hx76")))) + (properties `((upstream-name . "rmumps"))) + (build-system r-build-system) + (inputs (list zlib)) + (propagated-inputs (list r-rcpp)) + (native-inputs (list gfortran)) + (home-page "https://www.mumps-solver.org/") + (synopsis "Wrapper for MUMPS library") + (description + "Some basic features of @acronym{MUMPS, Multifrontal Massively Parallel +sparse direct Solver} are wrapped in a class whose methods can be used for +sequentially solving a sparse linear system (symmetric or not) with one or +many right hand sides (dense or sparse). There is a possibility to do +separately symbolic analysis, LU (or LDL^t) factorization and system solving. +Third part ordering libraries are included and can be used: PORD, METIS, +SCOTCH.") + (license license:gpl2+))) + (define-public r-lmoments (package (name "r-lmoments") -- cgit 1.4.1 From f9abf24f242348db4af469c567f58b62cc181b2a Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Fri, 23 Dec 2022 19:22:32 +0100 Subject: gnu: Add python-pyee. * gnu/packages/python-xyz.scm (python-pyee): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1b137f867..ed1832730e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30758,6 +30758,27 @@ provide the ability to selectively apply arguments to callable objects and to reference instance methods using weak-references.") (license license:bsd-3))) +(define-public python-pyee + (package + (name "python-pyee") + (version "9.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyee" version)) + (sha256 + (base32 "0cjbxbqr9f8bn2h3ra69d550qj2r1hmsgrh5nx31ywmwia9c8w17")))) + (build-system python-build-system) + (propagated-inputs (list python-typing-extensions)) + (native-inputs (list python-twisted python-trio)) + (home-page "https://github.com/jfhbrook/pyee") + (synopsis "Emit events with Python") + (description + "This package provides a port of node.js's EventEmitter to python. +Additionally, it includes a number of subclasses useful for implementing async +and threaded programming in python, such as async/await.") + (license license:expat))) + (define-public python-queuelib (package (name "python-queuelib") -- cgit 1.4.1 From 722073b151da3f42d4e2d24fadcac561ed428a52 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Fri, 23 Dec 2022 19:32:59 +0100 Subject: gnu: Add python-pixelmatch. * gnu/packages/python-xyz.scm (python-pixelmatch): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ed1832730e..f2e107fae2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7699,6 +7699,26 @@ a general image processing tool.") (description "This package is a fork of Pillow which adds support for SIMD parallelism."))) +(define-public python-pixelmatch + (package + (name "python-pixelmatch") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pixelmatch" version)) + (sha256 + (base32 "16b0cz136dcmj4dbr505igpql8dmqmr9vni5nbaa5kygjfjkdynh")))) + (build-system python-build-system) + (native-inputs (list python-pillow)) + (home-page "https://github.com/whtsky/pixelmatch-py") + (synopsis "A pixel-level image comparison library") + (description "This package provides a pixel-level image comparison library +for Python, originally created to compare screenshots in tests. Its features +include accurate anti-aliased pixels detection and perceptual color difference +metrics.") + (license license:isc))) + (define-public python-imagecodecs (package (name "python-imagecodecs") -- cgit 1.4.1 From ec0f5b5f7eb53486f2c9e313521d497c0e64b004 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 30 Dec 2022 23:15:11 +0000 Subject: gnu: Add flat-remix-icon-theme. * gnu/packages/gnome-xyz.scm (flat-remix-icon-theme): New variable. Signed-off-by: Christopher Baines --- gnu/packages/gnome-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 74b676c484..0457b28bf7 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -239,6 +239,33 @@ simple and consistent.") and a few extra features.") (license license:gpl3))) +(define-public flat-remix-icon-theme + (package + (name "flat-remix-icon-theme") + (version "20220525") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/daniruiz/flat-remix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ygazxccqf7hn1hxnf1mmsp17gm1m4hpcandfz9v5ijrgkd1m596")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no included tests + #:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://drasite.com/flat-remix") + (synopsis "Icon theme with material design") + (description "Flat Remix is an icon theme inspired by material design. It +is mostly flat using a colorful palette with some shadows, highlights, and +gradients for some depth.") + (license license:gpl3+))) + (define-public gnome-plots (package (name "gnome-plots") -- cgit 1.4.1 From 4a15f2e2263e0bd43ea93bc3d81ce50f565b05cc Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 30 Dec 2022 23:17:23 +0000 Subject: gnu: Add flat-remix-gtk-theme. * gnu/packages/gnome-xyz.scm (flat-remix-gtk-theme): New variable. Signed-off-by: Christopher Baines --- gnu/packages/gnome-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0457b28bf7..e43b19d69c 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -266,6 +266,33 @@ is mostly flat using a colorful palette with some shadows, highlights, and gradients for some depth.") (license license:gpl3+))) +(define-public flat-remix-gtk-theme + (package + (name "flat-remix-gtk-theme") + (version "20220627") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/daniruiz/flat-remix-gtk") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kwahlrcm9rfsrd97q9lsbfz5390qafwbv78zl6j2vqgqnxhpwng")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no included tests + #:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://drasite.com/flat-remix-gtk") + (synopsis "GTK application theme with material design") + (description "Flat Remix GTK is a GTK application theme inspired by +material design. It is mostly flat using a colorful palette with some +shadows, highlights, and gradients for some depth.") + (license license:gpl3+))) + (define-public gnome-plots (package (name "gnome-plots") -- cgit 1.4.1 From fbcc42ad6c22ef7257daede968ff2b8d41bdd30d Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 30 Dec 2022 23:18:05 +0000 Subject: gnu: Add flat-remix-gnome-theme. * gnu/packages/gnome-xyz.scm (flat-remix-gnome-theme): New variable. Signed-off-by: Christopher Baines --- gnu/packages/gnome-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index e43b19d69c..19838c3dd5 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -293,6 +293,33 @@ material design. It is mostly flat using a colorful palette with some shadows, highlights, and gradients for some depth.") (license license:gpl3+))) +(define-public flat-remix-gnome-theme + (package + (name "flat-remix-gnome-theme") + (version "20221107-1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/daniruiz/flat-remix-gnome") + ;; This commit adds GtkSourceView 5 theme, for GNOME Text Editor. + (commit "b5616efc515e9f1417436e67d94718db7529a2ba"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10fgdz8hz8rd7aj4vb3bvl8khzb2fvaia7n00gi0x19yvnnh36pr")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + `(("share" "/") + ("themes" "/share/")))) + (home-page "https://drasite.com/flat-remix-gnome") + (synopsis "GNOME shell theme with material design") + (description "Flat Remix GNOME is a GNOME shell theme inspired by material +design. It is mostly flat using a colorful palette with some shadows, +highlights, and gradients for some depth.") + (license license:gpl3+))) + (define-public gnome-plots (package (name "gnome-plots") -- cgit 1.4.1 From a0da11ee473c1ec9abb43a1e36d5a9dd2906d828 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 4 Jan 2023 15:21:48 +0100 Subject: gnu: Add python-pypresence. * gnu/packages/messaging.scm (python-pypresence): New variable. Signed-off-by: Christopher Baines --- gnu/packages/messaging.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d540309a8f..5020146300 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2022 Jack Hill ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Giovanni Biscuolo +;;; Copyright © 2023 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -3460,6 +3461,23 @@ Discord.") (home-page "https://github.com/taylordotfish/harmony") (license license:gpl3+))) +(define-public python-pypresence + (package + (name "python-pypresence") + (version "4.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pypresence" version)) + (sha256 + (base32 + "0rp09lfxbc3syd1rhbai2516c3wyfxkzrsw8v4bd57qqr2cay7b9")))) + (build-system python-build-system) + (home-page "https://github.com/qwertyquerty/pypresence") + (synopsis "Discord RPC client") + (description "This package provides @code{python-pypresence}, a Discord +RPC client written in Python.") + (license license:expat))) + (define-public pn (package (name "pn") -- cgit 1.4.1 From 72ec11d24f34104efce0d91050a3faba4e2c7242 Mon Sep 17 00:00:00 2001 From: r0man Date: Sun, 5 Feb 2023 11:01:17 +0100 Subject: gnu: icecat: Remove unsupported --disable-eme option on aarch64. * gnu/packages/gnuzilla.scm (icecat): Remove unsupported --disable-eme option on aarch64. Signed-off-by: Christopher Baines --- gnu/packages/gnuzilla.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5fb9afa325..5a2e716042 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -771,7 +771,8 @@ variable defined below. It requires guile-json to be installed." "--disable-tests" "--disable-updater" "--disable-crashreporter" - "--disable-eme" + ;; The --disable-eme option is not available on aarch64. + #$(if (target-aarch64?) "" "--disable-eme") ;; Building with debugging symbols takes ~5GiB, so disable it. "--disable-debug" -- cgit 1.4.1 From 48cda62fb0a878a66e90bf00ccc336e626c25350 Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Sun, 29 Jan 2023 16:29:13 +0900 Subject: gnu: Add font-apl2741-unicode. * gnu/packages/apl.scm (font-apl2741-unicode): New variable. Signed-off-by: Christopher Baines --- gnu/packages/apl.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index e483876cc5..6a8d97848b 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2022 Paul A. Patience +;;; Copyright © 2023 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,8 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) @@ -76,3 +79,44 @@ "GNU APL is a free interpreter for the programming language APL. It is an implementation of the ISO standard 13751.") (license license:gpl3+)))) + +(define-public font-apl2741-unicode + (let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03")) + (package + (name "font-apl2741-unicode") + (version "1668049300") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abrudz/APL2741.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y")))) + (build-system trivial-build-system) + (native-inputs (list fontforge)) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (dest (string-append out "/share/fonts/truetype")) + (fontforge (string-append + (assoc-ref %build-inputs "fontforge") + "/bin/fontforge"))) + (mkdir-p dest) + (invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)" + (string-append source "/APL2741.sfd") + (string-append dest "/APL2741.ttf")))))) + (synopsis "APL2741 Unicode font") + (home-page "https://abrudz.github.io/APL2741/") + (description "APL font based on Adrian Smith's IBM Selectric APL2741 +golf-ball font. It supports most special characters used by popular APL +implementations, some additional mathematical and typographical symbols, +single line drawing characters, as well as the full Unicode APL range, +including both uppercase and lowercase underscored alphabets, as-of-yet unused +symbols, and almost all Latin-1 accented letters.") + (license license:unlicense)))) -- cgit 1.4.1 From 9a4dd01f1da2681fef8f89d43a43efa4ccbb5a16 Mon Sep 17 00:00:00 2001 From: Simon South Date: Thu, 2 Feb 2023 15:25:00 -0500 Subject: gnu: font-google-noto-emoji: Install correct license file. * gnu/packages/fonts.scm (font-google-noto-emoji)[arguments]<#:phases>: Add "enter-font-directory" phase; remove now-superfluous prefix from paths in "remove-unsupported" phase. Signed-off-by: Christopher Baines --- gnu/packages/fonts.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 13699cdfce..33935c5699 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -982,11 +982,15 @@ display all Unicode symbols.") (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-unsupported + (add-after 'unpack 'enter-font-directory + (lambda _ + ;; Note this ensures the correct license file is installed. + (chdir "fonts"))) + (add-after 'enter-font-directory 'remove-unsupported (lambda* _ - (delete-file "fonts/NotoColorEmoji_WindowsCompatible.ttf") - (delete-file "fonts/Noto-COLRv1-noflags.ttf") - (delete-file "fonts/Noto-COLRv1.ttf")))))) + (delete-file "NotoColorEmoji_WindowsCompatible.ttf") + (delete-file "Noto-COLRv1-noflags.ttf") + (delete-file "Noto-COLRv1.ttf")))))) (home-page "https://fonts.google.com/noto/specimen/Noto+Color+Emoji") (synopsis "Font for rendering color emoji characters") (description -- cgit 1.4.1 From 4ccba48de14cc10f40abb1a5237749346222b6e7 Mon Sep 17 00:00:00 2001 From: Alice BRENON Date: Tue, 7 Feb 2023 11:05:47 +0100 Subject: gnu: Add ghc-hs-conllu. * gnu/packages/haskell-xyz (ghc-hs-conllu): New variable. Signed-off-by: Christopher Baines --- gnu/packages/haskell-xyz.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b6c3a71045..86af842980 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christine Lemmer-Webber -;;; Copyright © 2021, 2022 Alice BRENON +;;; Copyright © 2021–2023 Alice BRENON ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 jgart ;;; @@ -5427,6 +5427,26 @@ that interconverts between various bibliography formats using a common MODS-format XML intermediate.") (license license:gpl2+))) +(define-public ghc-hs-conllu + (package + (name "ghc-hs-conllu") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (hackage-uri "hs-conllu" version)) + (sha256 + (base32 + "1azh4g5kdng8v729ldgblkmrdqrc501rgm9wwqx6gkqwwzn8w3r4")))) + (build-system haskell-build-system) + (inputs (list ghc-megaparsec ghc-void)) + (home-page "https://github.com/arademaker/hs-conllu") + (synopsis "CoNLL-U validating parser and utils") + (description + "Utilities to parse, print, diff, and analyse data in CoNLL-U, a format +used in linguistics to represent the syntactic annotation of sentences. See +@url{https://universaldependencies.org/format.html}") + (license license:lgpl3))) + (define-public ghc-hslogger (package (name "ghc-hslogger") -- cgit 1.4.1 From c05adaddb14064f0d2817e331fe5d0618f218bb9 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sun, 12 Feb 2023 15:54:49 -0800 Subject: gnu: Add emacs-motif. * gnu/packages/text-editors.scm (emacs-motif): New variable. Signed-off-by: Christopher Baines --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 51ce4e481b..94d08244d1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) + #:use-module (gnu packages lesstif) ; motif #:use-module (gnu packages linux) ; alsa-lib, gpm #:use-module (gnu packages mail) ; for mailutils #:use-module (gnu packages multiprecision) @@ -512,6 +513,30 @@ editor (with xwidgets support)") (modify-inputs (package-inputs emacs) (prepend webkitgtk-with-libsoup2 libxcomposite))))) +(define-public emacs-motif + (package/inherit emacs + (name "emacs-motif") + (synopsis + "The extensible, customizable, self-documenting text editor (with Motif +toolkit)") + (build-system gnu-build-system) + (inputs (modify-inputs (package-inputs emacs) + (delete "gtk+") + (prepend inotify-tools motif))) + (arguments + (substitute-keyword-arguments + (package-arguments + emacs) + ((#:configure-flags flags #~'()) + #~(cons "--with-x-toolkit=motif" + #$flags)) + ((#:modules _) + (%emacs-modules build-system)) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))))) + (define-public emacs-no-x (package/inherit emacs (name "emacs-no-x") -- cgit 1.4.1 From 5064d184f2cb9157aa9c9968f3cb0613e2ef7061 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 13:35:40 +0100 Subject: gnu: monero: Update to 0.18.2.0. * gnu/packages/finance.scm (monero): Update to 0.18.2.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index d2da017091..77b891dedc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -713,7 +713,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.1.2") + (version "0.18.2.0") (source (origin (method git-fetch) @@ -731,7 +731,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "033hfc98gv28x05gc1ln6dmyc45cki4qdylmz35wh4dchyr74pf9")))) + (base32 "0k41mkz0lp8qavgy3d9813pkmyy8rnhd0fl7wvzdhr7fznqn9sca")))) (build-system cmake-build-system) (native-inputs (list doxygen -- cgit 1.4.1 From 0987dcc3e1c7d36e5e5db74725308a74fa0a7eda Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 15:06:24 +0100 Subject: gnu: p2pool: Update to 3.1. * gnu/packages/finance.scm (p2pool): Update to 3.1. [arguments]: Add 'configure-flags". Add custom 'check' phase and enable tests. --- gnu/packages/finance.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 77b891dedc..c13a19bd9e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2250,7 +2250,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "2.6") + (version "3.1") (source (origin (method git-fetch) @@ -2259,7 +2259,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "0832mv3f4c61w8s25higjbmmajjkvjdriw1xfygjiw5qxdcs202z")) + (sha256 (base32 "0fvm864p4pxjsb03g88jkaj3wj94dkxrbwjwa1jk6s11skzn0z68")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively @@ -2273,13 +2273,22 @@ mining.") (inputs (list cppzmq curl gss libuv rapidjson zeromq)) (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - (replace 'install - (lambda _ - (install-file "p2pool" (string-append #$output "/bin"))))))) + (list ; FIXME: Linking fails when LTO is activated. + #:configure-flags #~(list "-DWITH_LTO=OFF") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (mkdir-p "tests") + (chdir "tests") + (invoke "cmake" "../../source/tests") + (invoke "make" "-j" (number->string (parallel-job-count))) + (invoke "./p2pool_tests") + (chdir "..")))) + (replace 'install + (lambda _ + (install-file "p2pool" (string-append #$output "/bin"))))))) (home-page "https://p2pool.io/") (synopsis "Decentralized Monero mining pool") (description "Monero P2Pool is a peer-to-peer Monero mining pool. P2Pool -- cgit 1.4.1 From f3a3e5fc763b5a6216ca11dfe012ee05c6e485d0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 15:28:21 +0100 Subject: gnu: monero-gui: Update to 0.18.2.0. * gnu/packages/finance.scm (monero-gui): Update to 0.18.2.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c13a19bd9e..932964e1c5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -818,7 +818,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.1.2") + (version "0.18.2.0") (source (origin (method git-fetch) @@ -834,7 +834,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "1lwlkqj8liflk0jfzmlclm1xca0x3z8v3kcbzd671rgismm8v332")))) + (base32 "0ka20p4f6fbhkhrm1jbssnjh5sjl419fy418jl8hcg34jriywvck")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit 1.4.1 From f2f530e808c26360f2697bd975f1afd599a5de29 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 15:42:11 +0100 Subject: gnu: xmrig: Update to 6.19.0. * gnu/packages/finance.scm (xmrig): Update to 6.19.0. --- gnu/packages/finance.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 932964e1c5..8e1c8fd568 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2194,7 +2194,7 @@ and manipulation.") (define-public xmrig (package (name "xmrig") - (version "6.18.1") + (version "6.19.0") (source (origin (method git-fetch) @@ -2202,17 +2202,19 @@ and manipulation.") (url "https://github.com/xmrig/xmrig") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "0f0kly374pkgnpnx60hac0bg9297a5zhycss6p37iavayn28jg39")) + (sha256 (base32 "10vaq6ld4sddnpmv9dg71fjvw1jrfaddrp3bq6p3dxhsl153khm4")) (modules '((guix build utils))) (snippet ;; TODO: Try to use system libraries instead of bundled ones in ;; "src/3rdparty/". It requires changes to some "cmake/..." scripts ;; and to some source files. - #~(substitute* "src/donate.h" - (("constexpr const int kDefaultDonateLevel = 1;") - "constexpr const int kDefaultDonateLevel = 0;") - (("constexpr const int kMinimumDonateLevel = 1;") - "constexpr const int kMinimumDonateLevel = 0;"))))) + #~(begin + (delete-file-recursively "src/3rdparty/hwloc") + (substitute* "src/donate.h" + (("constexpr const int kDefaultDonateLevel = 1;") + "constexpr const int kDefaultDonateLevel = 0;") + (("constexpr const int kMinimumDonateLevel = 1;") + "constexpr const int kMinimumDonateLevel = 0;")))))) (build-system cmake-build-system) (inputs (list -- cgit 1.4.1 From 8291682af79b61225a7b39a73f2639a60eccdd2b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 16:06:52 +0100 Subject: gnu: csdr: Update to 0.18.1. * gnu/packages/radio.scm (csdr): Update to 0.18.1. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 59baf72cab..e5cf6af461 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2126,7 +2126,7 @@ defined radio with support for rtl-sdr.") (define-public csdr (package (name "csdr") - (version "0.18.0") + (version "0.18.1") (source (origin (method git-fetch) @@ -2135,7 +2135,7 @@ defined radio with support for rtl-sdr.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0sdni0p9qcf4yw1wf5jz1pyb9wv6wmdblirh2q6s7jblh50vfwz1")))) + (base32 "1vgl7d03khdql45jq5xxayqfhb5sasxhjmrl621gyk1k8kxaqs8a")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From ab6e434eaab270fdbb3403935ef177cfec542ea5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Mar 2023 16:30:23 +0100 Subject: gnu: sdrangel: Update to 7.10.0. * gnu/packages/radio.scm (sdrangel): Update to 7.10.0. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e5cf6af461..d981445db1 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2357,7 +2357,7 @@ voice formats.") (define-public sdrangel (package (name "sdrangel") - (version "7.8.6") + (version "7.10.0") (source (origin (method git-fetch) @@ -2366,7 +2366,7 @@ voice formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0znri1sssc9hw4j6s3bmp8hfza88jv2xqvdx8v6z7m2zf4w3dddl")))) + (base32 "0rl2qnc9s8cjwv77vfwgj66rz5zbxmixqh0gg6b29s4667pjvil6")))) (build-system qt-build-system) (native-inputs (list doxygen graphviz pkg-config)) -- cgit 1.4.1 From f0f5f011974d82de12b7db849f4658a8dd0f207e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Mar 2023 11:14:47 -0500 Subject: gnu: emacs-bash-completion: Update to 3.1.1-0.796a806. * gnu/packages/emacs-xyz.scm (emacs-bash-completion): Update to 3.1.1-0.796a806. [phases]: Delete make-git-checkout-writable phase. --- gnu/packages/emacs-xyz.scm | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d2ad6a8cf7..3f7fcf4481 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19458,38 +19458,40 @@ Slack client.") (license license:gpl3+)))) (define-public emacs-bash-completion - (package - (name "emacs-bash-completion") - (version "3.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/szermatt/emacs-bash-completion") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0cly0m6msn8xv9857nv4syw8fldqzvsa4kciq7av40y26a61hvrh")))) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (λ _ - (for-each make-file-writable (find-files ".")))) - (add-before 'install 'configure - (lambda* (#:key inputs #:allow-other-keys) - (emacs-substitute-variables "bash-completion.el" - ("bash-completion-prog" - (search-input-file inputs "/bin/bash")))))))) - (inputs (list bash)) - (home-page "https://github.com/szermatt/emacs-bash-completion") - (synopsis "Bash completion for the shell buffer") - (description - "Bash Completion defines dynamic completion hooks for Shell mode and + ;; This commit includes unreleased fixes that make using completion inside + ;; 'guix shell' possible (see: + ;; https://github.com/szermatt/emacs-bash-completion/issues/62). + (let ((commit "796a806c5531fc20afea590ba3c1d8a42fb793fc") + (revision "0")) + (package + (name "emacs-bash-completion") + (version (git-version "3.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/szermatt/emacs-bash-completion") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13mdb5arifkwghdclvp23q336n49x2hgqnll7m1lg3nh6jgq8jvk")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'configure + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "bash-completion.el" + ("bash-completion-prog" + (search-input-file inputs "/bin/bash")))))))) + (inputs (list bash)) + (home-page "https://github.com/szermatt/emacs-bash-completion") + (synopsis "Bash completion for the shell buffer") + (description + "Bash Completion defines dynamic completion hooks for Shell mode and @code{shell-command} prompts that are based on Bash completion.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public emacs-easy-kill (package -- cgit 1.4.1 From 242c3e9300a8e3263c1c9733d4bb79dbddc77767 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 1 Mar 2023 08:23:37 +0100 Subject: gnu: Add r-biglm. * gnu/packages/cran.scm (r-biglm): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a74432a29f..147af98836 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1165,6 +1165,29 @@ The package provides functions for point generation, arc length estimation, degree elevation and curve fitting.") (license license:gpl2+))) +(define-public r-biglm + (package + (name "r-biglm") + (version "0.9-2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "biglm" version)) + (sha256 + (base32 "0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd")))) + (properties `((upstream-name . "biglm"))) + (build-system r-build-system) + (propagated-inputs (list r-dbi)) + (native-inputs (list gfortran)) + (home-page "https://cran.r-project.org/package=biglm") + (synopsis "Bounded memory linear and generalized linear models") + (description "The biglm package lets you create a linear model object that +uses only code{p^2} memory for @code{p} variables. It can be updated with +more data using @code{update}. This allows linear regression on data sets +larger than memory.") + ;; Expanded from GPL + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-bwstest (package (name "r-bwstest") -- cgit 1.4.1 From b9be025b0ed50aa363d1955d43ccb76b3f48df4e Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 1 Mar 2023 08:23:38 +0100 Subject: gnu: Add r-cplm. * gnu/packages/cran.scm (r-cplm): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 147af98836..97add3e81e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -325,6 +325,41 @@ are included as well.") queues, stacks, deques, dicts and ordered dicts.") (license license:expat))) +(define-public r-cplm + (package + (name "r-cplm") + (version "0.7-10") + (source + (origin + (method url-fetch) + (uri (cran-uri "cplm" version)) + (sha256 + (base32 "0mqjk10265hq9bc5ihmgbx1l8fzay1gpdlvx3pirqmvr3w1kwlxk")))) + (properties `((upstream-name . "cplm"))) + (build-system r-build-system) + (propagated-inputs + (list r-biglm + r-coda + r-ggplot2 + r-matrix + r-minqa + r-nlme + r-reshape2 + r-statmod + r-tweedie)) + (home-page "https://github.com/actuaryzhang/cplm") + (synopsis "Compound Poisson linear models") + (description "The Tweedie compound Poisson distribution is a mixture of a +degenerate distribution at the origin and a continuous distribution on the +positive real line. It has been applied in a wide range of fields in which +continuous data with exact zeros regularly arise. The cplm package provides +likelihood based and Bayesian procedures for fitting common Tweedie compound +Poisson linear models. In particular, models with hierarchical structures or +extra zero inflation can be handled. Further, the package implements the Gini +index based on an ordered version of the Lorenz curve as a robust model +comparison tool involving zero-inflated and highly skewed distributions.") + (license license:gpl2+))) + (define-public r-curry (package (name "r-curry") -- cgit 1.4.1 From 8e5a6b35fdc1aa02b772fa57e37fadc303a45df4 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 23 Feb 2023 00:56:33 +0100 Subject: gnu: Add r-som. * gnu/packages/cran.scm (r-som): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 97add3e81e..2b42d55b1e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16283,6 +16283,35 @@ value decompositions} (SVDs) on large sparse centered matrices (i.e. principal components).") (license license:gpl2))) +(define-public r-som + (package + (name "r-som") + (version "0.3-5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "som" version)) + (sha256 + (base32 "1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56")))) + (properties `((upstream-name . "som"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=som") + (synopsis "Self-organizing map") + (description + "This package implements a self-organizing map which has application in +gene clustering. It provides functions like: + +@itemize +@item filtering data by certain floor, ceiling, max/min ratio, and max - min + difference; +@item normalization of the data; +@item get the average distortion measure; +@item train a self-organizing map; +@item summarize a som object; +@item yeast cell cycle. +@end itemize") + (license license:gpl3+))) + (define-public r-fftwtools (package (name "r-fftwtools") -- cgit 1.4.1 From 19764c06b778bb6cec3424857872d4c84dbda3ff Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 23 Feb 2023 01:20:10 +0100 Subject: gnu: Add r-chemometrics. * gnu/packages/cran.scm (r-chemometrics): New variable. --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2b42d55b1e..6dced3b93e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17268,6 +17268,45 @@ order (univariate) isotonic regression and bivariate isotonic regression with linear order on both variables.") (license license:gpl2+))) +(define-public r-chemometrics + (package + (name "r-chemometrics") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "chemometrics" version)) + (sha256 + (base32 "0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp")))) + (properties `((upstream-name . "chemometrics"))) + (build-system r-build-system) + (propagated-inputs + (list r-class + r-e1071 + r-lars + r-mass + r-mclust + r-nnet + r-pcapp + r-pls + r-robustbase + r-rpart + r-som)) + (home-page "http://www.statistik.tuwien.ac.at/public/filz/") + (synopsis "Multivariate statistical analysis in Chemometrics") + (description + "Multivariate data analysis is the simultaneous observation of more than +one characteristic. In contrast to the analysis of univariate data, in this +approach not only a single variable or the relation between two variables can +be investigated, but the relations between many attributes can be considered. +For the statistical analysis of chemical data one has to take into account the +special structure of this type of data. This package contains about 30 +functions, mostly for regression, classification and model evaluation and +includes some data sets used in the R help examples. It was designed as a R +companion to the book \"Introduction to Multivariate Statistical Analysis in +Chemometrics\" written by K. Varmuza and P. Filzmoser (2009).") + (license license:gpl3+))) + (define-public r-chemometricswithr (package (name "r-chemometricswithr") -- cgit 1.4.1 From 3e4de18d3ea5ec6230d239af797f1ea9884cf38f Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 23 Feb 2023 01:35:43 +0100 Subject: gnu: Add r-metagenomeseq. * gnu/packages/bioconductor.scm (r-metagenomeseq): New variable. --- gnu/packages/bioconductor.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 45798e191f..5d99a4e8ce 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6695,6 +6695,40 @@ experiments.") and visualizaton of alternative splicing events generated by rMATS.") (license license:expat))) +(define-public r-metagenomeseq + (package + (name "r-metagenomeseq") + (version "1.40.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "metagenomeSeq" version)) + (sha256 + (base32 "01wjw4kcm8ysa5sn3cqg4a9i5pyksnwmbdqp5fr6n2l9hllkc9jy")))) + (properties `((upstream-name . "metagenomeSeq"))) + (build-system r-build-system) + (propagated-inputs + (list r-biobase + r-foreach + r-glmnet + r-gplots + r-limma + r-matrix + r-matrixstats + r-rcolorbrewer + r-wrench)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/HCBravoLab/metagenomeSeq") + (synopsis "Statistical analysis for sparse high-throughput sequencing") + (description + "MetagenomeSeq is designed to determine features (be it @acronym{OTU, +Operational Taxanomic Unit}, species, etc.) that are differentially abundant +between two or more groups of multiple samples. This package is designed to +address the effects of both normalization and under-sampling of microbial +communities on disease association detection and the testing of feature +correlations.") + (license license:artistic2.0))) + (define-public r-metaneighbor (package (name "r-metaneighbor") -- cgit 1.4.1 From 7dc190f83ed29ca7e556700de13a3101e73ec745 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 1 Mar 2023 04:17:48 +0100 Subject: gnu: Add r-maaslin2. * gnu/packages/bioconductor.scm (r-maaslin2): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5d99a4e8ce..2bfca85bbc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -33,6 +33,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system r) #:use-module (gnu packages) @@ -6584,6 +6585,73 @@ and the assessment of differential expression. The analysis methods apply to different technologies, including microarrays, RNA-seq, and quantitative PCR.") (license license:gpl2+))) +(define-public r-maaslin2 + (package + (name "r-maaslin2") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "Maaslin2" version)) + (sha256 + (base32 "0ncvsywn9f8766gjb8nxzg82p3w30g8pjs85sy8s0bz9ilanpy89")))) + (properties `((upstream-name . "Maaslin2"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'check 'remove-timestamps + (lambda _ + (with-directory-excursion + (string-append #$output "/site-library/Maaslin2/doc/demo_output/") + ;; Delete this log file with timestamps. + (delete-file "maaslin2.log") + ;; Replace PDF timestamps with an arbitrary fixed timestamp. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* (find-files "." "\\.pdf$") + (("/CreationDate \\(D:.*\\)") + "/CreationDate (D:20230301143558)") + (("/ModDate \\(D:.*\\)") + "/ModDate (D:20230301143558)"))))))))) + (propagated-inputs + (list r-biglm + r-car + r-chemometrics + r-cplm + r-data-table + r-dplyr + r-edger + r-ggplot2 + r-glmmtmb + r-hash + r-lme4 + r-lmertest + r-logging + r-lpsymphony + r-mass + r-mumin + r-metagenomeseq + r-optparse + r-pbapply + r-pcapp + r-pheatmap + r-pscl + r-rmarkdown + r-robustbase + r-vegan)) + (native-inputs (list r-knitr)) + (home-page "http://huttenhower.sph.harvard.edu/maaslin2") + (synopsis + "Multivariable association discovery in population-scale meta-omics studies") + (description + "MaAsLin2 is comprehensive R package for efficiently determining multivariable +association between clinical metadata and microbial meta'omic features. This +package relies on general linear models to accommodate most modern epidemiological +study designs, including cross-sectional and longitudinal, and offers a variety +of data exploration, normalization, and transformation methods.") + (license license:expat))) + (define-public r-made4 (package (name "r-made4") -- cgit 1.4.1 From ac9ccf03a6dabaf385901dd927e2e2de0a9ee0f4 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Mon, 27 Feb 2023 00:17:12 +0000 Subject: gnu: mympd: Update to 10.2.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpd.scm (mympd): Update to 10.2.4. Signed-off-by: 宋文武 --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5288aeda3e..6b7c78c71b 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -600,7 +600,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "10.2.3") + (version "10.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -609,7 +609,7 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "001lnsva7rxyp0xk3xm2pcr5d4y3k5ikll6i4rrp9gqw9qs5yj52")))) + "0544vx9x103394mz2x92ycfj5lh59xrzcvagi4q0jb9b1hh44s6p")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no test target -- cgit 1.4.1 From 66e677f58eea6db97eeb14b08c2a9feb74f1d220 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 24 Feb 2023 15:15:24 +0100 Subject: gnu: dos2unix: Update to 7.4.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/textutils.scm (dos2unix): Update to 7.4.4. Signed-off-by: 宋文武 --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index aeff4593a8..9efcda688b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -79,14 +79,14 @@ (define-public dos2unix (package (name "dos2unix") - (version "7.4.3") + (version "7.4.4") (source (origin (method url-fetch) (uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/" "dos2unix-" version ".tar.gz")) (sha256 - (base32 "0wnacvz99rnlx0ayf5jrxwljvh801r8k1ai3hj137yfsaqcv93dn")))) + (base32 "0vj3wix17vl7a85hg673qqyrhw9sbq0xiadbbij7v0nm1gdl3a18")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From ad82d834f63aa24199d67a060864c1a620c3a6e1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 24 Feb 2023 15:15:25 +0100 Subject: gnu: dos2unix: Use new package style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/textutils.scm (dos2unix)[arguments]: Use gexps. [native-inputs]: Drop labels. Signed-off-by: 宋文武 --- gnu/packages/textutils.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 9efcda688b..e5d3a0efc0 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -89,15 +89,14 @@ (base32 "0vj3wix17vl7a85hg673qqyrhw9sbq0xiadbbij7v0nm1gdl3a18")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; no configure script (native-inputs - `(("gettext" ,gettext-minimal) - ("perl" ,perl))) + (list gettext-minimal perl)) (home-page "https://waterlan.home.xs4all.nl/dos2unix.html") (synopsis "DOS/Mac to Unix and vice versa text file format converter") (description -- cgit 1.4.1 From 7493ff7ae3275dd4a21fdf904d74a23fc459c661 Mon Sep 17 00:00:00 2001 From: Philippe SWARTVAGHER Date: Thu, 23 Feb 2023 13:32:27 +0100 Subject: gnu: cloc: Update to 1.96.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/code.scm (cloc): Update to 1.96.1. Signed-off-by: 宋文武 --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 88c251f770..5267825ec0 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -323,7 +323,7 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.94") + (version "1.96.1") (source (origin (method git-fetch) @@ -332,7 +332,7 @@ COCOMO model or user-provided parameters.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "082kkzr168lkv35hvijq95b817lyj2azcwld47xpws9h35556jlv")))) + (base32 "0j7qwc5n1y05jl3rq83mf1d0pavkz9z0waqi8dxblkgw4pwwnjyv")))) (build-system gnu-build-system) (inputs (list coreutils -- cgit 1.4.1 From c53e8404e80d2ac99335697b534fd4650e724268 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 31 Jan 2023 15:27:38 +0800 Subject: gnu: Remove broken xf86 video drivers. Those packages build failed with current xorg-server: openchrome: multiple definition of some functions. other: missing headers for xf86RamDac.h, IBM.h, etc. * gnu/packages/xorg.scm (xf86-video-glint, xf86-video-openchrome xf86-video-suncg6, xf86-video-sunffb, xf86-video-tga xf86-video-trident): Remove packages. * gnu/packages/patches/xf86-video-tga-remove-mibstore.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xf86-video-tga-remove-mibstore.patch | 34 ----- gnu/packages/xorg.scm | 149 --------------------- 3 files changed, 184 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-tga-remove-mibstore.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index dd1d546be5..69781a0b8b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2006,7 +2006,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ - %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ diff --git a/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch b/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch deleted file mode 100644 index b1a96c3f10..0000000000 --- a/gnu/packages/patches/xf86-video-tga-remove-mibstore.patch +++ /dev/null @@ -1,34 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - ---- xf86-video-tga-1.2.2/src/tga_accel.c.~1~ 2012-07-15 23:54:04.000000000 -0400 -+++ xf86-video-tga-1.2.2/src/tga_accel.c 2014-12-19 01:40:27.535913013 -0500 -@@ -37,7 +37,6 @@ - #include "xf86cmap.h" - #include "mipointer.h" - --#include "mibstore.h" - #include "miline.h" - - #include "tga_regs.h" ---- xf86-video-tga-1.2.2/src/tga_driver.c.~1~ 2012-07-15 23:54:28.000000000 -0400 -+++ xf86-video-tga-1.2.2/src/tga_driver.c 2014-12-19 01:40:48.756018238 -0500 -@@ -46,8 +46,6 @@ - - /* software cursor */ - #include "mipointer.h" --/* backing store */ --#include "mibstore.h" - - /* #include "mibank.h" */ - /* colormap manipulation */ -@@ -1451,7 +1449,6 @@ - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3093070c91..e916ca0012 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2841,30 +2841,6 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") ;; "xf86-video-glide is a Glide video driver for the Xorg X server.") ;; (license license:x11))) -(define-public xf86-video-glint - (package - (name "xf86-video-glint") - (version "1.2.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-glint-" - version - ".tar.bz2")) - (sha256 - (base32 - "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45")))) - (build-system gnu-build-system) - (inputs (list xorgproto xorg-server)) - (native-inputs (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "GLINT/Permedia video driver for X server") - (description - "xf86-video-glint is a GLINT/Permedia video driver for the Xorg -X server.") - (license license:x11))) - (define-public xf86-video-i128 (package (name "xf86-video-i128") @@ -3077,37 +3053,6 @@ supported, and the RENDER extension is not accelerated by this driver.") graphics cards.") (license license:x11))) -(define-public xf86-video-openchrome - (package - (name "xf86-video-openchrome") - (version "0.6.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-openchrome-" - version - ".tar.bz2")) - (sha256 - (base32 - "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs")))) - (build-system gnu-build-system) - (inputs (list libx11 - libxext - libxvmc - mesa - xorgproto - xorg-server)) - (native-inputs - (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "Openchrome video driver for X server") - (description - "xf86-video-openchrome is a video driver for the Xorg X server. -This driver is intended for VIA chipsets featuring the VIA UniChrome, -UniChrome Pro and Chrome9 integrated graphics processors.") - (license license:x11))) - (define-public xf86-video-qxl (package (name "xf86-video-qxl") @@ -3227,52 +3172,6 @@ Xorg X server.") This driver supports SiS chipsets of 300/315/330/340 series.") (license license:bsd-3))) -(define-public xf86-video-suncg6 - (package - (name "xf86-video-suncg6") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-suncg6-" - version - ".tar.xz")) - (sha256 - (base32 - "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w")))) - (build-system gnu-build-system) - (inputs (list xorg-server)) - (native-inputs (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "GX/TurboGX video driver for X server") - (description - "xf86-video-suncg6 is a GX/TurboGX video driver for the Xorg X server.") - (license license:x11))) - -(define-public xf86-video-sunffb - (package - (name "xf86-video-sunffb") - (version "1.2.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-sunffb-" - version - ".tar.xz")) - (sha256 - (base32 - "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi")))) - (build-system gnu-build-system) - (inputs (list xorg-server)) - (native-inputs (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "SUNFFB video driver for X server") - (description - "xf86-video-sunffb is a SUNFFB video driver for the Xorg X server.") - (license license:x11))) - (define-public xf86-video-tdfx (package (name "xf86-video-tdfx") @@ -3296,54 +3195,6 @@ This driver supports SiS chipsets of 300/315/330/340 series.") "xf86-video-tdfx is a 3Dfx video driver for the Xorg X server.") (license license:x11))) -(define-public xf86-video-tga - (package - (name "xf86-video-tga") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-tga-" - version - ".tar.bz2")) - (sha256 - (base32 - "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0")) - (patches (search-patches "xf86-video-tga-remove-mibstore.patch")))) - (build-system gnu-build-system) - (inputs (list xorgproto xorg-server)) - (native-inputs (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "TGA video driver for X server") - (description - "xf86-video-tga is a TGA (DEC 21030) video driver for the Xorg -X server.") - (license license:x11))) - -(define-public xf86-video-trident - (package - (name "xf86-video-trident") - (version "1.3.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-trident-" - version - ".tar.bz2")) - (sha256 - (base32 - "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy")))) - (build-system gnu-build-system) - (inputs (list xorgproto xorg-server)) - (native-inputs (list pkg-config)) - (home-page "https://www.x.org/wiki/") - (synopsis "Trident video driver for X server") - (description - "xf86-video-trident is a Trident video driver for the Xorg X server.") - (license license:x11))) - ;; no license ;; (define-public xf86-video-v4l -- cgit 1.4.1 From e7e1f585639c3c14c2f134301fb5352ee9df9b18 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 8 Feb 2023 15:09:30 +0800 Subject: gnu: gimp: Don't retain reference on GCC. Partly fixes . * gnu/packages/gimp.scm (gimp)[arguments]: Add #:modules and #:phases. --- gnu/packages/gimp.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index beb43f0ae2..69281f98e9 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -302,6 +302,19 @@ buffers.") "doc")) ; 9 MiB of gtk-doc HTML (arguments (list + #:modules `((ice-9 popen) + (ice-9 rdelim) + ,@%gnu-build-system-modules) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-gcc-reference + ;; Avoid reference to GCC. + (lambda _ + (let* ((port (open-input-pipe "gcc -v 2>&1 | tail -n 1")) + (cc-version (read-line port))) + (close-pipe port) + (substitute* "app/gimp-version.c" + (("CC_VERSION") (string-append "\"" cc-version "\""))))))) #:configure-flags #~(list (string-append "--with-html-dir=" #$output "/share/gtk-doc/html") -- cgit 1.4.1 From 03b463b68ba62b0b6f11a585240829fddef37f48 Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Sat, 25 Feb 2023 11:56:46 -0800 Subject: gnu: FFmpeg: Enable libwebp. * gnu/packages/video.scm (ffmpeg)[inputs]: Add libwebp. [arguments]: Pass '--enable-libwebp' to #:configure-flags. (ffmpeg-2.8)[inputs]: Remove libwebp. Co-authored-by: Leo Famulari --- gnu/packages/video.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f63d5494de..13299fdf06 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1634,6 +1634,7 @@ operate properly.") libvdpau libvorbis libvpx + libwebp libx11 libx264 mesa @@ -1731,6 +1732,7 @@ operate properly.") "--enable-libvidstab" "--enable-libvorbis" "--enable-libvpx" + "--enable-libwebp" "--enable-libxvid" "--enable-libx264" "--enable-libx265" @@ -1877,7 +1879,11 @@ audio/video codec library.") (let* ((dso (find-files "." "\\.so$")) (path (string-join (map dirname dso) ":"))) (format #t "setting LD_LIBRARY_PATH to ~s~%" path) - (setenv "LD_LIBRARY_PATH" path))))))))) + (setenv "LD_LIBRARY_PATH" path))))))) + ;; FFmpeg 2.8 does support libwebp, but we don't enable it while configuring + ;; the build, and we'd rather not add features to this old package anymore. + (inputs (modify-inputs (package-inputs ffmpeg-3.4) + (delete "libwebp"))))) (define-public ffmpeg ffmpeg-5) -- cgit 1.4.1 From 369b2a56a9d467a40678da513f567892de3ee449 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Wed, 1 Mar 2023 15:12:49 -0500 Subject: gnu: lxqt-panel: Update to 1.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-panel): Update to 1.2.1. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 5b39f0e9f4..ab04ec0c49 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -483,14 +483,14 @@ of other programs.") (define-public lxqt-panel (package (name "lxqt-panel") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1m0mm07ydmdlyyi6s4q1cwpxp609kcyc3gcmwbmyf0smadan3yd8")))) + (base32 "1604rb4yg1lgivvd76gaqb6dvq8bv8xy5f2vzj46prh0rbvhnf2b")))) (build-system cmake-build-system) (inputs (list alsa-lib -- cgit 1.4.1 From 2db95ac735464e1490c14cd7e5346b2c84be5ce0 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Wed, 1 Mar 2023 15:15:40 -0500 Subject: gnu: libfm-qt: Update to 1.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (libfm-qt): Update to 1.2.1. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index ab04ec0c49..e12036779e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -786,14 +786,14 @@ for LXQt.") (define-public libfm-qt (package (name "libfm-qt") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0b423s6bkwijjrh14wca49ypz79sxci9lalxc5s29vwbhync09x0")))) + (base32 "00r35gb4x6fnsv6z6digr3661cwykxn32xq23an1n044v38lry6x")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From af95f2d8f98eb2c8c64954bb2fd0b70838899174 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Wed, 1 Mar 2023 15:18:09 -0500 Subject: gnu: pcmanfm-qt: Update to 1.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (pcmanfm-qt): Update to 1.2.1. Signed-off-by: 宋文武 --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index e12036779e..4ebe8071f7 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -817,14 +817,14 @@ components to build desktop file managers which belongs to LXDE.") (define-public pcmanfm-qt (package (name "pcmanfm-qt") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1k44a659mval4513p4yv63hqrbg9jqc8vrinl4mx5aja33pww5yg")))) + (base32 "0nz66b9mv6hqaxf5k3ijaf1694za5nv121y6jfq39db3a1qx7rm5")))) (build-system cmake-build-system) (arguments (list -- cgit 1.4.1