From 8f8fbb79baa1b9313105b5ee3ba9bdd9265b093d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:25:17 +0100 Subject: gnu: emacs-rec-mode: Update to 1.9.3. * gnu/packages/databases.scm (emacs-rec-mode): Update to 1.9.3. Change-Id: I4268c08171b75442a6ba5b5da2887ae9764df98d --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ba5d4b9f29..1ca534aa00 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1600,14 +1600,14 @@ types are supported, as is encryption.") (define-public emacs-rec-mode (package (name "emacs-rec-mode") - (version "1.9.1") + (version "1.9.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "rec-mode-" version ".tar")) (sha256 (base32 - "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s")) + "15m0h84fcrcxpx67mc9any4ap2dcqysfjm1d2a7sx4clx8h3mgk0")) (snippet #~(begin (delete-file "rec-mode.info"))))) (build-system emacs-build-system) (arguments -- cgit v1.2.3 From 2bfcb104b70306af3e21576da8986570efde847e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:25:40 +0100 Subject: gnu: emacs-auctex: Update to 13.2.3. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.2.3. Change-Id: Iabeb142f7fe1f5fcf925f788263c76eb0bbf1382 --- 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 a8ac238f58..51d7b88d22 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4216,14 +4216,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.2.2") + (version "13.2.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s")))) + (base32 "1590g2yd8q88xgxc449fxbxwgrbjh2cbcalcs7jk50lhzy3y8mc8")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From 6ca99feaf5cd871bacd320744c3d86322051b1e8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:10 +0100 Subject: gnu: emacs-subed: Update to 1.2.11. * gnu/packages/emacs-xyz.scm (emacs-subed): Update to 1.2.11. Change-Id: Ib3838ec91afdeefef267df49394ee4b1f75fa63a --- 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 51d7b88d22..23d52d6be7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2019 Alex Griffin -;;; Copyright © 2016-2023 Nicolas Goaziou +;;; Copyright © 2016-2024 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016-2022 Arun Isaac ;;; Copyright © 2017 Christopher Baines @@ -8749,14 +8749,14 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.7") + (version "1.2.11") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib")))) + "1dlh7vd8kc16wr9sqd3v7kkxfvqadi56pa52h35b86krndh4vazp")))) (arguments (list #:tests? #t -- cgit v1.2.3 From cab4cf27dcc072c3da6a10e84746c331af13c9e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:23 +0100 Subject: gnu: emacs-eldoc: Update to 1.15.0. * gnu/packages/emacs-xyz.scm (emacs-eldoc): Update to 1.15.0. Change-Id: Icea7f7d60301892e9476b930ab19a85f41b29f4f --- 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 23d52d6be7..f395e474ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19601,14 +19601,14 @@ more information.") (define-public emacs-eldoc (package (name "emacs-eldoc") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/eldoc-" version ".tar")) (sha256 - (base32 "15bg61nbfb6l51frlsn430ga3vscns2651wvi6377vlyra7kgn39")))) + (base32 "1wn7q2f19lfdc3b639ffhbmsglnm3zc6rvgyc6amqwnpc2n2gkdl")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/eldoc.html") (synopsis "Show function arglist or variable docstring in echo area") -- cgit v1.2.3 From 4dc30915cc051c6d34b6b6398d7323cc325f84f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:29 +0100 Subject: gnu: emacs-kind-icon: Update to 0.2.1. * gnu/packages/emacs-xyz.scm (emacs-kind-icon): Update to 0.2.1. Change-Id: Id0fe5f72a3252cf3bf7348cd45db89da9e80b6ec --- 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 f395e474ba..f85f098dee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24145,14 +24145,14 @@ or expressions with SVG rounded box labels that are fully customizable.") (define-public emacs-kind-icon (package (name "emacs-kind-icon") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/kind-icon-" version ".tar")) (sha256 - (base32 "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r")))) + (base32 "0ri5k2bgr9cf0qsdznsil70b4zs4z00fs4k35c3dj7kxx9nlncfi")))) (build-system emacs-build-system) (propagated-inputs (list emacs-svg-lib)) (home-page "https://github.com/jdtsmith/kind-icon") -- cgit v1.2.3 From 08c08b22b25efaa54020cd23e07db8b017072b57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:43 +0100 Subject: gnu: emacs-tramp: Update to 2.6.2.0. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.6.2.0. Change-Id: Id3db704243d269b1b0979a4ed2fe36bd42f8e9bb --- 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 f85f098dee..6849958f03 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32244,14 +32244,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.1.4") + (version "2.6.2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi")))) + (base32 "06wpaqjr3qw1424k9rh5i28yxrkzh1z5dczpgp7mpv823l2x8ip3")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 9e195fa0eda6117859c6dcba80f824c8cfc90fec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:50 +0100 Subject: gnu: emacs-ebdb: Update to 0.8.20. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.8.20. Change-Id: Ib3420c220beadc022bf3e65c8d904a0237f9dd18 --- 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 6849958f03..8240bd9c2d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33285,14 +33285,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.8.18") + (version "0.8.20") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "1mb1qsw3dfaa6x52vsg73by6w7x5i6w5l7b0d2jr667y006q2vvf")))) + (base32 "1kcygkfw7r3ixbb2dgsf3rl2662xls24992y2j1w32fdh9gqk03s")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit v1.2.3 From 30a7f0212ab838ebc882a5b6d4cc14d41a42d0b6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:59 +0100 Subject: gnu: emacs-vertico-posframe: Update to 0.7.5. * gnu/packages/emacs-xyz.scm (emacs-vertico-posframe): Update to 0.7.5. Change-Id: Ifff04b43f978e0664cafca2ab8b8e5a8b826bca4 --- 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 8240bd9c2d..023afb05b9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38897,7 +38897,7 @@ in Emacs.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (string-append @@ -38905,7 +38905,7 @@ in Emacs.") ".tar")) (sha256 (base32 - "1gfapchkj9jkzlyz3hzkb9kpifcak0fn4y5jw6f2cs6379sjwvzm")))) + "1fa8kg5lqpa1xk2vf1mp420iqki866gd83vzsj166b8mnd34fdlr")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (home-page "https://github.com/tumashu/vertico-posframe") -- cgit v1.2.3 From 0306d83bed41accd5a17382fee15ce5403dffc53 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:29:02 +0100 Subject: gnu: emacs-apheleia: Update to 4.0. * gnu/packages/emacs-xyz.scm (emacs-apheleia): Update to 4.0. Change-Id: I2d61a20e434400f8dbae7d33894ab6f6134c9630 --- 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 023afb05b9..18342e07b7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6504,7 +6504,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (define-public emacs-apheleia (package (name "emacs-apheleia") - (version "3.2") + (version "4.0") (source (origin (method git-fetch) @@ -6513,7 +6513,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn")))) + (base32 "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/apheleia") (synopsis "Reformat buffer stably") -- cgit v1.2.3 From 332077506397ae63946f001a98a0cb246bb96d1a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:30:18 +0100 Subject: gnu: emacs-beframe: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-beframe): Update to 1.0.0. Change-Id: I1df7f004c24cc783869421f656a59610006fcf90 --- 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 18342e07b7..19dde75fa4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17263,7 +17263,7 @@ using a convenient notation.") (define-public emacs-beframe (package (name "emacs-beframe") - (version "0.3.0") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -17272,7 +17272,7 @@ using a convenient notation.") (file-name (git-file-name name version)) (sha256 (base32 - "1nblpac1pkhgwpbw0k0p9xx6yc5kiai4pznw39slx703mzzqzqyj")))) + "08k9lwfxfvpm50n1c0gcm07sicd6yw7dbyyvhp8lai6pfxl465v9")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 78c55428c340698a39be135306fcf713c15688ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:31:45 +0100 Subject: gnu: emacs-buttercup: Update to 1.33. * gnu/packages/emacs-xyz.scm (emacs-buttercup): Update to 1.33. Change-Id: Ie98b77b883b084886797680ef317b9668f1d0445 --- 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 19dde75fa4..e0f7549b47 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28866,7 +28866,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (define-public emacs-buttercup (package (name "emacs-buttercup") - (version "1.31") + (version "1.33") (source (origin (method git-fetch) @@ -28876,7 +28876,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (file-name (git-file-name name version)) (sha256 (base32 - "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh")))) + "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 0f9beffa43dbd518e4cb597afe2b87b4892d446e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:32:47 +0100 Subject: gnu: emacs-async: Update to 1.9.8. * gnu/packages/emacs-xyz.scm (emacs-async): Update to 1.9.8. Change-Id: I2b83724cee2f77d49417c104f7ab0bf299c671ea --- 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 e0f7549b47..c21ec16b12 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4194,7 +4194,7 @@ while paused.") (package (name "emacs-async") (home-page "https://github.com/jwiegley/emacs-async") - (version "1.9.7") + (version "1.9.8") (source (origin (method git-fetch) (uri (git-reference @@ -4203,7 +4203,7 @@ while paused.") (file-name (git-file-name name version)) (sha256 (base32 - "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1")))) + "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp")))) (build-system emacs-build-system) (synopsis "Asynchronous processing in Emacs") (description -- cgit v1.2.3 From 551e159467d26b68a9bfc7c930895bd4743d7655 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:35:07 +0100 Subject: gnu: emacs-async: Run tests. * gnu/packages/emacs-xyz.scm (emacs-async)[arguments]: Run tests. [native-inputs]: Add EMACS-BUTTERCUP. Change-Id: Ifa442644dbd259afb5584fbb4160a8b2346a6364 --- gnu/packages/emacs-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c21ec16b12..d608a7405b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4205,6 +4205,11 @@ while paused.") (base32 "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp")))) (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-L" "."))) + (native-inputs + (list emacs-buttercup)) (synopsis "Asynchronous processing in Emacs") (description "This package provides the ability to call asynchronous functions and -- cgit v1.2.3 From 3b8ff1d10183933318f6c2dca365c0c2281f60d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:36:17 +0100 Subject: gnu: emacs-cape: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-cape): Update to 1.1. Change-Id: I7b2c1c415e62d4c13d0f3d5b946d93423dc08fb4 --- 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 d608a7405b..5ba2a90d26 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4675,7 +4675,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "0.17") + (version "1.1") (source (origin (method git-fetch) @@ -4684,7 +4684,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kzhiffzv20rwjcx0iywj39hxibw0wga9ck77yam9xv7ips2mav4")))) + (base32 "0nx08i11s0z9kk711r7wp8sgj00n8hjk5gx0rqr9awrl9fmw1kp2")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 8b41c305d8e8a1f30954ef3b50f082c0298e98a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:37:43 +0100 Subject: gnu: emacs-cider: Update to 1.12.0. * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 1.12.0. Change-Id: Icc26d1b51125913009e425279d59db123d3722e1 --- 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 5ba2a90d26..24800ae18b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15449,7 +15449,7 @@ implementation.") (define-public emacs-cider (package (name "emacs-cider") - (version "1.9.0") + (version "1.12.0") (source (origin (method git-fetch) @@ -15458,7 +15458,7 @@ implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp")))) + (base32 "11bibkbv3x0z4ilxra3p91nh8klgg3mg3h4f63pxnnp8fjhqpsph")))) (build-system emacs-build-system) (arguments '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include) -- cgit v1.2.3 From ea2eaaa46cf60280f4827380426a549d8b4d1712 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:38:37 +0100 Subject: gnu: emacs-clj-refactor: Update to 3.11.2. * gnu/packages/emacs-xyz.scm (emacs-clj-refactor): Update to 3.11.2. Change-Id: I338a2a8a172d5ea486f1d693b7a8c52cca3ec1f7 --- 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 24800ae18b..3417144cd0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13284,7 +13284,7 @@ Clojure projects from templates.") (define-public emacs-clj-refactor (package (name "emacs-clj-refactor") - (version "3.10.0") + (version "3.11.2") (source (origin (method git-fetch) @@ -13293,7 +13293,7 @@ Clojure projects from templates.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411")))) + (base32 "1y8xphmmd2ciwnrr7lbiwq0v5c7chq60wssxng9mw0fiz2i3ix22")))) (build-system emacs-build-system) (propagated-inputs (list emacs-cider -- cgit v1.2.3 From 4103d685c0cd1e715b2c599ea0d76746ccc946c4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:39:37 +0100 Subject: gnu: emacs-clojure-mode: Update to 5.18.1. * gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.18.1. Change-Id: I374f3ebca45fdce8ed84036fe999ace26d73c1ea --- 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 3417144cd0..b94ab8cbc0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13232,7 +13232,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.18.0") + (version "5.18.1") (source (origin (method git-fetch) @@ -13241,7 +13241,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa")))) + (base32 "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5")))) (build-system emacs-build-system) (native-inputs (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) -- cgit v1.2.3 From f1059e2c26a128533b40f242291850a9611477dc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:40:52 +0100 Subject: gnu: emacs-code-cells: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-code-cells): Update to 0.4. Change-Id: Iac21fa3441fc85387ebc3d404205bd4f8716359f --- 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 b94ab8cbc0..7b4998c61d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37636,10 +37636,10 @@ future.") (define-public emacs-code-cells ;; XXX: Upstream does not tag releases. The commit below matches version ;; bump. - (let ((commit "fd68a33eb43b3cbd44fed767f48e230382903592")) + (let ((commit "44546ca256f3da29e3ac884e3d699c8455acbd6e")) (package (name "emacs-code-cells") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -37648,7 +37648,7 @@ future.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "072d5vldjfg9mj4a86bw8xmxl3hmywsnx4f2k6nayqy4whry5fmq")))) + (base32 "1fc5l87kzmnwxmrq2v7x4jzcplq375v9j0h2yz4grzaql3jcc419")))) (build-system emacs-build-system) (home-page "https://github.com/astoff/code-cells.el") (synopsis "Emacs utilities for code split into cells, including Jupyter -- cgit v1.2.3 From 116b63bbabb2c84af75d8b0324edce6c82b929c9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:41:57 +0100 Subject: gnu: emacs-consult: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 1.1. Change-Id: I303c64cef5419be1b8ff66a30ca9b7f8f44ccfa1 --- 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 7b4998c61d..346ab94038 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11827,7 +11827,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.35") + (version "1.1") (source (origin (method git-fetch) @@ -11835,7 +11835,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "0a20rfqv2yfwqal1vx6zzg92qgr32p3rp7n6awnyb010jnykqszw")) + (base32 "11fgjgny10falyjs0dlb8cvvfqpvc538mskq4j60j68v36nnkb23")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments -- cgit v1.2.3 From 9e02261d5e7c60d6f10b31bfb5fb6d33b6947f98 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:43:29 +0100 Subject: gnu: emacs-consult-flycheck: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-consult-flycheck): Update to 1.0. Change-Id: Ic52b212be42f59f70365d907d6b8992b7fc1101e --- 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 346ab94038..a8aec80070 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11982,29 +11982,26 @@ call.") (license license:gpl3+)))) (define-public emacs-consult-flycheck - ;; This particular commit introduces bug fixes above latest release. - (let ((commit "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062") - (revision "0")) - (package - (name "emacs-consult-flycheck") - (version (git-version "0.9" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minad/consult-flycheck") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c")))) - (build-system emacs-build-system) - (propagated-inputs (list emacs-consult emacs-flycheck)) - (home-page "https://github.com/minad/consult-flycheck") - (synopsis "Consult integration for Flycheck") - (description - "This package provides the @code{consult-flycheck} command for Emacs, + (package + (name "emacs-consult-flycheck") + (version "1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/consult-flycheck") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yi2qa4gbxlyhwc4rj3iidgr1dpdij68gbkgkk55l53p3yl1p2ww")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-flycheck)) + (home-page "https://github.com/minad/consult-flycheck") + (synopsis "Consult integration for Flycheck") + (description + "This package provides the @code{consult-flycheck} command for Emacs, which integrates @code{Consult} with @code{Flycheck}.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-eglot-tempel (let ((commit "e08b203d6a7c495d4b91ed4537506b5f1ea8a84f") -- cgit v1.2.3 From 113cb7980815a1ec7d8eaf346d47fe84e81bd184 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:44:32 +0100 Subject: gnu: emacs-corfu: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 1.1. Change-Id: Ic2737697cfe4f5005172e05ab5d7343eb9f0ca23 --- 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 a8aec80070..a6f75ea88a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4581,7 +4581,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.38") + (version "1.1") (source (origin (method git-fetch) @@ -4590,7 +4590,7 @@ of bibliographic references.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wh1lw96b2nghwk6lic4k01pfqj73ssw710lx3s8nj2lv5bzh94n")))) + (base32 "1c900hl01vf43r6vikjy2glrac1cl2z54rahs5kb4q77cz0z1zxf")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From baea8607b670cd2391dded0af9b64bc3b209914e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:45:37 +0100 Subject: gnu: emacs-denote: Update to 2.2.0. * gnu/packages/emacs-xyz.scm (emacs-denote): Update to 2.2.0. Change-Id: I0552023075748b859dff361794726b7955873d0d --- 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 a6f75ea88a..11d12eb502 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17136,7 +17136,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "2.1.0") + (version "2.2.0") (source (origin (method git-fetch) @@ -17145,7 +17145,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gfjckqh170z8slhm0wdqf0570ywgni7b1wdnifxf5cb69h3izpr")))) + (base32 "0w9r5d0br5hpay13vbx78ak2n0yy8bbwlaxnz4p5ggxiv8g5044q")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") -- cgit v1.2.3 From 8853096fbb755c813623d90c045badd38e4cbccc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:48:15 +0100 Subject: gnu: emacs-docker: Update to 2.3.1. * gnu/packages/emacs-xyz.scm (emacs-docker): Update to 2.3.1. Change-Id: Ib463a11ce6295118a846692b480edc4464a80d8f --- 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 11d12eb502..1217336b86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30073,7 +30073,7 @@ constant expressions.") (define-public emacs-docker (package (name "emacs-docker") - (version "2.2.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -30082,7 +30082,7 @@ constant expressions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1743x2s7ss7h329yayima3pqi62f0qjv56g5y6b7iwk40wpnhv9v")))) + (base32 "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460")))) (inputs (list emacs-undercover)) (propagated-inputs -- cgit v1.2.3 From ac0e32fca2adfefc2b1e8d709d25071b022b0ef5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:49:12 +0100 Subject: gnu: emacs-ebib: Update to 2.40.3. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.40.3. [propagated-inputs]: Add EMACS-COMPAT. Change-Id: I7d37822ee5c41f5155ceb8e6b518a86dfcc9b5b3 --- 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 1217336b86..2631b9c155 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23271,7 +23271,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.39.4") + (version "2.40.3") (source (origin (method git-fetch) @@ -23280,10 +23280,10 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay")))) + (base32 "07pyb76impqpczx6hl6amfs4hfnszfwydp27az46dkqc17hy0fgy")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-biblio emacs-ivy emacs-parsebib)) + (list emacs-biblio emacs-compat emacs-ivy emacs-parsebib)) (home-page "https://joostkremers.github.io/ebib/") (synopsis "BibTeX database manager for Emacs") (description -- cgit v1.2.3 From 3e19d2106bc18292eba28f935e90a483bcaa3e56 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:50:53 +0100 Subject: gnu: emacs-el-patch: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-el-patch): Update to 3.1. Change-Id: Iba1df4faccb7c87052c48e5bed9f974092e9e3ea --- 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 2631b9c155..809e875177 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31994,7 +31994,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-el-patch (package (name "emacs-el-patch") - (version "3.0") + (version "3.1") (source (origin (method git-fetch) @@ -32003,7 +32003,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa")))) + (base32 "0x2x3ci5i428wgagbwjh9qp2zlflkzlrkbpi6qa4fv7dq3vgkrv2")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/el-patch") (synopsis "Future-proof your Emacs customizations") -- cgit v1.2.3 From 1f500b96b50d79e461bdde17d77a376822c9dc8f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:56:04 +0100 Subject: gnu: emacs-eldev: Update to 1.8.1. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 1.8.1. Change-Id: Iaaa7ac51401114706b7d4192e363c7a358d86f47 --- 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 809e875177..04f6c43945 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23057,7 +23057,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.7") + (version "1.8.1") (source (origin (method git-fetch) @@ -23066,7 +23066,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5")))) + (base32 "058f2k2qhwbyr7a759wig9x6v6n2rl7zshqjbp4jnhnkcqkr70g5")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 3bb78ceb9ddcbef3b5e33a6b4c24eb3c743a28e9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:57:30 +0100 Subject: gnu: emacs-emms-print-metadata: Update to 17. * gnu/packages/emacs-xyz.scm (emacs-emms-print-metadata): Update to 17. Change-Id: I9d09cdf200cebab408f103ab33075a0b55973b68 --- 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 04f6c43945..576a986473 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3348,14 +3348,14 @@ podcasts) in Emacs.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "16") + (version "17") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "1c18lrrfg1n5vn1av9p7q3jys27pdmxq8pq5gqb6397jnv9xywby")))) + (base32 "103gqlmda24izhb5xrh14k0bwhijr98vnlnmdr9a9xxfla9n5xw0")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From d7f6c26691bb4a0b9d6fb7514973a524cae12bff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:58:44 +0100 Subject: gnu: emacs-geiser: Update to 0.30. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.30. Change-Id: I18d7c0132a13f8306de536c240edae8521ec9864 --- 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 576a986473..db9bba57b8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -435,7 +435,7 @@ input via a small child-frame spawned at the position of the cursor.") (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.29.1") + (version "0.30") (source (origin (method git-fetch) @@ -444,7 +444,7 @@ input via a small child-frame spawned at the position of the cursor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q")))) + (base32 "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit v1.2.3 From 8855e3017c2dc3c7268ab08015a4aa631b7b6864 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:59:42 +0100 Subject: gnu: emacs-gptel: Update to 0.5.5. * gnu/packages/emacs-xyz.scm (emacs-gptel): Update to 0.5.5. Change-Id: I3d158ab5a5cd0277c210de706cc78a0561eca1d9 --- 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 db9bba57b8..a7828773dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -482,7 +482,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.4.0") + (version "0.5.5") (source (origin (method git-fetch) (uri (git-reference @@ -491,7 +491,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1aac0jds8hzyfvav06mhqm32v81swrnvyv0ldrkd7qxc2b1x4q7n")))) + "1vqs03plivb1dmal53j53y4r567ggx4781n2mqyjk6s6wfvyvn93")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 47a67d34b2b5f01e7092442cb318c61d1876dc25 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:03:42 +0100 Subject: gnu: emacs-haskell-mode: Update to 17.5. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.5. * gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Apply file deletion. Change-Id: Ic7d11737af87995610ecf2c3178320901991423d --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 6 +- .../emacs-haskell-mode-no-redefine-builtin.patch | 75 ---------------------- 3 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 264b186f41..4b2393bfdd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1114,7 +1114,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ - %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a7828773dd..848eaa7ecb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2403,7 +2403,7 @@ replacement.") (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "17.4") + (version "17.5") (source (origin (method git-fetch) @@ -2412,9 +2412,7 @@ replacement.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n")) - (patches - (search-patches "emacs-haskell-mode-no-redefine-builtin.patch")))) + (base32 "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf")))) (propagated-inputs (list emacs-dash)) (native-inputs diff --git a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch b/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch deleted file mode 100644 index 65ace2ee5e..0000000000 --- a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch +++ /dev/null @@ -1,75 +0,0 @@ -From faa95a784d2c74c72e70367a5d531df6dd61aeab Mon Sep 17 00:00:00 2001 -From: Steve Purcell -Date: Sun, 6 Aug 2023 16:41:48 +0200 -Subject: [PATCH] Don't redefine built-in function - -Fixes #1817 ---- - tests/haskell-indent-tests.el | 14 ++++++++------ - tests/haskell-indentation-tests.el | 14 ++++++++------ - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/tests/haskell-indent-tests.el b/tests/haskell-indent-tests.el -index 7196405b8..9a3de4ad3 100644 ---- a/tests/haskell-indent-tests.el -+++ b/tests/haskell-indent-tests.el -@@ -40,11 +40,13 @@ - ;; (haskell-indent-put-region-in-literate (point-min) (point-max) -1) - ;; (buffer-substring-no-properties (point-min) (point-max)))))) - --(defsubst string-trim-left (string) -- "Remove leading whitespace from STRING." -- (if (string-match "\\`[ \t\n\r]+" string) -- (replace-match "" t t string) -- string)) -+(if (fboundp 'string-trim-left) -+ (defalias 'haskell--string-trim-left 'string-trim-left) -+ (defun haskell--string-trim-left (string &optional regexp) -+ "Remove leading whitespace from STRING." -+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) -+ (substring string (match-end 0)) -+ string))) - - (defun haskell-indent-format-info (info) - (if (cdr info) -@@ -128,7 +130,7 @@ macro quotes them for you." - :expected-result - ,(if allow-failure :failed :passed) - (haskell-indent-check -- ,(string-trim-left source) -+ ,(haskell--string-trim-left source) - ,@(mapcar (lambda (x) - (list 'quote x)) - test-cases)))))) -diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el -index 4889b76a7..cd783a4f4 100644 ---- a/tests/haskell-indentation-tests.el -+++ b/tests/haskell-indentation-tests.el -@@ -33,11 +33,13 @@ - - ;;; Code: - --(defsubst string-trim-left (string) -- "Remove leading whitespace from STRING." -- (if (string-match "\\`[ \t\n\r]+" string) -- (replace-match "" t t string) -- string)) -+(if (fboundp 'string-trim-left) -+ (defalias 'haskell--string-trim-left 'string-trim-left) -+ (defun haskell--string-trim-left (string &optional regexp) -+ "Remove leading whitespace from STRING." -+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) -+ (substring string (match-end 0)) -+ string))) - - (defun haskell-indentation-check (source &rest test-cases) - "Check if `haskell-indentation-find-indentations' returns expected results. -@@ -115,7 +117,7 @@ macro quotes them for you." - :expected-result - ,(if allow-failure :failed :passed) - (haskell-indentation-check -- ,(string-trim-left source) -+ ,(haskell--string-trim-left source) - ,@(mapcar (lambda (x) - (list 'quote x)) - test-cases)))))) -- cgit v1.2.3 From ff808d4d2229236af70735bd6de35e75f9c6de10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:05:31 +0100 Subject: gnu: emacs-helm: Update to 3.9.6. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.9.6. Change-Id: Ica2d7af2db908e37f17f6e4f8d8b83de3a5af349 --- 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 848eaa7ecb..e86ffa7104 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15148,7 +15148,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.9.5") + (version "3.9.6") (source (origin (method git-fetch) @@ -15157,7 +15157,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "067nc728dfbwzfs07z26cwcqjj00l4lvw3n9bl1zw094v0x6hxxm")))) + (base32 "01b2608gsly557927wdkp71mbakk7h23icjnxq097r12zra4agc7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async emacs-popup)) -- cgit v1.2.3 From 60dc957e2f1994cb0eb97dfd3910cd0fcdd988e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:07:34 +0100 Subject: gnu: emacs-inf-ruby: Update to 2.8.1. * gnu/packages/emacs-xyz.scm (emacs-inf-ruby): Update to 2.8.1. Change-Id: I7f46a1ee645a24f96077cc70bf0ad30706979eb5 --- 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 e86ffa7104..8aa64b319d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6999,7 +6999,7 @@ then refine or modify the search results.") (define-public emacs-inf-ruby (package (name "emacs-inf-ruby") - (version "2.8.0") + (version "2.8.1") (source (origin (method git-fetch) @@ -7008,7 +7008,7 @@ then refine or modify the search results.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5")))) + (base32 "043ml560z69rlgw60w7m03r6cdwp8gfi1zs38qykg2yi98l6gg3x")))) (build-system emacs-build-system) (home-page "https://github.com/nonsequitur/inf-ruby") (synopsis "Provides a REPL buffer connected to a Ruby subprocess in Emacs") -- cgit v1.2.3 From 2c5cf24680e1e1683992e09a3eff521efcc0381a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:08:19 +0100 Subject: gnu: emacs-jinx: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-jinx): Update to 1.1. Change-Id: I58919dd335a7f93339b362e95fc99449e80d2c31 --- 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 8aa64b319d..e23bd9b9f0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10650,7 +10650,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -10660,7 +10660,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00rlp7iby02zd3sqigpyskph4a26r0dgp53y17hm4xjr6zqifhz5")))) + (base32 "08ajkhpds3m8dk1m2h84vcn6pg5w6hbq55xyd50593kb012a2pmz")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From c38dd0c482ad63dfce53392a9dcaf185bc17fa59 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:09:24 +0100 Subject: gnu: emacs-js2-mode: Update to 20231224. * gnu/packages/emacs-xyz.scm (emacs-js2-mode): Update to 20231224. Change-Id: Iffbe84ddee2559b526ba4345f4ff14f6ac1ca050 --- 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 e23bd9b9f0..80d04484f4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13816,7 +13816,7 @@ to all the other commands, too.") (define-public emacs-js2-mode (package (name "emacs-js2-mode") - (version "20230408") + (version "20231224") (source (origin (method git-fetch) @@ -13825,7 +13825,7 @@ to all the other commands, too.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwykla43315wlky52807pn2nm508dx6593alk7hnrl2qkl7852s")))) + (base32 "11ppp1m7hl4ii79zjw62bqvksyzh5xmp3q1qw21wlj2s47mkpm73")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From 0a5cde84f62fcc11c7ba4916e38c739aea132aa5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:11:01 +0100 Subject: gnu: emacs-json-mode: Update to 1.9.0. * gnu/packages/emacs-xyz.scm (emacs-json-mode): Update to 1.9.0. Change-Id: I47d1ff6f21cdb1055ab0dea61e0768f391087a2e --- 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 80d04484f4..fe63347395 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19844,7 +19844,7 @@ a @url{http://json.org/, JSON} file.") (define-public emacs-json-mode (package (name "emacs-json-mode") - (version "1.8.0") + (version "1.9.0") (source (origin (method git-fetch) @@ -19853,7 +19853,7 @@ a @url{http://json.org/, JSON} file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z")))) + (base32 "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s")))) (build-system emacs-build-system) (propagated-inputs (list emacs-json-snatcher)) -- cgit v1.2.3 From 5a977eb98cf611826d9f2c3cef54f95aac002e99 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:14:50 +0100 Subject: gnu: emacs-keycast: Update to 1.3.3. * gnu/packages/emacs-xyz.scm (emacs-keycast): Update to 1.3.3. Change-Id: I771419e3cd2281fa8577e411e66fe7d006a91f89 --- 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 fe63347395..8c8685c2dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5882,7 +5882,7 @@ kmonad's configuration files (@file{.kbd}).") (define-public emacs-keycast (package (name "emacs-keycast") - (version "1.3.2") + (version "1.3.3") (source (origin (method git-fetch) @@ -5891,7 +5891,7 @@ kmonad's configuration files (@file{.kbd}).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nqx53a1hjgibqrmkdic6syqb2fb5fkna0k5dbbg6igb5k775c8r")))) + (base32 "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) -- cgit v1.2.3 From 27ab4e948aa65d9b006582236be3d89e2503e457 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:15:52 +0100 Subject: gnu: emacs-marginalia: Update to 1.5. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 1.5. Change-Id: Id57e4fe99764856dc46ae3324077a00b6ac0af52 --- 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 8c8685c2dc..f871301e53 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12090,7 +12090,7 @@ expansion and overwriting the marked region with a new snippet completion.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "1.3") + (version "1.5") (source (origin (method git-fetch) @@ -12099,7 +12099,7 @@ expansion and overwriting the marked region with a new snippet completion.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fjbif2l5fj4xjb9drqfc8zxla8y7mha0imdd1nm4x83i0y4fa6l")))) + (base32 "12ncif2lv6d7r2g87lyjr7idbqa283ijb3qgd5a61i3760czs7d6")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 7ce1c8aecb32e3fc0cc134fc566a40ae6a059966 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:17:46 +0100 Subject: gnu: emacs-mc-extras: Update to 1.3.0. * gnu/packages/emacs-xyz.scm (emacs-mc-extras): Update to 1.3.0. Change-Id: I0550c0a04e6a5ed188e4740e2c65d68162822a9e --- gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f871301e53..1f553008fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9689,30 +9689,28 @@ one Emacs buffer.") (license license:gpl3+)))) (define-public emacs-mc-extras - (let ((commit "053abc52181b8718559d7361a587bbb795faf164") - (revision "1")) - (package - (name "emacs-mc-extras") - (version (git-version "1.2.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/knu/mc-extras.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-multiple-cursors)) - (home-page "https://github.com/knu/mc-extras.el") - (synopsis "Extra functions for manipulating multiple cursors") - (description - "This package provides additional functions for + (package + (name "emacs-mc-extras") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/knu/mc-extras.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xrlp192wi51qpzgpkn9ph5zlpj08ifd8r3444llskyv0bay6g14")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-multiple-cursors)) + (home-page "https://github.com/knu/mc-extras.el") + (synopsis "Extra functions for manipulating multiple cursors") + (description + "This package provides additional functions for @code{multiple-cursors}, including functions for marking s-expressions, comparing characters, removing cursors, and more.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public emacs-substitute (package -- cgit v1.2.3 From 791bd4ca89c394a8597fbf52cbe7585b8a6de93c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:19:42 +0100 Subject: gnu: emacs-mood-line: Update to 3.1.1. * gnu/packages/emacs-xyz.scm (emacs-mood-line): Update to 3.1.1. Change-Id: I3511f594fb499722bf2f22581e5c151d920552f0 --- 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 1f553008fc..20a637484a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34338,7 +34338,7 @@ icon support, git integration, and several other utilities.") (define-public emacs-mood-line (package (name "emacs-mood-line") - (version "2.2.0") + (version "3.1.1") (source (origin (method git-fetch) @@ -34347,7 +34347,7 @@ icon support, git integration, and several other utilities.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1z50vr3ymn466z26qh0ybbm8aaizl5ghi471a47cp8bnnn9y9dqg")))) + (base32 "19yh93kkyailczv1yyg7jhmzwl768sg0rk4as5kgqays87h9bnfn")))) (build-system emacs-build-system) (home-page "https://gitlab.com/jessieh/mood-line") (synopsis "Minimal mode-line for Emacs") -- cgit v1.2.3 From 62898c267694b9f71b281c1a941790b31b38e4fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:20:37 +0100 Subject: gnu: emacs-jsonrpc: Update to 1.0.23. * gnu/packages/emacs-xyz.scm (emacs-jsonrpc): Update to 1.0.23. Change-Id: Ie676ff2b113e962a328f637a88caeefb58892ee7 --- 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 20a637484a..0d1ce80d27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19866,10 +19866,10 @@ highlighting.") ;; upstreamed. By convention, it should refer to a commit in which ;; jsonrpc.el was actually touched. In order to find this, you can refer to ;; . - (let ((commit "2d835d64ba339bb375f0d55c4679149d6da3f209")) ;version bump + (let ((commit "731cfee3b45361158d88bded3c32c9a48ace7bdb")) ;version bump (package (name "emacs-jsonrpc") - (version "1.0.17") + (version "1.0.23") (source (origin (method git-fetch) @@ -19879,7 +19879,7 @@ highlighting.") (file-name (git-file-name name version)) (sha256 (base32 - "1jv8pcq0yad5wmqsdvamwq6674p6ghpyyznbd2x5mlxyp6za6cx5")))) + "0xrlqjd4kj7z5ssidi159n8fm1hx35if2h1ds586ppf8y057bmhn")))) (build-system emacs-build-system) (arguments (list #:phases -- cgit v1.2.3 From 8553499aee8fb61dbc7db28e0023cd4261819dd8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:23:17 +0100 Subject: gnu: emacs-osm: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-osm): Update to 1.2. Change-Id: I794f486f2fc9dd4dab186c7dbd77f8a79532dedd --- 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 0d1ce80d27..4dced7f78c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38226,7 +38226,7 @@ hacker.") (define-public emacs-osm (package (name "emacs-osm") - (version "0.14") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -38235,7 +38235,7 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "1y0zkfc27pnhz5hqpapsqin2kc6al1zjgd6cd4nhzqmh49h81bsb")))) + "0mmq83ill1vzx1x07vxjn53di2cskid2gmj5qqa6694s1xzpywf4")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From 80bbdf4f106c2716c82eda5d35bdb67757e3f717 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:24:00 +0100 Subject: gnu: emacs-org: Update to 9.6.14. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.6.14. Change-Id: I75bd6ce590f269c2796ebf63a7b9ff51cf9d1b6e --- 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 4dced7f78c..6211a8e0e4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16526,7 +16526,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.6.12") + (version "9.6.14") (source (origin (method git-fetch) @@ -16535,7 +16535,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1anzvsa7kj2rp419qc5rv8jz50h7np391lcgbxcin727njyc7wpr")))) + (base32 "0g59nfx8gqzkqidqvyvh83yd7mahjm9khhr1ccwqj3r4phwpciqx")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From aca2259d7d9fa0e4d5027c932f2b9ff7f723810f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:25:19 +0100 Subject: gnu: emacs-parseclj: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-parseclj): Update to 1.1.1. Change-Id: I9a2bbbf3e575623993421bedee0ebce58658b0c8 --- 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 6211a8e0e4..f2f17e55c7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34974,7 +34974,7 @@ It uses parseclj's shift-reduce parser internally.") (define-public emacs-parseclj (package (name "emacs-parseclj") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -34983,7 +34983,7 @@ It uses parseclj's shift-reduce parser internally.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22")))) + (base32 "1iz7qbsq4whmb3iqy777jlm47chjp62313hc6nfcp0lfqsanmcmv")))) (build-system emacs-build-system) (propagated-inputs (list emacs-a)) (home-page "https://cider.mx") -- cgit v1.2.3 From 746b4d639faeb58bacf8457bd3b55541eb7d5885 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:26:21 +0100 Subject: gnu: emacs-parseedn: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-parseedn): Update to 1.2.1. Change-Id: I4d6fd0b3a5e134002695368ea1184c24d9fcef8d --- 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 f2f17e55c7..1fd8ae4620 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34951,7 +34951,7 @@ data, including buffers, window configuration, variables, and more.") (define-public emacs-parseedn (package (name "emacs-parseedn") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -34960,7 +34960,7 @@ data, including buffers, window configuration, variables, and more.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c")))) + (base32 "0b2jralm5lm4z4lpkn8ygzfga67xsalaszc8gqqv36khmz2mrckc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-a emacs-parseclj)) -- cgit v1.2.3 From 0e1237204ddc07ae8e3c9f6de3583dd457cf4794 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:27:40 +0100 Subject: gnu: emacs-php-mode: Update to 1.25.1. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.25.1. Change-Id: Ia9b91ee48f2faa55bf479568cd1f42b49a060b4d --- 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 1fd8ae4620..54a826c220 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18671,7 +18671,7 @@ in Emacs.") (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.25.0") + (version "1.25.1") (home-page "https://github.com/emacs-php/php-mode") (source (origin @@ -18681,7 +18681,7 @@ in Emacs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwbxaxjvz2hhb6pli1bh1qlrc2r991zl4i18wiwk78ffanqx6q0")))) + (base32 "1pxv4c63dma1il6w8vl2485yddp0ngm3gvfdqwjjszanfdxa4fg1")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From de03608b35b0a6ce180a24d8496b007dcccaad9a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:28:47 +0100 Subject: gnu: emacs-prescient: Update to 6.2. * gnu/packages/emacs-xyz.scm (emacs-prescient): Update to 6.2. Change-Id: I11041e12583ec5a84924daf70b56690a2de772e5 --- 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 54a826c220..24dd9248c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11740,7 +11740,7 @@ include installing, removing or visiting the homepage.") (define-public emacs-prescient (package (name "emacs-prescient") - (version "6.1") + (version "6.2") (source (origin (method git-fetch) @@ -11749,7 +11749,7 @@ include installing, removing or visiting the homepage.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83")))) + (base32 "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk")))) (build-system emacs-build-system) (propagated-inputs (list emacs-company emacs-corfu emacs-ivy emacs-selectrum emacs-vertico)) -- cgit v1.2.3 From 8023d1d25ad2e2c23225456b6b1245b99d780182 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:31:00 +0100 Subject: gnu: emacs-org-ql: Update to 0.8. * gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.8. [propagated-inputs]: Add EMACS-COMPAT. Change-Id: I62149e53160ceb249ef49c052c28ecb30dd2a717 --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24dd9248c8..4022f5a2cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23142,7 +23142,7 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.7.3") + (version "0.8") (source (origin (method git-fetch) (uri (git-reference @@ -23150,7 +23150,7 @@ interactive commands and functions, such as @code{completing-read}.") (commit (string-append "v" version)))) (sha256 (base32 - "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9")) + "0l403n75xyjf14pbk7hfdzajv393mk5m0xp9csv8dl805rgzrdkr")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -23160,7 +23160,8 @@ interactive commands and functions, such as @code{completing-read}.") (native-inputs (list emacs-buttercup emacs-with-simulated-input emacs-xr)) (propagated-inputs - (list emacs-dash + (list emacs-compat + emacs-dash emacs-f emacs-helm emacs-helm-org -- cgit v1.2.3 From 310f7e94dbf3032e9458320c52c4b1b81cf636c2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:32:16 +0100 Subject: gnu: emacs-org-re-reveal: Update to 3.24.2. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.24.2. Change-Id: I35af71a8f93c823bc405de51553ffbfcf14d9040 --- 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 4022f5a2cf..18c2e66e68 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24773,7 +24773,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.23.0") + (version "3.24.2") (source (origin (method git-fetch) @@ -24782,7 +24782,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd")))) + (base32 "10x1cinn97wlm3dmv35dxrs78gfzgw59qf4j57m3vgss5q93mqq5")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit v1.2.3 From f4667feaea1d853bd8389caae4ac5c3d8213cc8f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:33:11 +0100 Subject: gnu: emacs-org-web-tools: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-org-web-tools): Update to 1.3. Change-Id: Id555aa9788cdeaa7a6fe1c27d33839b22b22234b --- 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 18c2e66e68..3c1b8ef993 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28265,7 +28265,7 @@ This package also includes a @code{yt-dlp} front-end.") (define-public emacs-org-web-tools (package (name "emacs-org-web-tools") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -28275,7 +28275,7 @@ This package also includes a @code{yt-dlp} front-end.") (file-name (git-file-name name version)) (sha256 (base32 - "1w24d1cxzgjqycqz894kg3707n3ckwpv5cmbywfaffsz1v5i2p3a")))) + "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash emacs-esxml emacs-request emacs-s)) -- cgit v1.2.3 From 4828d4bf4f203770f0cc1c7c980b184d341de356 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:36:08 +0100 Subject: gnu: emacs-transient: Update to 0.5.3. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.5.3. Change-Id: Ie770cec3eab70e9a5e010adf3341d1e7dc9590db --- gnu/packages/emacs-xyz.scm | 70 ++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c1b8ef993..a91e1b0c9c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30713,47 +30713,43 @@ as Emacs Lisp.") (license license:gpl3+))) (define-public emacs-transient - ;; Use this unreleased commit to support a recent Magit change needed to add - ;; Reviewed-by: tags for any contributor. - (let ((commit "cc0fa80530b02493f73b870032bfcdd1435286cd") - (revision "0")) - (package - (name "emacs-transient") - (version (git-version "0.4.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/transient") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10yaanpz3krh3f9vzyafg6n85yp8sk58gj9vrpsqg926x4m0w1p1")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #f ;no test suite - #:phases (modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (invoke "make" "info") - ;; Move the info file to lisp so that it gets - ;; installed by the emacs-build-system. - (rename-file "docs/transient.info" - "lisp/transient.info"))) - (add-after 'build-info-manual 'enter-lisp-directory - (lambda _ - (chdir "lisp")))))) - (native-inputs (list texinfo)) - (propagated-inputs (list emacs-compat)) - (home-page "https://magit.vc/manual/transient") - (synopsis "Transient commands in Emacs") - (description - "Taking inspiration from prefix keys and prefix arguments + (package + (name "emacs-transient") + (version "0.5.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/transient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fr0pan4dffckfywnx7a0dkb2l71fnc47cqqqb1lckqwr1gr9z6l")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases (modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Move the info file to lisp so that it gets + ;; installed by the emacs-build-system. + (rename-file "docs/transient.info" + "lisp/transient.info"))) + (add-after 'build-info-manual 'enter-lisp-directory + (lambda _ + (chdir "lisp")))))) + (native-inputs (list texinfo)) + (propagated-inputs (list emacs-compat)) + (home-page "https://magit.vc/manual/transient") + (synopsis "Transient commands in Emacs") + (description + "Taking inspiration from prefix keys and prefix arguments in Emacs, Transient implements a similar abstraction involving a prefix command, infix arguments and suffix commands. We could call this abstraction a \"transient command\", but because it always involves at least two commands (a prefix and a suffix) we prefer to call it just a \"transient\".") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-forge (package -- cgit v1.2.3 From cb0fd4b4124248364c95991e554d736616dcc795 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:37:08 +0100 Subject: gnu: emacs-vertico: Update to 1.6. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 1.6. Change-Id: I944b8016f1afdd7d588f9940da6c9bd5b73c6787 --- 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 a91e1b0c9c..abfba3f092 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37401,7 +37401,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "1.4") + (version "1.6") (source (origin (method git-fetch) @@ -37410,7 +37410,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pf6qm89nysrri3xx7pda32yfsyv5fwswg6695qivldpq2biwx2x")))) + (base32 "088x0xqmhicdg44xprhimay0v9hcy12g15c7lk5kvhylxmkbg8wb")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From db1d91ae6ffa40a807d14b857f6f418e0b7139a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:38:23 +0100 Subject: gnu: emacs-yaml: Update to 0.5.5. * gnu/packages/emacs-xyz.scm (emacs-yaml): Update to 0.5.5. Change-Id: Id20c84596a74cd44055fc70892c4b843555c5ca7 --- 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 abfba3f092..f9cc2db1f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14979,7 +14979,7 @@ that uses the standard completion function completing-read.") (define-public emacs-yaml (package (name "emacs-yaml") - (version "0.5.4") + (version "0.5.5") (source (origin (method git-fetch) @@ -14988,7 +14988,7 @@ that uses the standard completion function completing-read.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi")))) + (base32 "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81")))) (build-system emacs-build-system) (home-page "https://github.com/zkry/yaml.el") (synopsis "YAML parser in Elisp") -- cgit v1.2.3 From f2102cb5b9239be2ed2023b908b726af542e0124 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:40:22 +0100 Subject: gnu: emacs-yaml: Run tests. * gnu/packages/emacs-xyz.scm (emacs-yaml): [arguments]: Run tests. Change-Id: Ie395af0fb107313170509986e1ee2d0d996c6689 --- 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 f9cc2db1f1..2a24f4a106 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14990,6 +14990,13 @@ that uses the standard completion function completing-read.") (sha256 (base32 "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81")))) (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "--batch" "-Q" + "-l" "yaml.el" + "-l" "yaml-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/zkry/yaml.el") (synopsis "YAML parser in Elisp") (description -- cgit v1.2.3 From 7593364d70fa81b761c1d9b0269510b21364c6fa Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:34 +0100 Subject: gnu: Add r-scgate. * gnu/packages/bioconductor.scm (r-scgate): New variable. Change-Id: I441bbea5a68882f5f619dea72abdf84619c9d02f --- gnu/packages/bioconductor.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 316aa20026..427fa4ebfe 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10314,6 +10314,49 @@ includes methods formerly found in the scran package, and the new fast and comprehensive scDblFinder method.") (license license:gpl3))) +;; This is a CRAN package, but it depends on packages from Bioconductor. +(define-public r-scgate + (package + (name "r-scgate") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "scGate" version)) + (sha256 + (base32 "0h12d36zjc6fvxbhkxrzbpvw49z9fgyn1jc941q70ajw1yqi2hhh")))) + (properties `((upstream-name . "scGate"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocparallel + r-dplyr + r-ggplot2 + r-ggridges + r-patchwork + r-reshape2 + r-seurat + r-ucell)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/carmonalab/scGate") + (synopsis + "Marker-based cell type purification for single-cell sequencing data") + (description + "This package provides a method to purify a cell type or cell population +of interest from heterogeneous datasets. scGate package automatizes +marker-based purification of specific cell populations, without requiring +training data or reference gene expression profiles. scGate takes as input a +gene expression matrix stored in a Seurat object and a @acronym{GM, gating +model}, consisting of a set of marker genes that define the cell population of +interest. It evaluates the strength of signature marker expression in each +cell using the rank-based method UCell, and then performs @acronym{kNN, +k-nearest neighbor} smoothing by calculating the mean UCell score across +neighboring cells. kNN-smoothing aims at compensating for the large degree of +sparsity in scRNAseq data. Finally, a universal threshold over kNN-smoothed +signature scores is applied in binary decision trees generated from the +user-provided gating model, to annotate cells as either “pure” or “impure”, +with respect to the cell population of interest.") + (license license:gpl3))) + ;; This is a CRAN package, but it depends on packages from Bioconductor. (define-public r-scistreer (package -- cgit v1.2.3 From c8e2b85ed1cbb3e17701c838db797ab718d18be0 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:35 +0100 Subject: gnu: Add r-stacas. * gnu/packages/bioinformatics.scm (r-stacas): New variable. Change-Id: I258a315465ed88b8013d26a36718250c950aa107 --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2e4bc876d4..34039b2eb5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1070,6 +1070,42 @@ of single-cell data using Seurat, RcppML nmf, SingleCellExperiments and similar.") (license license:gpl2+)))) +(define-public r-stacas + (package + (name "r-stacas") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carmonalab/STACAS") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13i0h5i6vlbrb8ndq9gr81560z9d74b2c7m3rjfzls01irjza9hm")))) + (properties `((upstream-name . "STACAS"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocneighbors + r-biocparallel + r-ggplot2 + r-ggridges + r-pbapply + r-r-utils + r-seurat)) + (home-page "https://github.com/carmonalab/STACAS") + (synopsis "Sub-type anchoring correction for alignment in Seurat") + (description + "This package implements methods for batch correction and integration of +scRNA-seq datasets, based on the Seurat anchor-based integration framework. +In particular, STACAS is optimized for the integration of heterogenous +datasets with only limited overlap between cell sub-types (e.g. TIL sets of +CD8 from tumor with CD8/CD4 T cells from lymphnode), for which the default +Seurat alignment methods would tend to over-correct biological differences. +The 2.0 version of the package allows the users to incorporate explicit +information about cell-types in order to assist the integration process.") + (license license:gpl3))) + (define-public r-stringendo (let ((commit "15594b1bba11048a812874bafec0eea1dcc8618a") (revision "1")) -- cgit v1.2.3 From 404c4a5abac34c2a645e1af9a60c8899bd790ed9 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:36 +0100 Subject: gnu: Add r-projectils. * gnu/packages/bioinformatics.scm (r-projectils): New variable. Change-Id: Ia975cfcb9c79e59b029c6839dc87b5dcb89bf72a --- gnu/packages/bioinformatics.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 34039b2eb5..56219c55a5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10349,6 +10349,51 @@ data. This package includes panel editing or renaming for FCS files, bead-based normalization and debarcoding.") (license license:gpl3)))) +(define-public r-projectils + (let ((commit "cc73b97471b4b6eea11ce779b5c4a7dc5c3e1709") + (revision "1")) + (package + (name "r-projectils") + (version (git-version "3.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carmonalab/ProjecTILs") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dpzvbhhb9andnj7angpj32cgkwd6rs6qgpl6i21pqzcn6vqqhqw")))) + (properties `((upstream-name . "ProjecTILs"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocneighbors + r-biocparallel + r-dplyr + r-ggplot2 + r-matrix + r-patchwork + r-pheatmap + r-pracma + r-purrr + r-rcolorbrewer + r-reshape2 + r-scales + r-scgate + r-seurat + r-seuratobject + r-stacas + r-ucell + r-umap + r-uwot)) + (home-page "https://github.com/carmonalab/ProjecTILs") + (synopsis "Reference-based analysis of scRNA-seq data") + (description + "This package implements methods to project single-cell RNA-seq data +onto a reference atlas, enabling interpretation of unknown cell transcriptomic +states in the the context of known, reference states.") + (license license:gpl3)))) + (define-public r-presto (let ((commit "052085db9c88aa70a28d11cc58ebc807999bf0ad") (revision "0")) -- cgit v1.2.3 From 707921ba23593b044381e15ac60143e13f4aa0e6 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Tue, 2 Jan 2024 09:56:38 +0100 Subject: gnu: tdlib: Update to 1.8.23. * gnu/packages/messaging.scm (tdlib): Update to 1.8.23. Signed-off-by: Andrew Tropin --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1c5bc4bbd7..491901edf3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2636,11 +2636,11 @@ replacement.") (license license:gpl2+))) (define-public tdlib - (let ((commit "4ed0b23c9c99868ab4d2d28e8ff244687f7b3144") + (let ((commit "27c3eaeb4964bd5f18d8488e354abde1a4383e49") (revision "0")) (package (name "tdlib") - (version (git-version "1.8.20" revision commit)) + (version (git-version "1.8.23" revision commit)) (source (origin (method git-fetch) @@ -2648,7 +2648,7 @@ replacement.") (url "https://github.com/tdlib/td") (commit commit))) (sha256 - (base32 "16kprlcnphi89yfwgnlaxjwwb1xx24az8xd710rx8cslb4zv00qw")) + (base32 "14f65dfmg2p5hyvi3lffvvazwcd3i3jrrw3c2pwrc5yfgxk3662g")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 344108df6882270b3f50b2411edd9af23027560f Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Tue, 2 Jan 2024 09:56:39 +0100 Subject: gnu: emacs-telega-server: Update to 0.8.230. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.8.230. Signed-off-by: Andrew Tropin --- 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 2a24f4a106..ad02b91c56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34193,11 +34193,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "4f08c835c08e762137ca04e12055cf9dc0b2b8cf") + (let ((commit "304705fa007c3dae3c5d0c6dc66641ae783f0081") (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.203" revision commit)) + (version (git-version "0.8.230" revision commit)) (source (origin (method git-fetch) @@ -34205,7 +34205,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "02iv2cxwsmfpx2b6wvp7l22izvqw21f1b98jm0yihmfh39idxwn8")) + (base32 "02yxjaxpf2f6pjg3ixw7jvx56x6lfh30mnsmiz1p2yi64kyllaan")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- cgit v1.2.3 From 8f03c69b428923dc4d51cda23b10aa7fa7d89f05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 13:34:22 +0100 Subject: gnu: r-vcd: Update to 1.4-12. * gnu/packages/cran.scm (r-vcd): Update to 1.4-12. Change-Id: I5db4c5aeb21692312e05dc6483c4e52a6ec23888 --- 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 bf9e94adee..a7630f25fa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9498,14 +9498,14 @@ modeling for empirical income distributions.") (define-public r-vcd (package (name "r-vcd") - (version "1.4-11") + (version "1.4-12") (source (origin (method url-fetch) (uri (cran-uri "vcd" version)) (sha256 (base32 - "0ch9ks25ab4h4fh4y267s0psvc4ndyaplk8ddva2j54yd1ayhm3s")))) + "127dkln826ah5ydp3pmd5bqyns9m9m6yrjnmn7fir4r9al8yycf9")))) (build-system r-build-system) (propagated-inputs (list r-colorspace r-lmtest r-mass)) -- cgit v1.2.3 From 85dabe71e62587b835d5abc425ee8826be552a7b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jan 2024 17:46:45 +0100 Subject: gnu: emacs-org-web-tools: Fix build. * gnu/packages/emacs-xyz.scm (emacs-org-web-tools)[propagated-inputs]: Add EMACS-PLZ. Change-Id: Icf62d3774257f7b93e114503e6c31ea2fb81d807 --- gnu/packages/emacs-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad02b91c56..bb3c905252 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28285,7 +28285,12 @@ This package also includes a @code{yt-dlp} front-end.") "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-compat emacs-dash emacs-esxml emacs-request emacs-s)) + (list emacs-compat + emacs-dash + emacs-esxml + emacs-plz + emacs-request + emacs-s)) (inputs (list pandoc)) (arguments -- cgit v1.2.3 From f1bf43cdff9a06d91f4598c90203c685a908f624 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 18:34:15 +0100 Subject: gnu: r-excelr: Reuse minify-build-system tools. * gnu/packages/cran.scm (r-excelr)[arguments]: Use minify-build-system. [native-inputs]: Use git repository for jexcel.js. [description]: Reformat. Change-Id: I82f7e466bbab6ad837359f04ee616a7766433c13 --- gnu/packages/cran.scm | 65 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a7630f25fa..85c527dc32 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7437,6 +7437,10 @@ consistency with the base functions in the evd package is provided, so that user can safely interchange most code.") (license license:gpl3))) +;; This package contains minified JavaScript: jExcel CE Spreadsheet, +;; version 3.9.1. It is not clear how to obtain this particular +;; version as there is no tag for 3.9.1. There only is 3.6.1 and +;; 4.2.0 at https://github.com/jspreadsheet/ce. (define-public r-excelr (package (name "r-excelr") @@ -7452,37 +7456,44 @@ can safely interchange most code.") (properties `((upstream-name . "excelR"))) (build-system r-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'process-javascript - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "inst/htmlwidgets/lib/jexcel/js/" - (let ((source (assoc-ref inputs "js-jexcel")) - (target "jexcel.min.js")) - (format #true "Processing ~a --> ~a~%" - source target) - (invoke "esbuild" source "--minify" - (string-append "--outfile=" target))))))))) - (native-inputs - `(("esbuild" ,esbuild) - ;; There is no tag for this particular commit, but comparison of the - ;; contents of the JavaScript files point to this commit as the most - ;; likely source. - ("js-jexcel" - ,(origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/jspreadsheet/ce/" - "8af1960f76e6803bebc5750013d2ebe95354e88a/dist/jexcel.js")) - (sha256 - (base32 - "0y88hsr9d8cpnvdmbm17m328pc4kc5wbcv02kzmhm0bryzhviw7h")))))) + (list + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules + (guix build minify-build-system)) + #:phases + #~(modify-phases (@ (guix build r-build-system) %standard-phases) + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/htmlwidgets/lib/jexcel/js" + (minify (search-input-file inputs "/dist/jexcel.js") + #:target "jexcel.min.js"))))))) (propagated-inputs (list r-htmlwidgets r-jsonlite)) + (native-inputs + (list esbuild + ;; There is no tag for this particular commit, but comparison of + ;; the contents of the JavaScript files point to this commit as the + ;; most likely source. + (let* ((commit "8af1960f76e6803bebc5750013d2ebe95354e88a") + (version (git-version "3.9.1" "0" commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jspreadsheet/ce") + (commit commit))) + (file-name (git-file-name "jexcel" version)) + (sha256 + (base32 + "1zk0wc4h0vax7zgimhwqq2icrvjr84agm3qv42l16gim7gq7fqfq")))))) (home-page "https://github.com/Swechhya/excelR") (synopsis "Wrapper of the JavaScript library jExcel") (description - "This package provides an R interface to the jExcel library to -create web-based interactive tables and spreadsheets compatible with -spreadsheet software.") + "This package provides an R interface to the jExcel library to create +web-based interactive tables and spreadsheets compatible with spreadsheet +software.") (license license:expat))) (define-public r-extremes -- cgit v1.2.3 From 5b030de3866f450209f39079abe63a5fbcb719a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 19:22:13 +0100 Subject: gnu: Add r-epidish. * gnu/packages/bioconductor.scm (r-epidish): New variable. Change-Id: Ib8ca5980149a5d3eabb3d4a68ae686b855e372d4 --- 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 427fa4ebfe..72a0fe377f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7462,6 +7462,37 @@ chromosome region or transcript models of lincRNA genes.") ;; No version specified (license license:lgpl3+))) +(define-public r-epidish + (package + (name "r-epidish") + (version "2.18.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "EpiDISH" version)) + (sha256 + (base32 "170ym3y6gd1kxghz2g5ynvgi1wrxx87b568cjcvzidpqkrkg87s6")))) + (properties `((upstream-name . "EpiDISH"))) + (build-system r-build-system) + (propagated-inputs (list r-e1071 + r-locfdr + r-mass + r-matrix + r-matrixstats + r-quadprog + r-stringr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/sjczheng/EpiDISH") + (synopsis "Epigenetic dissection of intra-sample-heterogeneity") + (description + "@code{EpiDISH} is a R package to infer the proportions of a priori known +cell-types present in a sample representing a mixture of such cell-types. +Right now, the package can be used on DNAm data of whole blood, generic +epithelial tissue and breast tissue. Besides, the package provides a function +that allows the identification of differentially methylated cell-types and +their directionality of change in Epigenome-Wide Association Studies.") + (license license:gpl2))) + (define-public r-fastseg (package (name "r-fastseg") -- cgit v1.2.3 From e8814809c2de6fe2f23169775207b3d2e537724f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 19:23:51 +0100 Subject: gnu: Add r-toast. * gnu/packages/bioconductor.scm (r-toast): New variable. Change-Id: I922508bce0bdf0304e2f40d93a63ffdb58d03aa6 --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 72a0fe377f..1ea5e47321 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10867,6 +10867,44 @@ identifier translation via the GDC API.") "This package implements widgets to provide user interfaces.") (license license:artistic2.0))) +(define-public r-toast + (package + (name "r-toast") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "TOAST" version)) + (sha256 + (base32 "00wpgs2zdrgrh9xmp6m5h9xgv85mhdi36qvwg9gwbz9i7cfabmy1")))) + (properties `((upstream-name . "TOAST"))) + (build-system r-build-system) + (propagated-inputs (list r-corpcor + r-doparallel + r-epidish + r-ggally + r-ggplot2 + r-limma + r-nnls + r-quadprog + r-summarizedexperiment + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/TOAST") + (synopsis "Tools for the analysis of heterogeneous tissues") + (description + "This package is devoted to analyzing high-throughput data (e.g. gene +expression microarray, DNA methylation microarray, RNA-seq) from complex +tissues. Current functionalities include + +@enumerate +@item detect cell-type specific or cross-cell type differential signals +@item tree-based differential analysis +@item improve variable selection in reference-free deconvolution +@item partial reference-free deconvolution with prior knowledge. +@end enumerate") + (license license:gpl2))) + ;; TODO: check javascript (define-public r-trackviewer (package -- cgit v1.2.3 From fb3ac987c94e0a77b5c39913dace0b565afc3291 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:40:44 +0100 Subject: gnu: Add r-wasabi. * gnu/packages/bioinformatics.scm (r-wasabi): New variable. Change-Id: I5ce6c47f1fb3b1d5dfedd0977e53cb70ce379077 --- gnu/packages/bioinformatics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56219c55a5..e03eb21531 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1192,6 +1192,32 @@ shape. This package provides an @code{htmlwidget} for building streamgraph visualizations.") (license license:expat)))) +(define-public r-wasabi + (let ((commit "8c33cabde8d18c2657cd6e38e7cb834f87cf9846") + (revision "1")) + (package + (name "r-wasabi") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/COMBINE-lab/wasabi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rpdj6n4cnx8n2zl60dzgl638474sg49dknwi9x3qb4g56dpphfa")))) + (properties `((upstream-name . "wasabi"))) + (build-system r-build-system) + (propagated-inputs (list r-data-table r-rhdf5 r-rjson)) + (home-page "https://github.com/COMBINE-lab/wasabi") + (synopsis "Use Sailfish and Salmon with Sleuth") + (description + "This package converts the output of the Sailfish and Salmon RNA-seq +quantification tools so that it can be used with the Sleuth differential +analysis package.") + (license license:bsd-3)))) + (define-public pbbam (package (name "pbbam") -- cgit v1.2.3 From ebd00a4e917461ba770be60637b2b041795b2f44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:45:16 +0100 Subject: gnu: r-tgutil: Update to 0.1.15-1.db4ff8b. * gnu/packages/statistics.scm (r-tgutil): Update to 0.1.15-1.db4ff8b. [description]: Update to use full sentences. Change-Id: I6cb7e60b0759bd307a676783a9ceb9c451ce7a82 --- 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 92bf3d5d96..c2cf68fca8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6448,7 +6448,7 @@ can load multiple parameters to the current environment.") (license license:gpl3+)))) (define-public r-tgutil - (let ((commit "0e4a2e84e5cf1f74bc66df0a3d8eac89633fd7b1") + (let ((commit "db4ff8b98082f8e4dbdeacb452641d215fd3c7ff") (revision "1")) (package (name "r-tgutil") @@ -6461,7 +6461,7 @@ can load multiple parameters to the current environment.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0pmacpzhrigprlpl8b5j4xz7l110ifw98017xwk569dghbf8zrq1")))) + (base32 "00rsqs7f896piywh84jr8fkphbbx4jb7radf6znhhj6fip63yn91")))) (properties `((upstream-name . "tgutil"))) (build-system r-build-system) (propagated-inputs (list r-broom @@ -6481,7 +6481,9 @@ can load multiple parameters to the current environment.") r-tidyr)) (home-page "https://github.com/tanaylab/tgutil") (synopsis "Simple utility functions for Tanay lab code") - (description "Shared utility functions for multiple Tanay lab packages.") + (description + "This package provides simple utility functions that are shared +across several packages maintained by the Tanay lab.") (license license:gpl3)))) (define-public r-catterplots -- cgit v1.2.3 From 8ed9ffedd4b7a01fe1ecb73e75931d2ccfcd4923 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:49:13 +0100 Subject: gnu: Add r-sleuth. * gnu/packages/bioinformatics.scm (r-sleuth): New variable. Change-Id: Ic358945548631fd3ac5de96b2efcf1fd93005898 --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e03eb21531..bdad03b000 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10634,6 +10634,43 @@ analysis of cell types, subtypes, transcriptional gradients,cell-cycle variation, gene modules and their regulatory models and more.") (license license:expat)))) +(define-public r-sleuth + (package + (name "r-sleuth") + (version "0.30.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pachterlab/sleuth") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09xgc7r6iisjkk0c0wn0q56zy0aph386kphwixfzq4422y7vlqci")))) + (properties `((upstream-name . "sleuth"))) + (build-system r-build-system) + (propagated-inputs (list r-aggregation + r-data-table + r-dplyr + r-ggplot2 + r-lazyeval + r-matrixstats + r-pheatmap + r-reshape2 + r-rhdf5 + r-shiny + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/pachterlab/sleuth") + (synopsis "Tools for investigating RNA-Seq") + (description + "Sleuth is a program for differential analysis of RNA-Seq data. +It makes use of quantification uncertainty estimates obtained via Kallisto for +accurate differential analysis of isoforms or genes, allows testing in the +context of experiments with complex designs, and supports interactive +exploratory data analysis via sleuth live.") + (license license:gpl3))) + (define-public r-snapatac (package (name "r-snapatac") -- cgit v1.2.3 From f4628000024219bf373922ff4a6fa752eb821797 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 22:46:00 +0100 Subject: gnu: Add cpat. * gnu/packages/bioinformatics.scm (cpat): New variable. Change-Id: I7b3acca1bdec2610d7cdaaf6f96440fe000421dd --- gnu/packages/bioinformatics.scm | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bdad03b000..41cac296fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -617,6 +617,50 @@ Compared to cellSNP, this package is more efficient with higher speed and less memory usage.") (license license:asl2.0)))) +(define-public cpat + (package + (name "cpat") + (version "3.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "CPAT" version)) + (sha256 + (base32 + "0dfrwwbhv1n4nh2a903d1qfb30fgxgya89sa70aci3wzf8h2z0vd")) + (modules '((guix build utils))) + (snippet + '(for-each delete-file-recursively + (list ".eggs" + "lib/__pycache__/" + "lib/cpmodule/__pycache__/"))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + ;; There is no test4.fa + (substitute* "test.sh" + ((".*-g test4.fa.*") "")) + (invoke "bash" "test.sh")))))))) + (propagated-inputs + (list python-numpy python-pysam)) + (inputs + (list r-minimal)) + (home-page "https://wlcb.oit.uci.edu/cpat/") + (synopsis "Alignment-free distinction between coding and noncoding RNA") + (description + "CPAT is a method to distinguish coding and noncoding RNA by using a +logistic regression model based on four pure sequence-based, linguistic +features: ORF size, ORF coverage, Ficket TESTCODE, and Hexamer usage bias. +Linguistic features based method does not require other genomes or protein +databases to perform alignment and is more robust. Because it is +alignment-free, it runs much faster and also easier to use.") + (license license:gpl2+))) + (define-public pbcopper (package (name "pbcopper") -- cgit v1.2.3 From 5312b63ea0032648316b7cfad947d6d1cdb99ed1 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Tue, 12 Dec 2023 21:34:49 +0100 Subject: gnu: icedove-minimal: Add argument to desktop file. Icedove was not able to handle mailto: links, even if it responded to them, it only activated the window, but didn't compose a new email. Calling it directly by `icedove mailto:...` worked. According to: It was missing the argument in the `Exec` line of the desktop file. * gnu/packages/gnuzilla.scm (icedove-minimal)[phases] {install-desktop-file}: Add arguments to Exe line in .desktop file. Change-Id: I3de5e57ed2c5eef23eee88e264487e6460c174b3 Signed-off-by: Efraim Flashner --- 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 7318ec727c..54643c314e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1774,7 +1774,7 @@ ca495991b7852b855")) (format #t "[Desktop Entry]~@ Name=Icedove~@ - Exec=~a/bin/icedove~@ + Exec=~a/bin/icedove %u~@ Icon=icedove~@ GenericName=Mail/News Client~@ Categories=Network;Email;~@ -- cgit v1.2.3 From e2ad70c951c0c8a79883fe232afa0ae88a6f1d84 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 12:53:29 +0800 Subject: gnu: glew: Fix cross-compiling. gnu/packages/gl.scm(glew): [arguments]<#:make-flags>: when cross-compiling, use {cc,strip}-for-target. Change-Id: I365f6635120a85359083beb88cb138f09a99fe33 --- gnu/packages/gl.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2c109ee124..b0ee413acd 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -690,7 +690,12 @@ glxdemo, glxgears, glxheads, and glxinfo.") #t)))) (build-system gnu-build-system) (arguments - (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output) + (list #:make-flags #~(list #$@(if (%current-target-system) + #~((string-append "CC=" #$(cc-for-target)) + (string-append "LD=" #$(cc-for-target)) + (string-append "STRIP=" #$(strip-for-target))) + #~()) + (string-append "GLEW_PREFIX=" #$output) (string-append "GLEW_DEST=" #$output)) #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From 80f6e5a9ea87bb6665d6323c5a73ad5e929409fa Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 13:31:36 +0800 Subject: gnu: vulkan-loader: Fix cross-compiling. gnu/packages/vulkan.scm(vulkan-loader): [arguments]<#:configure-flags>: When cross-compiling, set -DBUILD_TESTS=OFF and -DUSE_GAS=OFF. [inputs]: Add libxrandr. Change-Id: I580e1c77c4b9b5a3483e93ff9eda78fbe07ec292 --- gnu/packages/vulkan.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ca771a30b1..285d6be7f5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata ;;; Copyright © 2022 dan +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -270,7 +271,9 @@ interpretation of the specifications for these languages.") (dirname (dirname (search-input-directory %build-inputs "include/vulkan")))) - "-DBUILD_TESTS=ON") + #$@(if (%current-target-system) + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=ON"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-pkg-config-file @@ -299,7 +302,7 @@ interpretation of the specifications for these languages.") python wayland)) (inputs - (list vulkan-headers)) + (list vulkan-headers libxrandr)) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") -- cgit v1.2.3 From 24eb32f2806fb7d42f4b560422d3f1715cd46e85 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:02 +0800 Subject: gnu: slurp: Fix cross-compiling. gnu/packages/image.scm(slurp): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I5000d681b1428c5b7d123239c1f1ba00f121fb7e Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 79f1a293ec..9179cb8b90 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2259,7 +2259,11 @@ identical visual appearance.") (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) (build-system meson-build-system) (native-inputs - (list pkg-config scdoc)) + (append (if (%current-target-system) + ;; for wayland-scanner + (list wayland pkg-config-for-build) + '()) + (list pkg-config scdoc))) (inputs (list cairo libxkbcommon wayland wayland-protocols)) (home-page "https://github.com/emersion/slurp") -- cgit v1.2.3 From aed1b570815cc539e5039dc213535c2850de40f6 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:03 +0800 Subject: gnu: slurp: Update to 1.5.0. * gnu/packages/image.scm (slurp): Update to 1.5.0. Change-Id: I72a60742af26a2544ee21e052963c0a8ad549d0e Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9179cb8b90..acf0cc8570 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2247,7 +2247,7 @@ identical visual appearance.") (define-public slurp (package (name "slurp") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -2256,7 +2256,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) + (base32 "0wlml42c3shma50bsvqzll7p3zn251jaf0jm59q2idks8gg1zkyq")))) (build-system meson-build-system) (native-inputs (append (if (%current-target-system) -- cgit v1.2.3 From 2d38579e010b802aaef489be1da8c74e5ba53f15 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:19 +0800 Subject: gnu: grim: Update to 1.4.1. * gnu/packages/image.scm (grim): Update to 1.4.1. [home-page]: update to new home-page [source]: update url. Change-Id: I8c2e4ebbf198df7cedda7c1c946ecb33a6e92fb1 Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index acf0cc8570..9c3e797437 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2225,20 +2225,20 @@ identical visual appearance.") (define-public grim (package (name "grim") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/grim") + (url "https://git.sr.ht/~emersion/grim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1b1k5cmmk7gzis0rncyl98lnhdwpjkdsv9pada5mmgxcpka6f0lp")))) + (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) - (home-page "https://github.com/emersion/grim") + (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor") (description "grim can create screenshots from a Wayland compositor.") ;; MIT license. -- cgit v1.2.3 From ae63bb5e7de70011d8861c23ebabc946210ec56f Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:20 +0800 Subject: gnu: grim: Fix cross-compiling. gnu/packages/image.scm(grim): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I9dbf99d0bc92a62b17ded36937827dfbc6b29bb2 Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9c3e797437..baaff1d0c1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2236,7 +2236,11 @@ identical visual appearance.") (sha256 (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) - (native-inputs (list pkg-config scdoc)) + (native-inputs (append (if (%current-target-system) + ;; for wayland-scanner + (list pkg-config-for-build wayland) + '()) + (list pkg-config scdoc))) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor") -- cgit v1.2.3 From c880652fec3303c0d57c076f7187d95d9396983f Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Mon, 1 Jan 2024 13:59:09 +0800 Subject: gnu: libassuan: Fix cross-compiling. gnu/packages/gnupg.scm(libassuan): [arguments]: When cross-compiling, set the --with-libgpg-error-prefix configure option. Change-Id: I320c48f320c34939a8e94589610beb5c40fdf53a Signed-off-by: Mathieu Othacehe --- gnu/packages/gnupg.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 73e9c3a78a..a6ba57d7f3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,6 +237,12 @@ generation.") (base32 "1r1lvcp67gn5lfrj1g388sd77ca6qwnmxndirdysd71gk362z34f")))) (build-system gnu-build-system) + (arguments (if (%current-target-system) + (list #:configure-flags + #~(list (string-append + "--with-libgpg-error-prefix=" + #$(this-package-input "libgpg-error")))) + '())) (propagated-inputs (list libgpg-error pth)) (home-page "https://gnupg.org") -- cgit v1.2.3 From d14389f10ec8c7e4c0a91c1c5094befc4445ddf0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:39 +0000 Subject: gnu: Add (gnu packages golang-web) module. * gnu/packages/golang-web.scm: New file. * gnu/local.mk: Add to gnu/packages/golang-web.scm scope. --- gnu/local.mk | 1 + gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 gnu/packages/golang-web.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4b2393bfdd..ee25e1535e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -306,6 +306,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ %D%/packages/golang-check.scm \ + %D%/packages/golang-web.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ %D%/packages/gps.scm \ diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm new file mode 100644 index 0000000000..feb2854d9c --- /dev/null +++ b/gnu/packages/golang-web.scm @@ -0,0 +1,39 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; 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 golang-web) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system go) + #:use-module (guix git-download) + #:use-module (gnu packages) + #:use-module (gnu packages golang)) + +;;; Commentary: +;;; +;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON, +;;; Web-framework, REST-API or similar functionality. +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; 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. +;;; -- cgit v1.2.3 From a0006c4dc5354c703c74b7561a3e7866297e95dd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:40 +0000 Subject: gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/finance.scm: Add (gnu packages golang-web) module. * gnu/packages/web.scm: As above... Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada --- gnu/packages/finance.scm | 1 + gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/web.scm | 1 + 4 files changed, 27 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 98a220385b..749f741710 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -93,6 +93,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index feb2854d9c..c779600411 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +34,29 @@ ;;; ;;; Code: +(define-public go-github-com-gorilla-mux + (package + (name "go-github-com-gorilla-mux") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/mux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/mux")) + (home-page "https://github.com/gorilla/mux") + (synopsis "URL router and dispatcher for Go") + (description + "Gorilla/Mux implements a request router and dispatcher for matching +incoming requests with their respective handler.") + (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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fb77f610e7..edc8c2bec0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4862,30 +4862,6 @@ containers.") (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.") (license license:bsd-3)))) -(define-public go-github-com-gorilla-mux - (package - (name "go-github-com-gorilla-mux") - (version "1.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/mux") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/mux")) - (home-page "https://github.com/gorilla/mux") - (synopsis "URL router and dispatcher for Go") - (description - "Gorilla/Mux implements a request router and dispatcher for matching -incoming requests with their respective handler.") - (license license:bsd-3))) - (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f61c4f045c..13ae53aa8c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -142,6 +142,7 @@ #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) -- cgit v1.2.3 From d17d7e6ca1b4517162049dfa7f163b0ab0f737fd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:41 +0000 Subject: gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-css): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module. * gnu/packages/golang.scm: As above... Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 +---------------------- 3 files changed, 25 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 95a7e8615f..296f48dcd5 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -21,6 +21,7 @@ #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c779600411..1d61a76268 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,28 @@ ;;; ;;; Code: +(define-public go-github-com-gorilla-css + (package + (name "go-github-com-gorilla-css") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/css/scanner" + #:unpack-path "github.com/gorilla/css")) + (home-page "https://github.com/gorilla/css/") + (synopsis "CSS3 tokenizer") + (description "This package provides a CSS3 tokenizer.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index edc8c2bec0..74b5df2fb8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -80,6 +80,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -4816,28 +4817,6 @@ information about the resource usage and performance characteristics of running containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-css - (package - (name "go-github-com-gorilla-css") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/css") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/css/scanner" - #:unpack-path "github.com/gorilla/css")) - (home-page "https://github.com/gorilla/css/") - (synopsis "CSS3 tokenizer") - (description "This package provides a CSS3 tokenizer.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0")) -- cgit v1.2.3 From 213a54e8de6f534a01420335411bd9cfb3220795 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:42 +0000 Subject: gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aymerick-douceur): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I2e94858736f88333f56d4eb4301acd35e6bb1a33 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1d61a76268..39a83990ce 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -35,6 +35,32 @@ ;;; ;;; Code: +(define-public go-github-com-aymerick-douceur + (package + (name "go-github-com-aymerick-douceur") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aymerick/douceur/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/aymerick/douceur")) + (native-inputs + (list go-github-com-andybalholm-cascadia + go-github-com-gorilla-css + go-github-com-puerkitobio-goquery + go-golang-org-x-net)) + (home-page "https://github.com/aymerick/douceur/") + (synopsis "CSS parser and inliner") + (description "This package provides a CSS parser and inliner.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 74b5df2fb8..5c397ea81a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9541,31 +9541,6 @@ to jQuery to the Go language.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-aymerick-douceur - (package - (name "go-github-com-aymerick-douceur") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aymerick/douceur/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/aymerick/douceur")) - (native-inputs - (list go-github-com-puerkitobio-goquery - go-github-com-andybalholm-cascadia go-golang-org-x-net - go-github-com-gorilla-css)) - (home-page "https://github.com/aymerick/douceur/") - (synopsis "CSS parser and inliner") - (description "This package provides a CSS parser and inliner.") - (license license:expat))) - (define-public go-github-com-chris-ramon-douceur (package (name "go-github-com-chris-ramon-douceur") -- cgit v1.2.3 From 1bc5e65aadb9677313a9b30b0bb67208694710c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:43 +0000 Subject: gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I185cb923d21685eb5a3952b9990833d3a0709312 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 39a83990ce..3c1abfff2c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2022 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,30 @@ ;;; ;;; Code: +(define-public go-github-com-andybalholm-cascadia + (package + (name "go-github-com-andybalholm-cascadia") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andybalholm/cascadia") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/andybalholm/cascadia")) + (native-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/andybalholm/cascadia/") + (synopsis "CSS selectors for HTML") + (description "The Cascadia package implements CSS selectors for use with +the parse trees produced by the html package.") + (license license:bsd-2))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5c397ea81a..5b78ed8576 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-andybalholm-cascadia - (package - (name "go-github-com-andybalholm-cascadia") - (version "1.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/andybalholm/cascadia") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/andybalholm/cascadia")) - (native-inputs - (list go-golang-org-x-net)) - (home-page "https://github.com/andybalholm/cascadia/") - (synopsis "CSS selectors for HTML") - (description "The Cascadia package implements CSS selectors for use with -the parse trees produced by the html package.") - (license license:bsd-2))) - (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") -- cgit v1.2.3 From 5dbb2511e77390a65249a7efe9c4badf0ed95d66 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:44 +0000 Subject: gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic0415a8b280ebd12086a5976c9765c1dbbf50bd2 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3c1abfff2c..8d8b4fb85c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. @@ -131,6 +133,30 @@ the parse trees produced by the html package.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-puerkitobio-goquery + (package + (name "go-github-com-puerkitobio-goquery") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PuerkitoBio/goquery") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/PuerkitoBio/goquery")) + (propagated-inputs + (list go-github-com-andybalholm-cascadia go-golang-org-x-net)) + (home-page "https://github.com/PuerkitoBio/goquery") + (synopsis "Features similar to jQuery to the Go language") + (description "@code{goquery} brings a syntax and a set of features similar +to jQuery to the Go language.") + (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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5b78ed8576..729d50f600 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-puerkitobio-goquery - (package - (name "go-github-com-puerkitobio-goquery") - (version "1.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PuerkitoBio/goquery") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/PuerkitoBio/goquery")) - (propagated-inputs - (list go-github-com-andybalholm-cascadia go-golang-org-x-net)) - (home-page "https://github.com/PuerkitoBio/goquery") - (synopsis "Features similar to jQuery to the Go language") - (description "@code{goquery} brings a syntax and a set of features similar -to jQuery to the Go language.") - (license license:bsd-3))) - (define-public go-github-com-jmespath-go-jmespath (package (name "go-github-com-jmespath-go-jmespath") -- cgit v1.2.3 From 7b2c29095672dd330b17ccabc01128a7e4f45924 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:45 +0000 Subject: gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-chris-ramon-douceur): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I9d0fdccc4ff557870dad60e9ac062ccb2e995979 --- gnu/packages/golang-web.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 8d8b4fb85c..79a69bc842 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; @@ -88,6 +88,34 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-chris-ramon-douceur + (package + (name "go-github-com-chris-ramon-douceur") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chris-ramon/douceur") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/chris-ramon/douceur")) + (propagated-inputs + (list go-github-com-aymerick-douceur + go-github-com-gorilla-css)) + (native-inputs + (list go-github-com-puerkitobio-goquery + go-github-com-andybalholm-cascadia + go-golang-org-x-net)) + (home-page "https://github.com/chris-ramon/douceur/") + (synopsis "CSS parser and inliner") + (description "This package provides a CSS parser and inliner.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 729d50f600..52168b93cb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9493,34 +9493,6 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-chris-ramon-douceur - (package - (name "go-github-com-chris-ramon-douceur") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chris-ramon/douceur") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/chris-ramon/douceur")) - (propagated-inputs - (list go-github-com-aymerick-douceur - go-github-com-gorilla-css)) - (native-inputs - (list go-github-com-puerkitobio-goquery - go-github-com-andybalholm-cascadia - go-golang-org-x-net)) - (home-page "https://github.com/chris-ramon/douceur/") - (synopsis "CSS parser and inliner") - (description "This package provides a CSS parser and inliner.") - (license license:expat))) - (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") -- cgit v1.2.3 From 13ab4abe98f1a88256d4ecd9b3ee3cb026515f4e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:46 +0000 Subject: gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-websocket): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/ipfs.scm: Add (gnu packages golang-web) module. Change-Id: I844738ec0b178a6a1746b01659c93a20919c2736 --- gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 21 --------------------- gnu/packages/ipfs.scm | 1 + 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 79a69bc842..0ca70cec38 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -161,6 +162,28 @@ the parse trees produced by the html package.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-gorilla-websocket + (package + (name "go-github-com-gorilla-websocket") + (version "1.5.0") + (home-page "https://github.com/gorilla/websocket") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/websocket")) + (synopsis "Fast WebSocket implementation for Go") + (description "Gorilla WebSocket is a Go implementation of the WebSocket +protocol.") + (license license:bsd-2))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 52168b93cb..9fe55bc551 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,27 +12909,6 @@ to use in various HTML contexts and with various DOM APIs.") using shell-style rules for quoting and commenting.") (license license:asl2.0))) -(define-public go-github-com-gorilla-websocket - (package - (name "go-github-com-gorilla-websocket") - (version "1.5.0") - (home-page "https://github.com/gorilla/websocket") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/websocket")) - (synopsis "Fast WebSocket implementation for Go") - (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.") - (license license:bsd-2))) - (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index a4c0613e40..fc66582c8a 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system go) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages syncthing)) -- cgit v1.2.3 From e0060729b5dfa678bd686ad20435485a73f3d4d0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:47 +0000 Subject: gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-sourcegraph-jsonrpc2): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/databases.scm: Add (gnu packages golang-web) module. Change-Id: Idda2e18ae5d3e19f72265bdd017eadddc25bcad9 --- gnu/packages/databases.scm | 1 + gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 3 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1ca534aa00..564927c2a7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -108,6 +108,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0ca70cec38..f9e7039707 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -208,6 +208,32 @@ protocol.") to jQuery to the Go language.") (license license:bsd-3))) +(define-public go-github-com-sourcegraph-jsonrpc2 + (package + (name "go-github-com-sourcegraph-jsonrpc2") + (version "0.1.0") + (home-page "https://github.com/sourcegraph/jsonrpc2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/sourcegraph/jsonrpc2")) + (propagated-inputs + (list go-github-com-daviddengcn-go-colortext + go-github-com-gorilla-websocket + go-github-com-motemen-go-colorine)) + (synopsis "Provides a client and server implementation of JSON-RPC 2.0") + (description + "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") + (license license:expat))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9fe55bc551..f51d8fd455 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,32 +12909,6 @@ to use in various HTML contexts and with various DOM APIs.") using shell-style rules for quoting and commenting.") (license license:asl2.0))) -(define-public go-github-com-sourcegraph-jsonrpc2 - (package - (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.1.0") - (home-page "https://github.com/sourcegraph/jsonrpc2") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/sourcegraph/jsonrpc2")) - (propagated-inputs - (list - go-github-com-daviddengcn-go-colortext - go-github-com-motemen-go-colorine - go-github-com-gorilla-websocket)) - (synopsis "Provides a client and server implementation of JSON-RPC 2.0") - (description - "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") - (license license:expat))) - (define-public go-github-com-disintegration-imaging (package (name "go-github-com-disintegration-imaging") -- cgit v1.2.3 From fae3b9d5988393e5385c5d3d067b1412fd1044a2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:48 +0000 Subject: gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-handlers): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/backup.scm: Add (gnu packages golang-web) module. Change-Id: I7535bdecc681e230f4aee70115a3dea847d40e6f --- gnu/packages/backup.scm | 1 + gnu/packages/golang-web.scm | 28 +++++++++++++++++++++++++++- gnu/packages/golang.scm | 26 -------------------------- 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 58c071e1fa..3126464347 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f9e7039707..0480f648eb 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm ;;; @@ -139,6 +140,31 @@ the parse trees produced by the html package.") (description "This package provides a CSS3 tokenizer.") (license license:bsd-3))) +(define-public go-github-com-gorilla-handlers + (package + (name "go-github-com-gorilla-handlers") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/handlers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) + (build-system go-build-system) + (propagated-inputs + `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) + (arguments + '(#:tests? #f ; Tries to download from the internet + #:import-path "github.com/gorilla/handlers")) + (home-page "https://github.com/gorilla/handlers") + (synopsis "Middleware for Go HTTP services and web applications") + (description "A collection of useful middleware for Go HTTP services and +web applications.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f51d8fd455..fb826c2743 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,32 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-handlers - (package - (name "go-github-com-gorilla-handlers") - (version "1.5.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/handlers") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) - (build-system go-build-system) - (propagated-inputs - `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) - (arguments - '(#:tests? #f ; Tries to download from the internet - #:import-path "github.com/gorilla/handlers")) - (home-page "https://github.com/gorilla/handlers") - (synopsis "Middleware for Go HTTP services and web applications") - (description "A collection of useful middleware for Go HTTP services -and web applications.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-securecookie (package (name "go-github-com-gorilla-securecookie") -- cgit v1.2.3 From 170d43cd0d954f09480ed71b29a981ac2a179065 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:49 +0000 Subject: gnu: go-github-com-gorilla-handlers: Remove input labels. * gnu/packages/golang-web.scm (go-github-com-gorilla-handlers): Remove labels. Change-Id: I955408970a64d03823327912fdafcac5d7fbda93 --- gnu/packages/golang-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0480f648eb..3a3c5f9621 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -154,11 +154,11 @@ the parse trees produced by the html package.") (sha256 (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) (build-system go-build-system) - (propagated-inputs - `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) (arguments '(#:tests? #f ; Tries to download from the internet #:import-path "github.com/gorilla/handlers")) + (propagated-inputs + (list go-github-com-felixge-httpsnoop)) (home-page "https://github.com/gorilla/handlers") (synopsis "Middleware for Go HTTP services and web applications") (description "A collection of useful middleware for Go HTTP services and -- cgit v1.2.3 From 2a0b7df5b4b9e7b27a79e7ecc646113af97808b1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:50 +0000 Subject: gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-felixge-httpsnoop): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic2494b3e45c934ecddaa621f00f474b9079dc5ed --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3a3c5f9621..c0ceb5b7ce 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -118,6 +118,30 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-felixge-httpsnoop + (package + (name "go-github-com-felixge-httpsnoop") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felixge/httpsnoop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/felixge/httpsnoop")) + (home-page "https://github.com/felixge/httpsnoop/") + (synopsis "Capture http related metrics") + (description + "Httpsnoop provides an easy way to capture http related +metrics (i.e. response time, bytes written, and http status code) from your +application's http.Handlers.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fb826c2743..841b507cda 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5145,31 +5145,6 @@ GNU extensions} to the POSIX recommendations for command-line options.") all types of configuration needs and formats.") (license license:expat))) -(define-public go-github-com-felixge-httpsnoop - (package - (name "go-github-com-felixge-httpsnoop") - (version "1.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/felixge/httpsnoop") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/felixge/httpsnoop")) - (home-page "https://github.com/felixge/httpsnoop/") - (synopsis "Capture http related metrics") - (description - "Httpsnoop provides an easy way to capture http related -metrics (i.e. response time, bytes written, and http status code) from your -application's http.Handlers.") - (license license:expat))) - (define-public go-github-com-fsnotify-fsnotify (package (name "go-github-com-fsnotify-fsnotify") -- cgit v1.2.3 From 1754f847aa854d004348a6d1090b0132ad87055a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:51 +0000 Subject: gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-securecookie): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iae8beed5e7a099033585bcab33cd42d237d2746d --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c0ceb5b7ce..1a77e0f6f2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -212,6 +212,30 @@ web applications.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-gorilla-securecookie + (package + (name "go-github-com-gorilla-securecookie") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/securecookie") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/securecookie")) + (home-page "https://github.com/gorilla/securecookie") + (synopsis "Encodes and decodes authenticated and optionally encrypted +cookie values") + (description + "Gorilla/securecookie encodes and decodes authenticated and optionally +encrypted cookie values for Go web applications.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-websocket (package (name "go-github-com-gorilla-websocket") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 841b507cda..53ae15e2e2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-securecookie - (package - (name "go-github-com-gorilla-securecookie") - (version "1.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/securecookie") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/securecookie")) - (home-page "https://github.com/gorilla/securecookie") - (synopsis "Encodes and decodes authenticated and optionally encrypted -cookie values") - (description - "Gorilla/securecookie encodes and decodes authenticated and optionally -encrypted cookie values for Go web applications.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-sessions (package (name "go-github-com-gorilla-sessions") -- cgit v1.2.3 From b870f17a83f9a17e0f4677cf0f8303d120106328 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:52 +0000 Subject: gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-sessions): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic4cc128724583a7c50102e476c6b96ea4e322bdd --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1a77e0f6f2..971b370115 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,6 +237,32 @@ cookie values") encrypted cookie values for Go web applications.") (license license:bsd-3))) +(define-public go-github-com-gorilla-sessions + (package + (name "go-github-com-gorilla-sessions") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/sessions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/sessions")) + (propagated-inputs + (list go-github-com-gorilla-securecookie)) + (home-page "https://github.com/gorilla/sessions") + (synopsis "Manage user sessions in web applications") + (description + "This package that provides infrastructure for creating and managing user +sessions in web applications. It supports cookie and filesystem-based +sessions, flash messages, custom backends, and more.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-websocket (package (name "go-github-com-gorilla-websocket") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 53ae15e2e2..14b6fef71d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-sessions - (package - (name "go-github-com-gorilla-sessions") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/sessions") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/sessions")) - (propagated-inputs (list go-github-com-gorilla-securecookie)) - (home-page "https://github.com/gorilla/sessions") - (synopsis "Manage user sessions in web applications") - (description - "This package that provides infrastructure for creating and -managing user sessions in web applications. It supports cookie and -filesystem-based sessions, flash messages, custom backends, and more.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") -- cgit v1.2.3 From ddb3448cf071ae6b9f6efecb413716a5da848669 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:53 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-gokrb5-v8): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie7833a1f5712cc3899fd140741774e6b71f03967 --- gnu/packages/golang-web.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 48 ----------------------------------------- 2 files changed, 51 insertions(+), 49 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 971b370115..ae10a86551 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -30,7 +30,8 @@ #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages) - #:use-module (gnu packages golang)) + #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check)) ;;; Commentary: ;;; @@ -285,6 +286,55 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-jcmturner-gokrb5-v8 + (package + (name "go-github-com-jcmturner-gokrb5-v8") + (version "8.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/gokrb5") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/gokrb5/v8" + #:unpack-path "github.com/jcmturner/gokrb5")) + (propagated-inputs + (list go-github-com-gorilla-sessions + go-github-com-hashicorp-go-uuid + go-github-com-jcmturner-aescts-v2 + go-github-com-jcmturner-dnsutils-v2 + go-github-com-jcmturner-gofork + go-github-com-jcmturner-goidentity-v6 + go-github-com-jcmturner-rpc-v2-mstypes + go-github-com-jcmturner-rpc-v2-ndr + go-github-com-stretchr-testify + go-golang-org-x-crypto + go-golang-org-x-net)) + (home-page "https://github.com/jcmturner/gokrb5") + (synopsis "Pure Go Kerberos library for clients and services") + (description "This package provides a pure Go Kerberos library. It +features: +@itemize +@item Kerberos libraries for custom integration +@item Parsing Keytab files +@item Parsing krb5.conf files +@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami)) +@end itemize + +On the client side, it provides a client that can authenticate to an SPNEGO +Kerberos authenticated web service, and the ability to change client's +password. + +On the server side, the library provides a HTTP handler wrapper implements +SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes +Microsoft AD PAC authorization data.") + (license license:asl2.0))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 14b6fef71d..421a1e1181 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1573,54 +1573,6 @@ authenticated identities and their attributes.") arounds until issues are addressed in the official distribution.") (license license:bsd-3))) -(define-public go-github-com-jcmturner-gokrb5-v8 - (package - (name "go-github-com-jcmturner-gokrb5-v8") - (version "8.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/gokrb5") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/gokrb5/v8" - #:unpack-path "github.com/jcmturner/gokrb5")) - (propagated-inputs (list go-golang-org-x-net - go-golang-org-x-crypto - go-github-com-stretchr-testify - go-github-com-jcmturner-rpc-v2-ndr - go-github-com-jcmturner-rpc-v2-mstypes - go-github-com-jcmturner-goidentity-v6 - go-github-com-jcmturner-gofork - go-github-com-jcmturner-dnsutils-v2 - go-github-com-jcmturner-aescts-v2 - go-github-com-hashicorp-go-uuid - go-github-com-gorilla-sessions)) - (home-page "https://github.com/jcmturner/gokrb5") - (synopsis "Pure Go Kerberos library for clients and services") - (description "This package provides a pure Go Kerberos library. It -features: -@itemize -@item Kerberos libraries for custom integration -@item Parsing Keytab files -@item Parsing krb5.conf files -@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami)) -@end itemize - -On the client side, it provides a client that can authenticate to an SPNEGO -Kerberos authenticated web service, and the ability to change client's -password. - -On the server side, the library provides a HTTP handler wrapper implements -SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes -Microsoft AD PAC authorization data.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-rpc (package (name "go-github-com-jcmturner-rpc") -- cgit v1.2.3 From 88b168ed27e48b2a45b0f27d2bfa0a6870d52a47 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:54 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-gokrb5-v8) [propagated-inputs]: go-github-com-stretchr-testify move from here ... [native-inputs]: ... to here. Change-Id: I93be99c60c15ba7861dd909e8856c800f8cf8314 --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ae10a86551..580877f8fe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -303,6 +303,8 @@ protocol.") (arguments '(#:import-path "github.com/jcmturner/gokrb5/v8" #:unpack-path "github.com/jcmturner/gokrb5")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-gorilla-sessions go-github-com-hashicorp-go-uuid @@ -312,7 +314,6 @@ protocol.") go-github-com-jcmturner-goidentity-v6 go-github-com-jcmturner-rpc-v2-mstypes go-github-com-jcmturner-rpc-v2-ndr - go-github-com-stretchr-testify go-golang-org-x-crypto go-golang-org-x-net)) (home-page "https://github.com/jcmturner/gokrb5") -- cgit v1.2.3 From 15593105894af86d86e627d136e5a3c5a791d2ea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:55 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-dnsutils-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I65f87f8e8cd7970a15d3b1e09c5ef4202f0542db --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 580877f8fe..9b2bcd7cbd 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -286,6 +286,34 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-jcmturner-dnsutils-v2 + (package + (name "go-github-com-jcmturner-dnsutils-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/dnsutils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/dnsutils/v2")) + (propagated-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/jcmturner/dnsutils") + (synopsis "Go library with DNS utils") + (description + "The dnsutils package provides a Go function to return a map of Service +Records (SRV) in the order they should be used for a given service, protocol +and name. The order is determined by the records' priority and randomized +selection based on their relative weighting. This package is useful for +network applications that require accessing services using SRV records.") + (license license:asl2.0))) + (define-public go-github-com-jcmturner-gokrb5-v8 (package (name "go-github-com-jcmturner-gokrb5-v8") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 421a1e1181..44eb9122b9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,33 +1499,6 @@ not included in the Go standard library.") encryption and decryption methods.") (license license:asl2.0))) -(define-public go-github-com-jcmturner-dnsutils-v2 - (package - (name "go-github-com-jcmturner-dnsutils-v2") - (version "2.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/dnsutils") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/dnsutils/v2")) - (propagated-inputs (list go-github-com-stretchr-testify)) - (home-page "https://github.com/jcmturner/dnsutils") - (synopsis "Go library with DNS utils") - (description - "The dnsutils package provides a Go function to return a map of Service -Records (SRV) in the order they should be used for a given service, protocol -and name. The order is determined by the records' priority and randomized -selection based on their relative weighting. This package is useful for -network applications that require accessing services using SRV records.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-goidentity-v6 (package (name "go-github-com-jcmturner-goidentity-v6") -- cgit v1.2.3 From db6f2a0f8aa03110ae6d6179610f3e277110f1ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:56 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-dnsutils-v2): Swap propagated-inputs to native-inputs. Change-Id: I1d02b45559214d72828a78437766cf7c1e06f1b0 --- gnu/packages/golang-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9b2bcd7cbd..6a832291ab 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -302,7 +302,7 @@ protocol.") (build-system go-build-system) (arguments '(#:import-path "github.com/jcmturner/dnsutils/v2")) - (propagated-inputs + (native-inputs (list go-github-com-stretchr-testify)) (home-page "https://github.com/jcmturner/dnsutils") (synopsis "Go library with DNS utils") -- cgit v1.2.3 From c058e08d8b9cb6880c7485615e92623dc349fb33 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:57 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-goidentity-v6): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ibd9202efe7fc1002bc34376107a0e88872c888be --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 6a832291ab..751eb41b58 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -314,6 +314,30 @@ selection based on their relative weighting. This package is useful for network applications that require accessing services using SRV records.") (license license:asl2.0))) +(define-public go-github-com-jcmturner-goidentity-v6 + (package + (name "go-github-com-jcmturner-goidentity-v6") + (version "6.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/goidentity") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/goidentity/v6")) + (propagated-inputs + (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) + (home-page "https://github.com/jcmturner/goidentity") + (synopsis "Hold authenticated identities and their attributes") + (description "This package provides a standard interface for holding +authenticated identities and their attributes.") + (license license:asl2.0))) + (define-public go-github-com-jcmturner-gokrb5-v8 (package (name "go-github-com-jcmturner-gokrb5-v8") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 44eb9122b9..6cccf2098a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,30 +1499,6 @@ not included in the Go standard library.") encryption and decryption methods.") (license license:asl2.0))) -(define-public go-github-com-jcmturner-goidentity-v6 - (package - (name "go-github-com-jcmturner-goidentity-v6") - (version "6.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/goidentity") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/goidentity/v6")) - (propagated-inputs - (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) - (home-page "https://github.com/jcmturner/goidentity") - (synopsis "Hold authenticated identities and their attributes") - (description "This package provides a standard interface for holding -authenticated identities and their attributes.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-gofork (package (name "go-github-com-jcmturner-gofork") -- cgit v1.2.3 From f1fab4912270bcc81890d7e9d8f55ce54915be1d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:58 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-goidentity-v6): [propagated-inputs]: Move go-github-com-stretchr-testify from here ... [native-inputs]: ... to here. Change-Id: I1e7bd72b3bf1c0879426a6a4c5b3b1de1d316069 --- gnu/packages/golang-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 751eb41b58..8ced6a4c6f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -330,8 +330,10 @@ network applications that require accessing services using SRV records.") (build-system go-build-system) (arguments '(#:import-path "github.com/jcmturner/goidentity/v6")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs - (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) + (list go-github-com-hashicorp-go-uuid)) (home-page "https://github.com/jcmturner/goidentity") (synopsis "Hold authenticated identities and their attributes") (description "This package provides a standard interface for holding -- cgit v1.2.3 From 80f52867abde1ba7ed4831fe5d489c9cd0be862f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:59 +0000 Subject: gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-csrf): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I77bcbdaf515152b95418f9e2632d810202a1e23a --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 8ced6a4c6f..5be08caf2e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -144,6 +144,32 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-gorilla-csrf + (package + (name "go-github-com-gorilla-csrf") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/csrf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) + (build-system go-build-system) + (propagated-inputs + `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) + ("github.com/pkg/errors" ,go-github-com-pkg-errors))) + (arguments + '(#:import-path "github.com/gorilla/csrf")) + (home-page "https://github.com/gorilla/csrf") + (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") + (description + "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention +middleware for Go web applications and services.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6cccf2098a..e0c5ef31af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4768,33 +4768,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-csrf - (package - (name "go-github-com-gorilla-csrf") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/csrf") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) - (build-system go-build-system) - (propagated-inputs - `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) - ("github.com/pkg/errors" ,go-github-com-pkg-errors))) - (arguments - '(#:import-path "github.com/gorilla/csrf")) - (home-page "https://github.com/gorilla/csrf") - (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") - (description - "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention -middleware for Go web applications and services.") - (license license:bsd-3))) - (define-public go-github-com-jonboulle-clockwork (let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d") (revision "0")) -- cgit v1.2.3 From fd51ae6a374cb2f151884dc27de2ff11141f5f5c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:00 +0000 Subject: gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tdewolff-minify-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I4cee7a25e618cc7427d8669c4b17d028817e378f --- gnu/packages/golang-web.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 43 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5be08caf2e..d82cac46b9 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. @@ -28,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) @@ -466,6 +468,47 @@ to jQuery to the Go language.") "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") (license license:expat))) +(define-public go-github-com-tdewolff-minify-v2 + (package + (name "go-github-com-tdewolff-minify-v2") + (version "2.12.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/minify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/minify/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-hash + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (dir) + (with-directory-excursion + (format #f "src/~a/~a" import-path dir) + (make-file-writable "hash.go") + (format #t "Generating `hash.go' for ~a...~%" dir) + (invoke "go" "generate"))) + '("css" "html" "svg"))))))) + (propagated-inputs + (list go-github-com-tdewolff-parse-v2)) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://go.tacodewolff.nl/minify") + (synopsis "Go minifiers for web formats") + (description + "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and +an interface to implement any other minifier.") + (license license:expat))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e0c5ef31af..74bd542d42 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,46 +3573,6 @@ per-goroutine.") @code{string} to @code{uint32} mapper.") (license license:bsd-3))) -(define-public go-github-com-tdewolff-minify-v2 - (package - (name "go-github-com-tdewolff-minify-v2") - (version "2.12.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/minify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/minify/v2" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-hash - (lambda* (#:key import-path #:allow-other-keys) - (for-each - (lambda (dir) - (with-directory-excursion - (format #f "src/~a/~a" import-path dir) - (make-file-writable "hash.go") - (format #t "Generating `hash.go' for ~a...~%" dir) - (invoke "go" "generate"))) - '("css" "html" "svg"))))))) - (propagated-inputs - (list go-github-com-tdewolff-parse-v2)) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://go.tacodewolff.nl/minify") - (synopsis "Go minifiers for web formats") - (description - "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and -an interface to implement any other minifier.") - (license license:expat))) - (define-public go-github-com-tdewolff-parse-v2 (package (name "go-github-com-tdewolff-parse-v2") -- cgit v1.2.3 From b184a16c141d110840b023851b233dfe032a2f72 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:01 +0000 Subject: gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tdewolff-parse-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Id58c54359f1bf55c6fc8178ce142bf985858bb87 --- gnu/packages/golang-web.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 37 ------------------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d82cac46b9..9e68e96baf 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -509,6 +509,44 @@ to jQuery to the Go language.") an interface to implement any other minifier.") (license license:expat))) +(define-public go-github-com-tdewolff-parse-v2 + (package + (name "go-github-com-tdewolff-parse-v2") + (version "2.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/parse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/parse/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-hash + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (dir) + (with-directory-excursion + (format #f "src/~a/~a" import-path dir) + (make-file-writable "hash.go") + (format #t "Generating `hash.go' for ~a...~%" dir) + (invoke "go" "generate"))) + '("css" "html"))))))) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://github.com/tdewolff/parse") + (synopsis "Go parsers for web formats") + (description + "This package contains several lexers and parsers written in Go.") + (license license:expat))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 74bd542d42..acffd91dde 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,43 +3573,6 @@ per-goroutine.") @code{string} to @code{uint32} mapper.") (license license:bsd-3))) -(define-public go-github-com-tdewolff-parse-v2 - (package - (name "go-github-com-tdewolff-parse-v2") - (version "2.6.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/parse") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/parse/v2" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-hash - (lambda* (#:key import-path #:allow-other-keys) - (for-each - (lambda (dir) - (with-directory-excursion - (format #f "src/~a/~a" import-path dir) - (make-file-writable "hash.go") - (format #t "Generating `hash.go' for ~a...~%" dir) - (invoke "go" "generate"))) - '("css" "html"))))))) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://github.com/tdewolff/parse") - (synopsis "Go parsers for web formats") - (description - "This package contains several lexers and parsers written in Go.") - (license license:expat))) - (define-public go-github-com-tj-docopt (package (name "go-github-com-tj-docopt") -- cgit v1.2.3 From 032cac46ed01ceb628a08bdbcc97b256a71002ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:02 +0000 Subject: gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-context): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I22ba5493a48fe619ef2aca185c559da3a81f8d81 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9e68e96baf..012ed0429c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -146,6 +146,32 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-gorilla-context + (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") + (revision "0")) + (package + (name "go-github-com-gorilla-context") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/context") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/context")) + (home-page "https://github.com/gorilla/context") + (synopsis "Go registry for request variables") + (description + "This package provides @code{gorilla/context}, which is a general +purpose registry for global request variables in the Go programming +language.") + (license license:bsd-3)))) + (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index acffd91dde..52d65d4967 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4641,30 +4641,6 @@ information about the resource usage and performance characteristics of running containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-context - (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") - (revision "0")) - (package - (name "go-github-com-gorilla-context") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/context") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/context")) - (home-page "https://github.com/gorilla/context") - (synopsis "Go registry for request variables") - (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.") - (license license:bsd-3)))) - (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") -- cgit v1.2.3 From d0dc31a56ec497e070eb6662c8ff6b4b3e5c7cef Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:03 +0000 Subject: gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-microcosm-cc-bluemonday): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie5122f8afb2a29574c0e0bb5eb96665ecb77176b --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 012ed0429c..117742dc07 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -444,6 +444,30 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-microcosm-cc-bluemonday + (package + (name "go-github-com-microcosm-cc-bluemonday") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microcosm-cc/bluemonday") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/microcosm-cc/bluemonday")) + (propagated-inputs + (list go-github-com-chris-ramon-douceur + go-golang-org-x-net)) + (home-page "https://github.com/microcosm-cc/bluemonday/") + (synopsis "HTML sanitizer") + (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") + (license license:bsd-3))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 52d65d4967..292d4f799d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9165,30 +9165,6 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-microcosm-cc-bluemonday - (package - (name "go-github-com-microcosm-cc-bluemonday") - (version "1.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/microcosm-cc/bluemonday") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/microcosm-cc/bluemonday")) - (propagated-inputs - (list go-github-com-chris-ramon-douceur - go-golang-org-x-net)) - (home-page "https://github.com/microcosm-cc/bluemonday/") - (synopsis "HTML sanitizer") - (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") - (license license:bsd-3))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") -- cgit v1.2.3 From 815821c139798e42e2c022a5c2128ea10e9d2fea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:04 +0000 Subject: gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-google-safehtml): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia1f14486f262d3695077c8e2f409f4928874c4f8 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 117742dc07..ce95d1b467 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. @@ -146,6 +147,31 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(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-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 292d4f799d..84dead6293 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12510,31 +12510,6 @@ 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 v1.2.3 From a3a25490ec6d7da6f8da2bc374e28d11ccc3a4d8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:05 +0000 Subject: gnu: go-github-com-google-safehtml: Remove input labels. * gnu/packages/golang-web (go-github-com-google-safehtml): Remove labels. Change-Id: I20f5748496988c9e64fa0783bb51507c6cfa933e --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ce95d1b467..9aa3fe8233 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -163,7 +163,8 @@ application's http.Handlers.") (build-system go-build-system) (arguments '(#:import-path "github.com/google/safehtml")) - (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text))) + (propagated-inputs + (list go-golang-org-x-text)) (home-page "https://github.com/google/safehtml") (synopsis "Safe HTML for Go") (description -- cgit v1.2.3 From 8a8b218b3fa963e078d63b38774539ee1cf9ae15 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:06 +0000 Subject: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4 --- gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 58 ------------------------------------------ 2 files changed, 60 insertions(+), 59 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9aa3fe8233..72f2a7d84c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -34,7 +35,8 @@ #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) - #:use-module (gnu packages golang-check)) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages web)) ;;; Commentary: ;;; @@ -95,6 +97,63 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-bep-golibsass + (package + (name "go-github-com-bep-golibsass") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bep/golibsass") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libsass_src") + #t)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/bep/golibsass/libsass" + #:unpack-path "github.com/bep/golibsass" + ;; The dev build tag modifies the build to link to system libsass + ;; instead of including the bundled one (which we remove.) + ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go + #:build-flags '("-tags" "dev") + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-bindings + ;; Generate bindings for system libsass, replacing the + ;; pre-generated bindings. + (lambda* (#:key inputs unpack-path #:allow-other-keys) + (mkdir-p (string-append "src/" unpack-path "/internal/libsass")) + (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src"))) + (substitute* (string-append "src/" unpack-path "/gen/main.go") + (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)") + (string-append "\"" libsass-src "\"")) + (("../../libsass_src/src/") + libsass-src))) + (invoke "go" "generate" (string-append unpack-path "/gen")) + #t)) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (if tests? + (invoke "go" "test" import-path "-tags" "dev")) + #t))))) + (propagated-inputs + (list libsass)) + (native-inputs + `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest) + ("libsass-src" ,(package-source libsass)))) + (home-page "https://github.com/bep/golibsass") + (synopsis "Easy to use Go bindings for LibSass") + (description + "This package provides SCSS compiler support for Go applications.") + (license license:expat))) + (define-public go-github-com-chris-ramon-douceur (package (name "go-github-com-chris-ramon-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 84dead6293..a49df748f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10508,64 +10508,6 @@ is unchanged. This package contains a series of small enhancements and additions.") (license license:bsd-3)))) -(define-public go-github-com-bep-golibsass - (package - (name "go-github-com-bep-golibsass") - (version "0.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bep/golibsass") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "libsass_src") - #t)))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/bep/golibsass/libsass" - #:unpack-path "github.com/bep/golibsass" - ;; The dev build tag modifies the build to link to system libsass - ;; instead of including the bundled one (which we remove.) - ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go - #:build-flags '("-tags" "dev") - #:phases - (modify-phases %standard-phases - (add-before 'build 'generate-bindings - ;; Generate bindings for system libsass, replacing the - ;; pre-generated bindings. - (lambda* (#:key inputs unpack-path #:allow-other-keys) - (mkdir-p (string-append "src/" unpack-path "/internal/libsass")) - (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src"))) - (substitute* (string-append "src/" unpack-path "/gen/main.go") - (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)") - (string-append "\"" libsass-src "\"")) - (("../../libsass_src/src/") - libsass-src))) - (invoke "go" "generate" (string-append unpack-path "/gen")) - #t)) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (if tests? - (invoke "go" "test" import-path "-tags" "dev")) - #t))))) - (propagated-inputs - (list libsass)) - (native-inputs - `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest) - ("libsass-src" ,(package-source libsass)))) - (home-page "https://github.com/bep/golibsass") - (synopsis "Easy to use Go bindings for LibSass") - (description - "This package provides SCSS compiler support for Go applications.") - (license license:expat))) - (define-public go-github-com-hashicorp-go-syslog (package (name "go-github-com-hashicorp-go-syslog") -- cgit v1.2.3 From 584bff22f27436c095a56560865cae05b31fbd84 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:07 +0000 Subject: gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-gopkg-in-square-go-jose-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ifdc5b240c2f3af874d6b4b8b0422dfd9326348a3 --- gnu/packages/golang-web.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/golang.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 72f2a7d84c..976179f44e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -683,6 +683,35 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-gopkg-in-square-go-jose-v2 + (package + (name "go-gopkg-in-square-go-jose-v2") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/square/go-jose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) + (build-system go-build-system) + (arguments + (list #:import-path "gopkg.in/square/go-jose.v2")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (native-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-stretchr-testify)) + (home-page "https://gopkg.in/square/go-jose.v2") + (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") + (description + "This package aims to provide an implementation of the Javascript Object +Signing and Encryption set of standards. This includes support for JSON Web +Encryption, JSON Web Signature, and JSON Web Token standards.") + (license license:asl2.0))) + ;;; ;;; 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 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a49df748f7..f222b40ead 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3359,35 +3359,6 @@ and anniversaries.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) -(define-public go-gopkg-in-square-go-jose-v2 - (package - (name "go-gopkg-in-square-go-jose-v2") - (version "2.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/square/go-jose") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) - (build-system go-build-system) - (arguments - (list #:import-path "gopkg.in/square/go-jose.v2")) - (propagated-inputs - (list go-golang-org-x-crypto)) - (native-inputs - (list go-github-com-google-go-cmp-cmp - go-github-com-stretchr-testify)) - (home-page "https://gopkg.in/square/go-jose.v2") - (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") - (description - "This package aims to provide an implementation of the Javascript Object -Signing and Encryption set of standards. This includes support for JSON Web -Encryption, JSON Web Signature, and JSON Web Token standards.") - (license license:asl2.0))) - (define-public go-github-com-go-jose-go-jose-v3 (package (inherit go-gopkg-in-square-go-jose-v2) -- cgit v1.2.3 From 66ea5eebb192dd144d44b0520166e9b095f8ac8b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:08 +0000 Subject: gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-coreos-go-oidc): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iadefbc9c3df2aa291a3eb4c8cc31a5fdf562e138 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 976179f44e..792406ab97 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -182,6 +182,33 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-coreos-go-oidc + (package + (name "go-github-com-coreos-go-oidc") + (version "2.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coreos/go-oidc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/coreos/go-oidc")) + (propagated-inputs + (list go-github-com-pquerna-cachecontrol + go-golang-org-x-oauth2 + go-gopkg-in-square-go-jose-v2)) + (home-page "https://github.com/coreos/go-oidc") + (synopsis "OpenID Connect support for Go") + (description + "This package enables OpenID Connect support for the +@code{go-golang-org-x-oauth2} package.") + (license license:asl2.0))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f222b40ead..f67b38f34e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,33 +9379,6 @@ templates on ANSI compatible terminals. You can create your own stylesheet or use one of our glamorous default themes.") (license license:expat))) -(define-public go-github-com-coreos-go-oidc - (package - (name "go-github-com-coreos-go-oidc") - (version "2.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coreos/go-oidc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/coreos/go-oidc")) - (propagated-inputs - (list go-github-com-pquerna-cachecontrol - go-golang-org-x-oauth2 - go-gopkg-in-square-go-jose-v2)) - (home-page "https://github.com/coreos/go-oidc") - (synopsis "OpenID Connect support for Go") - (description - "This package enables OpenID Connect support for the -@code{go-golang-org-x-oauth2} package.") - (license license:asl2.0))) - (define-public go-github-com-coreos-go-oidc-v3 (package (inherit go-github-com-coreos-go-oidc) -- cgit v1.2.3 From cb523a9b6bce0332c796d4a2033d7d60a712a58b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:09 +0000 Subject: gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: If049d6172219bf144d3f30877f3c9f5138bcc78c --- gnu/packages/golang-web.scm | 22 ++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 792406ab97..0219ffb5e5 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -209,6 +209,28 @@ the parse trees produced by the html package.") @code{go-golang-org-x-oauth2} package.") (license license:asl2.0))) +(define-public go-github-com-coreos-go-oidc-v3 + (package + (inherit go-github-com-coreos-go-oidc) + (name "go-github-com-coreos-go-oidc-v3") + (version "3.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coreos/go-oidc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9")))) + (arguments + (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3. + #:import-path "github.com/coreos/go-oidc/v3/oidc" + #:unpack-path "github.com/coreos/go-oidc/v3")) + (propagated-inputs + (list go-github-com-go-jose-go-jose-v3 + go-golang-org-x-oauth2)))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f67b38f34e..aa158f5620 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,28 +9379,6 @@ templates on ANSI compatible terminals. You can create your own stylesheet or use one of our glamorous default themes.") (license license:expat))) -(define-public go-github-com-coreos-go-oidc-v3 - (package - (inherit go-github-com-coreos-go-oidc) - (name "go-github-com-coreos-go-oidc-v3") - (version "3.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coreos/go-oidc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9")))) - (arguments - (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3. - #:import-path "github.com/coreos/go-oidc/v3/oidc" - #:unpack-path "github.com/coreos/go-oidc/v3")) - (propagated-inputs - (list go-github-com-go-jose-go-jose-v3 - go-golang-org-x-oauth2)))) - (define-public go-github-com-coreos-go-semver (package (name "go-github-com-coreos-go-semver") -- cgit v1.2.3 From 157369092adae975e2cd5f8f6e68f234e685900f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:10 +0000 Subject: gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-sdk): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I8e82019c75b115548c2e0eea54b261ff8c3dd4a7 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0219ffb5e5..352c831e41 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -71,6 +71,34 @@ the parse trees produced by the html package.") (license license:bsd-2))) +(define-public go-github-com-aws-sdk + (package + (name "go-github-com-aws-sdk") + (version "1.35.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go/aws" + #:unpack-path "github.com/aws/aws-sdk-go")) + (propagated-inputs + (list go-github-com-go-sql-driver-mysql + go-github-com-jmespath-go-jmespath + go-github-com-pkg-errors + go-golang-org-x-net)) + (home-page "https://github.com/aws/aws-sdk-go") + (synopsis "Library to access Amazon Web Services (AWS)") + (description + "This is the official AWS SDK for the Go programming language.") + (license license:asl2.0))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aa158f5620..1a02f66ac8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3331,34 +3331,6 @@ specified. Algorithms are included to calculate yahrzeits, birthdays, and anniversaries.") (license license:gpl2+)))) -(define-public go-github-com-aws-sdk - (package - (name "go-github-com-aws-sdk") - (version "1.35.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go/aws" - #:unpack-path "github.com/aws/aws-sdk-go")) - (propagated-inputs - (list go-github-com-go-sql-driver-mysql - go-github-com-jmespath-go-jmespath go-github-com-pkg-errors - go-golang-org-x-net)) - (home-page "https://github.com/aws/aws-sdk-go") - (synopsis "Library to access Amazon Web Services (AWS)") - (description - "This is the official AWS SDK for the Go programming language.") - (license license:asl2.0))) - (define-public go-github-com-go-jose-go-jose-v3 (package (inherit go-gopkg-in-square-go-jose-v2) -- cgit v1.2.3 From 61b29e1cf2a2093ae5f4a14685bdc993552ff041 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:11 +0000 Subject: gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I60676c0204e198c6050724efa5410c5b695f88fb --- gnu/packages/golang-web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 352c831e41..f59415452f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -760,6 +761,46 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-github-com-valyala-fasthttp + (package + (name "go-github-com-valyala-fasthttp") + (version "1.39.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/valyala/fasthttp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/valyala/fasthttp" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; Tests hang forever with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (propagated-inputs + (list go-github-com-andybalholm-brotli + go-github-com-klauspost-compress + go-github-com-valyala-bytebufferpool + go-github-com-valyala-tcplisten + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-sys)) + (home-page "https://github.com/valyala/fasthttp") + (synopsis "Provides fast HTTP server and client API") + (description + "This package provides a Go module @code{fasthttp} which may be used as +replacement for native @code{net/http} module.") + (license license:expat))) + (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1a02f66ac8..e79179679c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11304,46 +11304,6 @@ non-cryptographic hash algorithm, working at speeds close to RAM limits.") anti-fragmentation protection.") (license license:expat))) -(define-public go-github-com-valyala-fasthttp - (package - (name "go-github-com-valyala-fasthttp") - (version "1.39.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/valyala/fasthttp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/valyala/fasthttp" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; Tests hang forever with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (propagated-inputs - (list go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-crypto - go-github-com-valyala-tcplisten - go-github-com-valyala-bytebufferpool - go-github-com-klauspost-compress - go-github-com-andybalholm-brotli)) - (home-page "https://github.com/valyala/fasthttp") - (synopsis "Provides fast HTTP server and client API") - (description - "This package provides a Go module @code{fasthttp} which may be used as -replacement for native @code{net/http} module.") - (license license:expat))) - (define-public go-github-com-valyala-tcplisten (package (name "go-github-com-valyala-tcplisten") -- cgit v1.2.3 From 9b7806717f4ab244ba0cc4ec23dd4a841cbd910b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:12 +0000 Subject: gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-go-chi-chi-v5): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I120c2cb142935430443a7e6c9e53aa8544bbaf8e --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++-- gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f59415452f..2570be62f7 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,17 +1,17 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze -;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves -;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -284,6 +284,29 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-go-chi-chi-v5 + (package + (name "go-github-com-go-chi-chi-v5") + (version "5.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-chi/chi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/go-chi/chi/v5")) + (home-page "https://github.com/go-chi/chi") + (synopsis "Composable router for HTTP services written in Go") + (description + "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user +decompose request handling into many smaller layers.") + (license license:expat))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e79179679c..b66e49801c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12117,29 +12117,6 @@ Features: @end itemize") (license license:asl2.0))) -(define-public go-github-com-go-chi-chi-v5 - (package - (name "go-github-com-go-chi-chi-v5") - (version "5.0.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-chi/chi") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-chi/chi/v5")) - (home-page "https://github.com/go-chi/chi") - (synopsis "Composable router for HTTP services written in Go") - (description - "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user -decompose request handling into many smaller layers.") - (license license:expat))) - (define-public go-sigs-k8s-io-yaml (package (name "go-sigs-k8s-io-yaml") -- cgit v1.2.3 From 0ca7181c80d8d8d2ddd9741dd30fb19f87a2266f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:13 +0000 Subject: gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-julienschmidt-httprouter): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/high-availability.scm: Add (gnu packages golang-web) module. Change-Id: I277e4a7ed835b0dc00f08e102e982e0cd019b828 --- gnu/packages/golang-web.scm | 25 ++++++++++++++++++++++++- gnu/packages/golang.scm | 23 ----------------------- gnu/packages/high-availability.scm | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 2570be62f7..c501f55685 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,9 +6,9 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi -;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves @@ -631,6 +631,29 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-julienschmidt-httprouter + (package + (name "go-github-com-julienschmidt-httprouter") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/julienschmidt/httprouter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/julienschmidt/httprouter")) + (home-page "https://github.com/julienschmidt/httprouter") + (synopsis "High performance HTTP request router") + (description + "Package @code{httprouter} is a trie based high performance HTTP request +router.") + (license license:bsd-3))) + (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b66e49801c..fad77f7a27 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9601,29 +9601,6 @@ extensions.") for color and styles.") (license license:lgpl3))) -(define-public go-github-com-julienschmidt-httprouter - (package - (name "go-github-com-julienschmidt-httprouter") - (version "1.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/julienschmidt/httprouter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/julienschmidt/httprouter")) - (home-page "https://github.com/julienschmidt/httprouter") - (synopsis "High performance HTTP request router") - (description - "Package @code{httprouter} is a trie based high performance HTTP request -router.") - (license license:bsd-3))) - (define-public go-github-com-kevinburke-ssh-config (package (name "go-github-com-kevinburke-ssh-config") diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 553095cb75..6808bcd597 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages hardware) #:use-module (gnu packages linux) #:use-module (gnu packages lua) -- cgit v1.2.3 From 9a5946bc7aa56f541c374832c2e2ef08c25d19b9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:14 +0000 Subject: gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-emicklei-go-restful): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Idc88242d2ec3274a0b68244f5e91bbfc2dd8543c --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c501f55685..4cef7b6641 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior @@ -260,6 +261,29 @@ the parse trees produced by the html package.") (list go-github-com-go-jose-go-jose-v3 go-golang-org-x-oauth2)))) +(define-public go-github-com-emicklei-go-restful + (package + (name "go-github-com-emicklei-go-restful") + (version "3.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emicklei/go-restful") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/emicklei/go-restful")) + (home-page "https://github.com/emicklei/go-restful") + (synopsis "Build REST-style web services using Go") + (description "This package provides @code{go-restful}, which helps +developers to use @code{http} methods explicitly and in a way that's +consistent with the HTTP protocol definition.") + (license license:expat))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fad77f7a27..e3c4577a57 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4507,30 +4507,6 @@ sockets.") (description "Semver is a library for Semantic versioning written in Go.") (license license:expat)))) -(define-public go-github-com-emicklei-go-restful - (package - (name "go-github-com-emicklei-go-restful") - (version "3.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emicklei/go-restful") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/emicklei/go-restful")) - (home-page "https://github.com/emicklei/go-restful") - (synopsis "Build REST-style web services using Go") - (description "This package provides @code{go-restful}, which helps -developers to use @code{http} methods explicitly and in a way that's consistent -with the HTTP protocol definition.") - (license license:expat))) - (define-public go-cloud-google-com-go-compute-metadata (package (name "go-cloud-google-com-go-compute-metadata") -- cgit v1.2.3 From 75641bbd7398c8344450d54eeba035c0bbebdcaa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:15 +0000 Subject: gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tv42-httpunix): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I1b81c93afd803dfd68fae5292cb2103855cdba6d --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4cef7b6641..caccb126bc 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen @@ -831,6 +832,30 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-github-com-tv42-httpunix + (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22") + (revision "0")) + (package + (name "go-github-com-tv42-httpunix") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tv42/httpunix") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/tv42/httpunix")) + (home-page "https://github.com/tv42/httpunix") + (synopsis "Go library to talk HTTP over Unix domain sockets") + (description "This package is a Go library to talk HTTP over Unix domain +sockets.") + (license license:expat)))) + (define-public go-github-com-valyala-fasthttp (package (name "go-github-com-valyala-fasthttp") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e3c4577a57..be31cd0f43 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4459,30 +4459,6 @@ to use line-based tools such as grep to search for what you want and see the absolute \"path\" to it.") (license license:expat))) -(define-public go-github-com-tv42-httpunix - (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22") - (revision "0")) - (package - (name "go-github-com-tv42-httpunix") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tv42/httpunix") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/tv42/httpunix")) - (home-page "https://github.com/tv42/httpunix") - (synopsis "Go library to talk HTTP over Unix domain sockets") - (description "This package is a Go library to talk HTTP over Unix domain -sockets.") - (license license:expat)))) - (define-public go-github-com-blang-semver (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") (revision "0")) -- cgit v1.2.3 From 7a9f0869d4677b553083f6439b673b95beae766c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:16 +0000 Subject: gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-opentracing-opentracing-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I87e615589cdb038e2b633ecd63194c81d5864a5b --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index caccb126bc..d021be005f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -703,6 +704,30 @@ router.") (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") (license license:bsd-3))) +(define-public go-github-com-opentracing-opentracing-go + (package + (name "go-github-com-opentracing-opentracing-go") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/opentracing/opentracing-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/opentracing/opentracing-go")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/opentracing/opentracing-go") + (synopsis "OpenTracing API for Go") + (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") + (license license:asl2.0))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index be31cd0f43..40ffc1143d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1934,30 +1934,6 @@ standardized in RFC 7539.") (description "InterConv converts interfaces into any data type.") (license license:expat)))) -(define-public go-github-com-opentracing-opentracing-go - (package - (name "go-github-com-opentracing-opentracing-go") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/opentracing/opentracing-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/opentracing/opentracing-go")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://github.com/opentracing/opentracing-go") - (synopsis "OpenTracing API for Go") - (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") - (license license:asl2.0))) - (define-public go-github-com-operatorfoundation-monolith-go (package (name "go-github-com-operatorfoundation-monolith-go") -- cgit v1.2.3 From d087261febf44b44936548849f155bc57680dadb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:17 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-francoispqt-gojay): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I2ff041a91e2d37d79495a3ebda1b602784161c4a --- gnu/packages/golang-web.scm | 27 ++++++++++++++++++++++++++- gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d021be005f..2790e2b5aa 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,9 +5,9 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -310,6 +310,31 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-francoispqt-gojay + (package + (name "go-github-com-francoispqt-gojay") + (version "1.2.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/francoispqt/gojay") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/francoispqt/gojay")) + (propagated-inputs + (list go-github-com-stretchr-testify)) + (synopsis "JSON encoder/decoder with powerful stream API for Golang") + (description "GoJay is a performant JSON encoder/decoder for Golang. It has +a simple API and doesn't use reflection. It relies on small interfaces to +decode/encode structures and slices.") + (home-page "https://github.com/francoispqt/gojay") + (license license:expat))) + (define-public go-github-com-go-chi-chi-v5 (package (name "go-github-com-go-chi-chi-v5") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 40ffc1143d..beb14e0c3f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7479,31 +7479,6 @@ designed to clean up raw terminal output by stripping escape sequences, optionally preserving color.") (license license:expat))) -(define-public go-github-com-francoispqt-gojay - (package - (name "go-github-com-francoispqt-gojay") - (version "1.2.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/francoispqt/gojay") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/francoispqt/gojay")) - (propagated-inputs - (list go-github-com-stretchr-testify)) - (synopsis "JSON encoder/decoder with powerful stream API for Golang") - (description "GoJay is a performant JSON encoder/decoder for Golang. It has -a simple API and doesn't use reflection. It relies on small interfaces to -decode/encode structures and slices.") - (home-page "https://github.com/francoispqt/gojay") - (license license:expat))) - (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") -- cgit v1.2.3 From 502c8a7442e20c8d9aced661db4a4f8f7551ea44 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:18 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-francoispqt-gojay): [propagated-inputs]: Swap to [native-inputs]. Change-Id: Ie83ea13685036b2688f668cde8bbb831ba5cd602 --- gnu/packages/golang-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 2790e2b5aa..59312f791a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -326,7 +326,7 @@ application's http.Handlers.") (build-system go-build-system) (arguments '(#:import-path "github.com/francoispqt/gojay")) - (propagated-inputs + (native-inputs (list go-github-com-stretchr-testify)) (synopsis "JSON encoder/decoder with powerful stream API for Golang") (description "GoJay is a performant JSON encoder/decoder for Golang. It has -- cgit v1.2.3 From 8e3a60728ab21f60bbc1fbcfacffede5f2aad92e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:19 +0000 Subject: gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-goccy-go-json): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I83fc749483f9f60a05c823e2f792efda0481b505 --- gnu/packages/golang-web.scm | 22 ++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 59312f791a..e92e04979e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Adam Kandur ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -358,6 +359,27 @@ decode/encode structures and slices.") decompose request handling into many smaller layers.") (license license:expat))) +(define-public go-github-com-goccy-go-json + (package + (name "go-github-com-goccy-go-json") + (version "0.9.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/goccy/go-json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/goccy/go-json")) + (home-page "https://github.com/goccy/go-json") + (synopsis "JSON encoder/decoder in Go") + (description "Fast JSON encoder/decoder compatible with encoding/json for Go.") + (license license:expat))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index beb14e0c3f..f601d315af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,28 +4174,6 @@ loading algorithms.") is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) -(define-public go-github-com-goccy-go-json - (package - (name "go-github-com-goccy-go-json") - (version "0.9.10") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/goccy/go-json") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/goccy/go-json")) - (home-page "https://github.com/goccy/go-json") - (synopsis "JSON encoder/decoder in Go") - (description - "Fast JSON encoder/decoder compatible with encoding/json for Go.") - (license license:expat))) - (define-public go-github-com-getsentry-raven-go (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") (revision "0")) -- cgit v1.2.3 From a8378baeb088cc41dc7bb0230b95e8cffbd544fa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:20 +0000 Subject: gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jmespath-go-jmespath): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7f16dd3153ca6fd626061f7da5792192a48041bd --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e92e04979e..9f7b0e39dc 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -704,6 +704,33 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-jmespath-go-jmespath + (package + (name "go-github-com-jmespath-go-jmespath") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmespath/go-jmespath") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jmespath/go-jmespath")) + (native-inputs + (list go-github-com-davecgh-go-spew + go-github-com-pmezard-go-difflib + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/jmespath/go-jmespath") + (synopsis "Golang implementation of JMESPath") + (description + "This package implements JMESPath, a query language for JSON. It +transforms one JSON document into another through a JMESPath expression.") + (license license:asl2.0))) + (define-public go-github-com-julienschmidt-httprouter (package (name "go-github-com-julienschmidt-httprouter") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f601d315af..6add5de065 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8962,33 +8962,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-jmespath-go-jmespath - (package - (name "go-github-com-jmespath-go-jmespath") - (version "0.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jmespath/go-jmespath") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jmespath/go-jmespath")) - (native-inputs - (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib - go-gopkg-in-yaml-v2)) - (home-page "https://github.com/jmespath/go-jmespath") - (synopsis "Golang implementation of JMESPath") - (description - "This package implements JMESPath, a query language for JSON. It -transforms one JSON document into another through a JMESPath expression.") - (license license:asl2.0))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") -- cgit v1.2.3 From 59be3604e3eaae399428ee11043964de0cbdf06a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:21 +0000 Subject: gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-smithy-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I3a4731ae27cc7365c1704cf5a9eab56ca79974a4 --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9f7b0e39dc..c23e6df581 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -104,6 +104,30 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-smithy-go + (package + (name "go-github-com-aws-smithy-go") + (version "1.13.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/smithy-go") + (commit "v1.13.5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/smithy-go")) + (propagated-inputs + (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) + (home-page "https://github.com/aws/smithy-go") + (synopsis "Smithy code generators for Go") + (description + "Package smithy provides the core components for a Smithy SDK.") + (license license:asl2.0))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6add5de065..f2066618f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,30 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-smithy-go - (package - (name "go-github-com-aws-smithy-go") - (version "1.13.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/smithy-go") - (commit "v1.13.5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/smithy-go")) - (propagated-inputs - (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) - (home-page "https://github.com/aws/smithy-go") - (synopsis "Smithy code generators for Go") - (description - "Package smithy provides the core components for a Smithy SDK.") - (license license:asl2.0))) - (define-public go-github-com-aws-aws-sdk-go-v2 (package (name "go-github-com-aws-aws-sdk-go-v2") -- cgit v1.2.3 From a171f12286a96613999c2fe67c65b2c342e545fb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:22 +0000 Subject: gnu: go-github-com-aws-smithy-go: Adjust description. * gnu/packages/golang-web.scm (go-github-com-aws-smithy-go):[description] Add link to Smithy. Change-Id: I3c913db5940dc97fb3fa8874fd8b1bf9baaf4a59 --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c23e6df581..ae9ffd3fd2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -123,7 +123,8 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) (home-page "https://github.com/aws/smithy-go") - (synopsis "Smithy code generators for Go") + (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators +for Go") (description "Package smithy provides the core components for a Smithy SDK.") (license license:asl2.0))) -- cgit v1.2.3 From ae1d9ed08f9c45dd07b4429aebcb3cbd7b90116e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:23 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/version-control.scm: Add (gnu packages golang-web) module. Change-Id: I6e980749d9f9c1373adfc717b0195a1b8c32d6af --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- gnu/packages/version-control.scm | 1 + 3 files changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ae9ffd3fd2..1542c409fe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -104,6 +104,32 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-aws-sdk-go-v2 + (package + (name "go-github-com-aws-aws-sdk-go-v2") + (version "1.17.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go-v2") + (commit "v1.17.3"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go + go-github-com-google-go-cmp-cmp + go-github-com-jmespath-go-jmespath)) + (home-page "https://github.com/aws/aws-sdk-go-v2") + (synopsis "AWS SDK for Go v2") + (description + "Package sdk is the official AWS SDK v2 for the Go programming language.") + (license license:asl2.0))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f2066618f2..2ccbcae7bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,31 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2 - (package - (name "go-github-com-aws-aws-sdk-go-v2") - (version "1.17.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go-v2") - (commit "v1.17.3"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-jmespath-go-jmespath - go-github-com-google-go-cmp-cmp - go-github-com-aws-smithy-go)) - (home-page "https://github.com/aws/aws-sdk-go-v2") - (synopsis "AWS SDK for Go v2") - (description - "Package sdk is the official AWS SDK v2 for the Go programming language.") - (license license:asl2.0))) - (define-public go-github-com-aws-aws-sdk-go-v2-config (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d561fb32e3..40d7a00dae 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -107,6 +107,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) -- cgit v1.2.3 From 31af3c2e3703202803927543a4473d4c0f56e6fc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:24 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic639856afb340c2a7aea6dc917d2bcd32290d1b7 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 28 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1542c409fe..7ecdcbd8b5 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020-2022 Efraim Flashner +;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -104,6 +105,33 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not +;; in use anywhere. Keep it here for the farther review. +(define-public go-github-com-aws-aws-sdk-go + (package + (name "go-github-com-aws-aws-sdk-go") + (version "1.36.18") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) + (build-system go-build-system) + (propagated-inputs + (list go-github-com-jmespath-go-jmespath)) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go" + #:phases %standard-phases)) + (synopsis "The official AWS SDK for the Go programming language") + (description + "The official AWS SDK for the Go programming language.") + (home-page "https://github.com/aws/aws-sdk-go") + (license license:asl2.0))) + (define-public go-github-com-aws-aws-sdk-go-v2 (package (name "go-github-com-aws-aws-sdk-go-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2ccbcae7bf..e32b0f538b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11686,31 +11686,6 @@ pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.") (define-public go-github-com-androiddnsfix (deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix)) -(define-public go-github-com-aws-aws-sdk-go - (package - (name "go-github-com-aws-aws-sdk-go") - (version "1.36.18") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) - (build-system go-build-system) - (propagated-inputs - (list go-github-com-jmespath-go-jmespath)) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go" - #:phases %standard-phases)) - (synopsis "The official AWS SDK for the Go programming language") - (description - "The official AWS SDK for the Go programming language.") - (home-page "https://github.com/aws/aws-sdk-go") - (license license:asl2.0))) - (define-public go-gopkg-in-ini (package (name "go-gopkg-in-ini") -- cgit v1.2.3 From d9246c6b8961cc4fc99cd991a511046bcc212912 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:25 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie775eff088ac4ad0327e2479a63f677ac9c75da2 --- gnu/packages/golang-web.scm | 12 ++++++++++++ gnu/packages/golang.scm | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7ecdcbd8b5..fde9a89ea3 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -158,6 +158,18 @@ the parse trees produced by the html package.") "Package sdk is the official AWS SDK v2 for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-aws-sdk-go-v2-config + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-config") + (version "1.18.5") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/config" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e32b0f538b..cc205a39bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,17 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-config - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-config") - (version "1.18.5") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/config" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-iam (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From 8f22dbde7ea3bf5f4bf83736dd3dd9192269da1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:26 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Id479cc90005de14f0916cb06fa140127812787b1 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index fde9a89ea3..bfda5ffa31 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -170,6 +170,17 @@ the parse trees produced by the html package.") (list go-github-com-google-go-cmp-cmp go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-iam + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-iam") + (version "1.44.161") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cc205a39bf..d74331ad53 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-iam - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-iam") - (version "1.44.161") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-sso (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From d6285224ad7b0baff6b76bb0061ebab7171babdc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:27 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7d9008a277e97adc2b496b11b75d63efd1b839f3 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index bfda5ffa31..5dd73bd4db 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -181,6 +181,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-sso + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-sso") + (version "1.11.27") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d74331ad53..8cdf80712d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-sso - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-sso") - (version "1.11.27") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From 24d16888ab6b4af3436d0bf882b2ffbe0e4551f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:28 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7c1fc41bb4b7ae8b92204e3daee5628602328384 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5dd73bd4db..4bc9c944cb 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -192,6 +192,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc") + (version "1.13.10") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8cdf80712d..8869e3317d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc") - (version "1.13.10") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-sts (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From b344dc44beca7818be87d87aa0bbf0097df90048 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:29 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I3503dbde93a46ff47dcc035243a7f320b7090794 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4bc9c944cb..aadf8ac73e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -203,6 +203,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-sts + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-sts") + (version "1.17.7") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8869e3317d..6331f0d2c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-sts - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-sts") - (version "1.17.7") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-s3 (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From 04bb3c7af6ccb656486e738a87bdc49b0e0eb246 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:30 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-s3): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I11426c93b58f1c0c9c48527621ded345cc4f062b --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index aadf8ac73e..e87634cdaa 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -181,6 +181,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-s3 + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-s3") + (version "1.30.0") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-aws-sdk-go-v2-service-sso (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6331f0d2c7..7350d2ccc5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-s3 - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-s3") - (version "1.30.0") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit v1.2.3 From d0f3a60169ebb2505653afd588aea33ab02e8ca5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:31 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-feature-s3-manager): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia97de141c3c96e99b4824ea93925c5d2b5d9aa8d --- gnu/packages/golang-web.scm | 10 ++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e87634cdaa..616a14fdf1 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -170,6 +170,16 @@ the parse trees produced by the html package.") (list go-github-com-google-go-cmp-cmp go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager") + (version "1.11.44") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-aws-sdk-go-v2-service-iam (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7350d2ccc5..bcc10946b1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager") - (version "1.11.44") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public aws-vault (package (name "aws-vault") -- cgit v1.2.3 From ba8babd9e74ab5692cfccc32f7dbafe9506a5002 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:32 +0000 Subject: gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-nwidger-jsoncolor): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I924581a553c7b59b1be3e274a1845af68b438bcb --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 616a14fdf1..96873f020c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov @@ -934,6 +935,32 @@ router.") (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") (license license:bsd-3))) +(define-public go-github-com-nwidger-jsoncolor + (package + (name "go-github-com-nwidger-jsoncolor") + (version "0.3.0") + (home-page "https://github.com/nwidger/jsoncolor") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/nwidger/jsoncolor")) + (native-inputs + (list go-github-com-fatih-color)) + (synopsis "Colorized JSON marshalling and encoding") + (description + "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s +@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type +which produce colorized output using github.com/fatih/color.") + (license license:expat))) + (define-public go-github-com-opentracing-opentracing-go (package (name "go-github-com-opentracing-opentracing-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index bcc10946b1..9fbe2d5b97 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9049,33 +9049,6 @@ style your output, without you having to deal with all kinds of weird ANSI escape sequences and color conversions.") (license license:expat))) -(define-public go-github-com-nwidger-jsoncolor - (package - (name "go-github-com-nwidger-jsoncolor") - (version "0.3.0") - (home-page "https://github.com/nwidger/jsoncolor") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/nwidger/jsoncolor")) - (native-inputs - (list go-github-com-fatih-color)) - (synopsis "Colorized JSON marshalling and encoding") - (description - "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s -@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type -which produce colorized output using github.com/fatih/color.") - (license license:expat))) - (define-public go-github-com-olekukonko-tablewriter (package (name "go-github-com-olekukonko-tablewriter") -- cgit v1.2.3 From ab7511ad0d29c74e464087e67081cc87836a9c09 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:33 +0000 Subject: gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/networking.scm: Add (gnu packages golang-web) module. * gnu/packages/uucp.scm: As above. Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/networking.scm | 1 + gnu/packages/uucp.scm | 1 + 4 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 96873f020c..4771657add 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan @@ -757,6 +758,29 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-hjson-hjson-go + (package + (name "go-github-com-hjson-hjson-go") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hjson/hjson-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/hjson/hjson-go")) + (home-page "https://hjson.org/") + (synopsis "Human JSON implementation for Go") + (description "Hjson is a syntax extension to JSON. It is intended to be +used like a user interface for humans, to read and edit before passing the +JSON data to the machine.") + (license license:expat))) + (define-public go-github-com-jcmturner-dnsutils-v2 (package (name "go-github-com-jcmturner-dnsutils-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9fbe2d5b97..5505a6c071 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10228,30 +10228,6 @@ additions.") (description "This package is a very simple wrapper around log/syslog") (license license:expat))) -(define-public go-github-com-hjson-hjson-go - (package - (name "go-github-com-hjson-hjson-go") - (version "4.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hjson/hjson-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/hjson/hjson-go")) - (home-page "https://hjson.org/") - (synopsis "Human JSON implementation for Go") - (description "Hjson is a syntax extension to JSON. It is intended to be -used like a user interface for humans, to read and edit before passing the -JSON data to the machine.") - (license license:expat))) - (define-public go-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dad217beb0..c3796f7328 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index e10de59aa2..1626c90c36 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -19,6 +19,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo) #:use-module (guix licenses) #:use-module (guix packages) -- cgit v1.2.3 From 65b1156d2b92bebacef1792615c85140c5ce41a3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:34 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonschema): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iaf68b653f279c98f62ce9e07f2ce010c8e1741e2 --- gnu/packages/golang-web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4771657add..c97dfa7757 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,47 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-xeipuuv-gojsonschema + (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonschema") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonschema") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonschema" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "schema_test.go" + (("\\{\"phase\": \"remote ref, " all) + (string-append "// " all)) + (("\\{\"phase\": \"valid definition" all) + (string-append "// " all)) + (("\\{\"phase\": \"invalid definition" all) + (string-append "// " all))))))))) + (propagated-inputs + (list go-github-com-xeipuuv-gojsonreference + go-github-com-xeipuuv-gojsonpointer + go-github-com-stretchr-testify)) + (home-page "https://github.com/xeipuuv/gojsonschema") + (synopsis "Implementation of JSON Schema for Go") + (description + "This package provides an implementation of JSON Schema for the Go +programming language, which supports draft-04, draft-06 and draft-07.") + (license license:asl2.0)))) + (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5505a6c071..819d0b81b7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12439,46 +12439,6 @@ programming language.") programming language.") (license license:asl2.0)))) -(define-public go-github-com-xeipuuv-gojsonschema - (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonschema") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonschema") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonschema" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* "schema_test.go" - (("\\{\"phase\": \"remote ref, " all) - (string-append "// " all)) - (("\\{\"phase\": \"valid definition" all) - (string-append "// " all)) - (("\\{\"phase\": \"invalid definition" all) - (string-append "// " all))))))))) - (propagated-inputs (list go-github-com-xeipuuv-gojsonreference - go-github-com-xeipuuv-gojsonpointer - go-github-com-stretchr-testify)) - (home-page "https://github.com/xeipuuv/gojsonschema") - (synopsis "Implementation of JSON Schema for Go") - (description - "This package provides an implementation of JSON Schema for the Go -programming language, which supports draft-04, draft-06 and draft-07.") - (license license:asl2.0)))) - (define-public go-github-com-niemeyer-pretty (package (name "go-github-com-niemeyer-pretty") -- cgit v1.2.3 From 1371b119f3678e592c6aa03648df8bcd902dfeed Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:35 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-xeipuuv-gojsonschema): [propagated-inputs]: Move go-github-com-stretchr-testify from here ... [native-inputs]: ... to here. Change-Id: Id865d5821060cd847aeb9ccfc7b7a477e12f7b7b --- gnu/packages/golang-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c97dfa7757..346ca87cc7 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1232,10 +1232,11 @@ replacement for native @code{net/http} module.") (string-append "// " all)) (("\\{\"phase\": \"invalid definition" all) (string-append "// " all))))))))) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-xeipuuv-gojsonreference - go-github-com-xeipuuv-gojsonpointer - go-github-com-stretchr-testify)) + go-github-com-xeipuuv-gojsonpointer)) (home-page "https://github.com/xeipuuv/gojsonschema") (synopsis "Implementation of JSON Schema for Go") (description -- cgit v1.2.3 From 3a3484bf5dd485b0a8ade2deb68368477eabca9c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:36 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonpointer): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I1c77a5a1b0e85fa57578ff29c9e3c403e4d62bc8 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 346ca87cc7..1f9fe0ffca 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,31 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-xeipuuv-gojsonpointer + (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonpointer") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonpointer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonpointer")) + (home-page "https://github.com/xeipuuv/gojsonpointer") + (synopsis "Implementation of JSON Pointer for Go") + (description + "This package provides an implementation of JSON Pointer for the Go +programming language.") + (license license:asl2.0)))) + (define-public go-github-com-xeipuuv-gojsonschema (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 819d0b81b7..31e7871e80 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,31 +12388,6 @@ reflect.DeepEqual but returns a list of differences. This is helpful when comparing complex types like structures and maps.") (license license:expat))) -(define-public go-github-com-xeipuuv-gojsonpointer - (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonpointer") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonpointer") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonpointer")) - (home-page "https://github.com/xeipuuv/gojsonpointer") - (synopsis "Implementation of JSON Pointer for Go") - (description - "This package provides an implementation of JSON Pointer for the Go -programming language.") - (license license:asl2.0)))) - (define-public go-github-com-xeipuuv-gojsonreference (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") (revision "0")) -- cgit v1.2.3 From a249278269e59c955d1a43dd3dce648f56fa7270 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:37 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonreference): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iba8903cba4efa0b806cb19237db3ee51a46646c6 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1f9fe0ffca..7f6ced049c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1227,6 +1227,33 @@ replacement for native @code{net/http} module.") programming language.") (license license:asl2.0)))) +(define-public go-github-com-xeipuuv-gojsonreference + (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonreference") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonreference") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonreference")) + (propagated-inputs + (list go-github-com-xeipuuv-gojsonpointer)) + (home-page "https://github.com/xeipuuv/gojsonreference") + (synopsis "Implementation of JSON Reference for Go") + (description + "This package provides an implementation of JSON Reference for the Go +programming language.") + (license license:asl2.0)))) + (define-public go-github-com-xeipuuv-gojsonschema (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 31e7871e80..17d08a1f40 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,32 +12388,6 @@ reflect.DeepEqual but returns a list of differences. This is helpful when comparing complex types like structures and maps.") (license license:expat))) -(define-public go-github-com-xeipuuv-gojsonreference - (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonreference") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonreference") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonreference")) - (propagated-inputs (list go-github-com-xeipuuv-gojsonpointer)) - (home-page "https://github.com/xeipuuv/gojsonreference") - (synopsis "Implementation of JSON Reference for Go") - (description - "This package provides an implementation of JSON Reference for the Go -programming language.") - (license license:asl2.0)))) - (define-public go-github-com-niemeyer-pretty (package (name "go-github-com-niemeyer-pretty") -- cgit v1.2.3 From 236ae7820e8ee6071975ee880a586a36751ecf13 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:38 +0000 Subject: gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I41d725c82adc3f5571c50bdf6a092e9a310e0f6c --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7f6ced049c..fbfa1049a4 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,31 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-whyrusleeping-json-filter + (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-json-filter") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/json-filter") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/whyrusleeping/json-filter")) + (home-page "https://github.com/whyrusleeping/json-filter") + (synopsis "Library to query JSON objects marshalled into map[string]interface") + (description "A library to query JSON objects marshalled into +@command{map[string]interface{}}.") + (license license:expat)))) + (define-public go-github-com-xeipuuv-gojsonpointer (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 17d08a1f40..add75b11d2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6671,32 +6671,6 @@ anchor names.") (description "This package provides unified and context-aware diffs in Go.") (license license:bsd-3))) -(define-public go-github-com-whyrusleeping-json-filter - (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") - (revision "0")) - (package - (name "go-github-com-whyrusleeping-json-filter") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/whyrusleeping/json-filter") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7")))) - (build-system go-build-system) - (arguments - '(#:import-path - "github.com/whyrusleeping/json-filter")) - (home-page "https://github.com/whyrusleeping/json-filter") - (synopsis "Library to query JSON objects marshalled into map[string]interface") - (description "A library to query JSON objects marshalled into -@command{map[string]interface{}}.") - (license license:expat)))) - (define-public go-github-com-whyrusleeping-progmeter (let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04") (revision "0")) -- cgit v1.2.3 From bd0898a9cce91e9db742800b98cde15d722510d3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:40 +0000 Subject: gnu: go-github-com-google-go-github: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-google-go-github): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I17711a8f0bfd58a12cf805f1678688d2946c985b --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index fbfa1049a4..20c3b0f3e1 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -538,6 +538,32 @@ decompose request handling into many smaller layers.") (description "Fast JSON encoder/decoder compatible with encoding/json for Go.") (license license:expat))) +(define-public go-github-com-google-go-github + (package + (name "go-github-com-google-go-github") + (version "26.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-github") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi")))) + (build-system go-build-system) + (arguments + `(#:tests? #f ;application/octet-stream instead of text/plain + #:import-path "github.com/google/go-github/v26/github" + #:unpack-path "github.com/google/go-github/v26")) + (native-inputs + (list go-github-com-google-go-querystring go-golang-org-x-crypto)) + (home-page "https://github.com/google/go-github/") + (synopsis "Client library for accessing the GitHub API v3") + (description "@code{go-github} is a Go client library for accessing the +GitHub API v3.") + (license license:bsd-3))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index add75b11d2..0d83c2b270 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7987,32 +7987,6 @@ and from termios translations, readCh, reading passwords, etc.") into URL query parameters.") (license license:bsd-3)))) -(define-public go-github-com-google-go-github - (package - (name "go-github-com-google-go-github") - (version "26.1.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-github") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi")))) - (build-system go-build-system) - (arguments - `(#:tests? #f ;application/octet-stream instead of text/plain - #:import-path "github.com/google/go-github/v26/github" - #:unpack-path "github.com/google/go-github/v26")) - (native-inputs - (list go-github-com-google-go-querystring go-golang-org-x-crypto)) - (home-page "https://github.com/google/go-github/") - (synopsis "Client library for accessing the GitHub API v3") - (description "@code{go-github} is a Go client library for accessing the -GitHub API v3.") - (license license:bsd-3))) - (define-public go-github-com-google-renameio (package (name "go-github-com-google-renameio") -- cgit v1.2.3 From 972c1245c6e7595bd26a2ca279c750d2ccd76e1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:41 +0000 Subject: gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-cloud-google-com-go-compute-metadata): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/mail.scm: Add (gnu packages golang-web) module. Change-Id: Ic97e5f4afd26376d37860fbb4758e8037e758f58 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- gnu/packages/mail.scm | 1 + 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 20c3b0f3e1..c046e0d46a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -55,6 +56,32 @@ ;;; ;;; Code: +(define-public go-cloud-google-com-go-compute-metadata + (package + (name "go-cloud-google-com-go-compute-metadata") + (version "0.81.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googleapis/google-cloud-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "cloud.google.com/go" + #:import-path "cloud.google.com/go/compute/metadata")) + (home-page + "https://pkg.go.dev/cloud.google.com/go/compute/metadata") + (synopsis + "Go wrapper for Google Compute Engine metadata service") + (description + "This package provides access to Google Compute Engine (GCE) metadata and +API service accounts for Go.") + (license license:asl2.0))) + (define-public go-github-com-andybalholm-cascadia (package (name "go-github-com-andybalholm-cascadia") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0d83c2b270..0fbc031c67 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4437,33 +4437,6 @@ absolute \"path\" to it.") (description "Semver is a library for Semantic versioning written in Go.") (license license:expat)))) -(define-public go-cloud-google-com-go-compute-metadata - (package - (name "go-cloud-google-com-go-compute-metadata") - (version "0.81.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/googleapis/google-cloud-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3")))) - (build-system go-build-system) - (arguments - '(#:unpack-path "cloud.google.com/go" - #:import-path "cloud.google.com/go/compute/metadata")) - (home-page - "https://pkg.go.dev/cloud.google.com/go/compute/metadata") - (synopsis - "Go wrapper for Google Compute Engine metadata service") - (description - "This package provides access to Google Compute Engine (GCE) metadata and -API service accounts for Go.") - (license license:asl2.0))) - (define-public go-github-com-google-cadvisor (let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd") (revision "0")) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 523c20c4a9..4466e5e6d9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -109,6 +109,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) -- cgit v1.2.3 From ea94cb36d6568491a75dbd783dd1bb691821b8a5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:42 +0000 Subject: gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-getsentry-raven-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: If7e155b3e85d8bda8fd099f6a4d1eb6b87e9eee3 --- gnu/packages/golang-web.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 31 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c046e0d46a..41c8c37a0b 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen @@ -45,6 +46,7 @@ #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages tls) #:use-module (gnu packages web)) ;;; Commentary: @@ -521,6 +523,35 @@ decode/encode structures and slices.") (home-page "https://github.com/francoispqt/gojay") (license license:expat))) +;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is +;; now read-only. The raven-go SDK is no longer maintained and was superseded +;; by the sentry-go +(define-public go-github-com-getsentry-raven-go + (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") + (revision "0")) + (package + (name "go-github-com-getsentry-raven-go") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/getsentry/raven-go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/getsentry/raven-go")) + (propagated-inputs + (list go-github-com-certifi-gocertifi go-github-com-pkg-errors)) + (home-page "https://github.com/getsentry/raven-go") + (synopsis "Sentry client in Go") + (description "This package is a Go client API for the Sentry event/error +logging system.") + (license license:bsd-3)))) + (define-public go-github-com-go-chi-chi-v5 (package (name "go-github-com-go-chi-chi-v5") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0fbc031c67..dcf7fcc2a8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,33 +4174,6 @@ loading algorithms.") is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) -(define-public go-github-com-getsentry-raven-go - (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") - (revision "0")) - (package - (name "go-github-com-getsentry-raven-go") - (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/getsentry/raven-go") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/getsentry/raven-go")) - (propagated-inputs - (list go-github-com-certifi-gocertifi go-github-com-pkg-errors)) - (home-page "https://github.com/getsentry/raven-go") - (synopsis "Sentry client in Go") - (description "This package is a Go client API for the Sentry event/error -logging system.") - (license license:bsd-3)))) - (define-public go-github-com-hashicorp-go-uuid (package (name "go-github-com-hashicorp-go-uuid") -- cgit v1.2.3 From d041bf2bb058bceab3832b464aa49aa6c1c5d861 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:43 +0000 Subject: gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia631773394faaff150c18b074c943565f6998e1f --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 41c8c37a0b..7759916c35 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -575,6 +575,31 @@ logging system.") decompose request handling into many smaller layers.") (license license:expat))) +(define-public go-github-com-go-telegram-bot-api-telegram-bot-api + (package + (name "go-github-com-go-telegram-bot-api-telegram-bot-api") + (version "4.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-telegram-bot-api/telegram-bot-api") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w")))) + (build-system go-build-system) + (home-page "https://go-telegram-bot-api.dev/") + (arguments + (list #:tests? #f ; Upstream tests are broken. + #:import-path "github.com/go-telegram-bot-api/telegram-bot-api")) + (propagated-inputs + (list go-github-com-technoweenie-multipartstreamer)) + (synopsis "Golang bindings for the Telegram Bot API") + (description + "This package provides Golang bindings for the Telegram Bot API.") + (license license:expat))) + (define-public go-github-com-goccy-go-json (package (name "go-github-com-goccy-go-json") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dcf7fcc2a8..4ee41f671d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10236,31 +10236,6 @@ modifying them.") parsers, and related tools.") (license license:expat)))) -(define-public go-github-com-go-telegram-bot-api-telegram-bot-api - (package - (name "go-github-com-go-telegram-bot-api-telegram-bot-api") - (version "4.6.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-telegram-bot-api/telegram-bot-api") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w")))) - (build-system go-build-system) - (home-page "https://go-telegram-bot-api.dev/") - (arguments - (list #:tests? #f ; Upstream tests are broken. - #:import-path "github.com/go-telegram-bot-api/telegram-bot-api")) - (propagated-inputs - (list go-github-com-technoweenie-multipartstreamer)) - (synopsis "Golang bindings for the Telegram Bot API") - (description - "This package provides Golang bindings for the Telegram Bot API.") - (license license:expat))) - (define-public go-github.com-ulikunitz-xz (package (name "go-github.com-ulikunitz-xz") -- cgit v1.2.3 From 7b0863f07a113caef26fea13909bd97d250b629e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:44 +0000 Subject: gnu: actionlint: Update to 1.6.26. * gnu/packages/check.scm (actionlint): Update to 1.6.26. [inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron * gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable. Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437 --- gnu/packages/check.scm | 8 ++++---- gnu/packages/golang.scm | 18 ------------------ 2 files changed, 4 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5181d3a164..80e0b94d01 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022, 2023 David Elsing -;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo ;;; Copyright © 2023 Timo Wilken @@ -1069,7 +1069,7 @@ but it works for any C/C++ project.") (define-public actionlint (package (name "actionlint") - (version "1.6.23") + (version "1.6.26") (source (origin (method git-fetch) (uri (git-reference @@ -1078,7 +1078,7 @@ but it works for any C/C++ project.") (file-name (git-file-name name version)) (sha256 (base32 - "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni")))) + "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04")))) (build-system go-build-system) (arguments '(#:import-path "github.com/rhysd/actionlint/cmd/actionlint" @@ -1087,7 +1087,7 @@ but it works for any C/C++ project.") (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-github-com-robfig-cron go-golang.org-x-sync-errgroup go-golang.org-x-sync-semaphore go-gopkg-in-yaml-v3)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4ee41f671d..36e2c4b23e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7454,24 +7454,6 @@ and aid debugging.") a cron spec parser and job runner.") (license license:expat))) -;; 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 go-github-com-shirou-gopsutil (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") (revision "0")) -- cgit v1.2.3 From ed27cf313acce22dcaef945d170be84d1dbf3040 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Wed, 20 Dec 2023 19:22:49 +0100 Subject: gnu: icecat-minimal: Fix dependency to libcanberra. * gnu/packages/gnuzilla.scm (icecat-minimal)[arguments]: Add 'libcanberra/lib/gtk-3.0/modules' to LD_LIBRARY_PATH in the 'wrap-program' phase. This fixes these messages on Icecat startup: Gtk-Message: 13:05:56.635: Failed to load module "canberra-gtk-module" Gtk-Message: 13:05:56.636: Failed to load module "canberra-gtk-module" Change-Id: I508dbf0a8133634c329c4c1ff20088752311ff91 --- gnu/packages/gnuzilla.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 54643c314e..bf9bf34e3a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1091,18 +1091,22 @@ variable defined below. It requires guile-json to be installed." (let* ((lib (string-append #$output "/lib")) (gtk #$(this-package-input "gtk+")) (gtk-share (string-append gtk "/share")) - (ld-libs '#$(map (lambda (label) - (file-append (this-package-input label) "/lib")) - '("libpng-apng" - "libxscrnsaver" - "mesa" - "pciutils" - "mit-krb5" - "eudev" - "pulseaudio" - ;; For the integration of native notifications - ;; (same reason as icedove) - "libnotify")))) + (ld-libs '#$(cons + (file-append + (this-package-input "libcanberra") + "/lib/gtk-3.0/modules") + (map (lambda (label) + (file-append (this-package-input label) "/lib")) + '("libpng-apng" + "libxscrnsaver" + "mesa" + "pciutils" + "mit-krb5" + "eudev" + "pulseaudio" + ;; For the integration of native notifications + ;; (same reason as icedove) + "libnotify"))))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) ;; The following line is commented out because the icecat -- cgit v1.2.3 From d66b19009680a529194b7bdef365b5ca99d9562c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Jan 2024 10:22:25 +0100 Subject: gnu: txr: Update to 293. * gnu/packages/lisp.scm (txr): Update to 293. Change-Id: Ife084219385e11f87b26b59f584c9c0a8c9a323c --- 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 afd50bf46a..4a895984e7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -999,7 +999,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "292") + (version "293") (source (origin (method git-fetch) @@ -1008,7 +1008,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0lly446pinfrr5d4rgsas8c7kqal2g03bbsbmn0yvhvazb39c15g")))) + (base32 "1b3vhlnw4ymznnlh9d71qhkcdc1p69a53hilckc3rql9y4jsik57")))) (build-system gnu-build-system) (arguments (list #:configure-flags -- cgit v1.2.3 From 6efd7b1bcd333c208c786fc7121a3a18a0ff0c0a Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:00:35 +0000 Subject: gnu: cl-try: Update to 0.0.1-2.cf2a888. * gnu/packages/lisp-check.scm (sbcl-try): Update to 0.0.1-2.cf2a888. Change-Id: Iaa21e7ab9baf362c58b03f28513796abd59f0099 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 5f5e39c193..cbaef71b87 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -1038,8 +1038,8 @@ interactive development.") (sbcl-package->ecl-package sbcl-stefil)) (define-public sbcl-try - (let ((commit "a1fffad2ca328b3855f629b633ab1daaeec929c2") - (revision "1")) + (let ((commit "cf2a8887d091bf297b72ef69e15012e7e849ba3b") + (revision "2")) (package (name "sbcl-try") (version (git-version "0.0.1" revision commit)) @@ -1051,7 +1051,7 @@ interactive development.") (commit commit))) (file-name (git-file-name "cl-try" version)) (sha256 - (base32 "03dm2i2y4wiyzz9d25zdxm6gdglnvwali0ylp0rfwpk6wf29sj09")))) + (base32 "166i3fqwxfv9skz6yf95c95nx0jjqy1ak1131bd0sqmd582gi9mg")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-cl-ppcre)) -- cgit v1.2.3 From 0fd2cb26329805ffba0df20bd96ee3673b8c3443 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:22:45 +0000 Subject: gnu: cl-shasht: Update to 0.1-2.27ba0a8. * gnu/packages/lisp-xyz.scm (sbcl-shasht): Update to 0.1-2.27ba0a8. [inputs]: Add sbcl-closer-mop. Change-Id: I7e7e534d5234158993c9f452d2c5107ce1d9dee9 Signed-off-by: Guillaume Le Vaillant --- 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 1625197550..514b1fe2b8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20785,25 +20785,25 @@ all kind of typesetting applications.") (sbcl-package->cl-source-package sbcl-cl-typesetting)) (define-public sbcl-shasht - (let ((commit "4055327ef8e2aaa8627892ab256350ff3cb15e3c") - (revision "1")) + (let ((commit "27ba0a8842e103f2d575b3c8bbcfc19bd172d9ea") + (revision "2")) (package (name "sbcl-shasht") - (version (git-version "0.1.0" revision commit)) + (version (git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/yitzchak/shasht") (commit commit))) - (file-name (git-file-name "shasht" version)) + (file-name (git-file-name "cl-shasht" version)) (sha256 - (base32 "01mh20s5gj0lajq45anxji77ykq1wcg72mn1y9a1k8i7q1ainjlr")))) + (base32 "1y7qh8kdhk06243vkmxzdk0y9rax4g8pv28bd01j48ix777mpcdc")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-alexandria sbcl-parachute)) (inputs - (list sbcl-trivial-do)) + (list sbcl-closer-mop sbcl-trivial-do)) (home-page "https://yitzchak.github.io/shasht/") (synopsis "Common Lisp JSON reading and writing library") (description -- cgit v1.2.3 From e7f336b2e8fb27f1c63bc3267d5dc68a036159c7 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:32:46 +0000 Subject: gnu: cl-trivial-benchmark: Update to 2.0.0-2.1fbc8d1. * gnu/packages/lisp-xyz.scm (sbcl-trivial-benchmark): Update to 2.0.0-2.1fbc8d1. Change-Id: I1b9e14ac071ce35b2f2e33220f199481578a07c5 Signed-off-by: Guillaume Le Vaillant --- 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 514b1fe2b8..78cb98a4e4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17455,19 +17455,20 @@ the @command{flamegraph.pl} script, which is available in the Guix package (sbcl-package->cl-source-package sbcl-flamegraph)) (define-public sbcl-trivial-benchmark - (let ((commit "42d76733dd2e873471c6f1e27d39113293f7dd5c")) + (let ((commit "1fbc8d15f09ed8aa426bc73956b8b7c9b2668802") + (revision "2")) (package (name "sbcl-trivial-benchmark") - (version (git-version "2.0.0" "1" commit)) + (version (git-version "2.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Shinmera/trivial-benchmark/") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-trivial-benchmark" version)) (sha256 - (base32 "0fbzqbpm2ixz85555krl36kbbbjyn699vdj6k383khi3g9y629fa")))) + (base32 "1p48wgpady0n8frdcgp7sbg93b0fbvpx1qk5valmanhwr9j3xh88")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria)) -- cgit v1.2.3 From d4644e8f9a6456d90a290ba9c44ee104f5986d6d Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:37:35 +0000 Subject: gnu: cl-one-more-re-nightmare: Update to 0.0.0-1.5b0b02e. * gnu/packages/lisp-xyz.scm (sbcl-one-more-re-nightmare): Update to 0.0.0-1.5b0b02e. Change-Id: I4e280f9639f8696d9eaeeb1cd43237938390da5f 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 78cb98a4e4..52c7d4b345 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1510,8 +1510,8 @@ compatible with ANSI-compliant Common Lisp implementations.") (sbcl-package->ecl-package sbcl-cl-ppcre)) (define-public sbcl-one-more-re-nightmare - (let ((commit "09c33feed35797512bf123ccca053cf8ba42bfbd") - (revision "0")) + (let ((commit "5b0b02e59f90964baf5737abd13300fa82f27667") + (revision "1")) (package (name "sbcl-one-more-re-nightmare") (version (git-version "0.0.0" revision commit)) @@ -1523,7 +1523,7 @@ compatible with ANSI-compliant Common Lisp implementations.") (commit commit))) (file-name (git-file-name "cl-one-more-re-nightmare" version)) (sha256 - (base32 "0vc0lxvn3anjb63hr26r1l18aw5nbj80w9ja3a32fip6nbwfsrfv")))) + (base32 "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn")))) (build-system asdf-build-system/sbcl) (arguments '(#:asd-test-systems '("one-more-re-nightmare-tests") -- cgit v1.2.3 From f12b4606caa2b6e4c167271e2626e57acddf62bd Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:40:35 +0000 Subject: gnu: cl-osicat: Update to 0.7.0-4.9823279. * gnu/packages/lisp-xyz.scm (sbcl-osicat): Update to 0.7.0-4.9823279. Change-Id: I800e00342c6f5d596899280b4d297e1465cd6f3a 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 52c7d4b345..52fdf211b4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13990,8 +13990,8 @@ MOP easier to use.") '(#:tests? #f))))) (define-public sbcl-osicat - (let ((commit "a45eb3b5826e9175f7c94ba97a00d6b4932f3163") - (revision "3")) + (let ((commit "982327905b8980ff3173344ca87282e046565732") + (revision "4")) (package (name "sbcl-osicat") (version (git-version "0.7.0" revision commit)) @@ -14004,7 +14004,7 @@ MOP easier to use.") (commit commit))) (file-name (git-file-name "cl-osicat" version)) (sha256 - (base32 "1ilag0b0xn97acc0m1q93vwp2y3md9a586858zfx04d8wpbvk8sz")) + (base32 "10q1dfkhrvp5ia860q10y4wdm11fmxf7xv8zl4viz2np9xzf5v22")) (snippet '(begin ;; The useless release.sh drags `bash' into the closure. -- cgit v1.2.3 From 1eccfd2b01cf5d257a9861c291553d8d5d0fb65a Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:43:44 +0000 Subject: gnu: cl-esrap: Update to 0.18-4.d806138. * gnu/packages/lisp-xyz.scm (sbcl-esrap): Update to 0.18-4.d806138. Change-Id: I6ed3edf813bdbb4a7dd88a0345b2c02ec61df20b Signed-off-by: Guillaume Le Vaillant --- 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 52fdf211b4..0d62f4f7fd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3152,8 +3152,8 @@ Lisp.") (sbcl-package->ecl-package sbcl-calm)) (define-public sbcl-esrap - (let ((commit "4c82a863871e117f0041b9ef37e61c0b62318aa7") - (revision "3")) + (let ((commit "d806138342a6b27327649fd5f36e0fe2e0966867") + (revision "4")) (package (name "sbcl-esrap") (version (git-version "0.18" revision commit)) @@ -3163,9 +3163,9 @@ Lisp.") (uri (git-reference (url "https://github.com/scymtym/esrap") (commit commit))) + (file-name (git-file-name "cl-esrap" version)) (sha256 - (base32 "16nc3rhxd61xabja1h9akqqva0cmz2gxk0bkaqy10h492wx93d81")) - (file-name (git-file-name "cl-esrap" version)))) + (base32 "0gs0mfamldhaihnlk0qxg2q4bl8bamq68dif9js9fkl8apg3iykl")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam)) -- cgit v1.2.3 From cf51be825d8a5894ea36553b113ebc9dd8e5788f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:36:29 +0100 Subject: gnu: emacs-eglot: Update to 1.16. * gnu/packages/emacs-xyz.scm (emacs-eglot): Update to 1.16. Change-Id: I064f5f47f5405a84838314c66095abb230cb7df7 --- 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 bb3c905252..bbc2890286 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19496,7 +19496,7 @@ Emacs.") (define-public emacs-eglot (package (name "emacs-eglot") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) @@ -19504,7 +19504,7 @@ Emacs.") ".tar")) (sha256 (base32 - "05brq76xbdkbhbn572n0hyz80lwc3ly5waaqsaan5l1apxgl6ww7")))) + "0zi2r8fp7acqlx8s4k2m9dc8w29bwsxyvfa6cnd1366nm3rlfybn")))) (build-system emacs-build-system) (propagated-inputs (list emacs-external-completion -- cgit v1.2.3 From 60cba2c9bc6afe0b62d01df555df0bcafc826893 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:37:19 +0100 Subject: gnu: emacs-vundo: Update to 2.2.0. * gnu/packages/emacs-xyz.scm (emacs-vundo): Update to 2.2.0. Change-Id: I5eef536684e98e53d49229442264ac8757dc5513 --- 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 bbc2890286..b082d8b043 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38450,14 +38450,14 @@ projects.") (define-public emacs-vundo (package (name "emacs-vundo") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/vundo-" version ".tar")) (sha256 (base32 - "1inm6kvh5j47nsrmq6wpf30dqmx0arzdpa6vdcn834g50i4fh8kc")))) + "1vb5mq51krpcaw741dai3b9s12yicn73l1bqql41gylpanca83py")))) (build-system emacs-build-system) (home-page "https://github.com/casouri/vundo") (synopsis "Visualize the undo tree") -- cgit v1.2.3 From 9470fd9cd830f7e9e16ea38e822693d00ace1054 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:37:26 +0100 Subject: gnu: emacs-vertico-posframe: Update to 0.7.6. * gnu/packages/emacs-xyz.scm (emacs-vertico-posframe): Update to 0.7.6. Change-Id: I9cb71efe2a2e0d108778d49efb87b7da74753399 --- 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 b082d8b043..e437789c8b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38904,7 +38904,7 @@ in Emacs.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) (uri (string-append @@ -38912,7 +38912,7 @@ in Emacs.") ".tar")) (sha256 (base32 - "1fa8kg5lqpa1xk2vf1mp420iqki866gd83vzsj166b8mnd34fdlr")))) + "15d7j37rmmg021mciwibcfmdwjn2694ljlh4sj03m1j4gj7igfqd")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (home-page "https://github.com/tumashu/vertico-posframe") -- cgit v1.2.3 From 85d742aa12cd88c90c9514c34829995e33a1ba65 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:38:18 +0100 Subject: gnu: emacs-super-save: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-super-save): Update to 0.4.0. Change-Id: I88a8ff0267362ea5f8f8075be4c0020bf51b4f02 --- 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 e437789c8b..8d8f0a6b4b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33595,7 +33595,7 @@ passphrase until the first time you push to a remote.") (define-public emacs-super-save (package (name "emacs-super-save") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -33605,7 +33605,7 @@ passphrase until the first time you push to a remote.") (file-name (git-file-name name version)) (sha256 (base32 - "066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l")))) + "1nypbklgfxyrp55f0dazg9hm7gkqibijd6k4nlb0b0f1rhcm989b")))) (build-system emacs-build-system) (home-page "https://github.com/bbatsov/super-save") (synopsis "Auto-save buffers, based on your activity") -- cgit v1.2.3 From 2e8dba6c6c888f964e61d78188b958445920fad8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:39:03 +0100 Subject: gnu: emacs-sqlite3-api: Update to 0.18. * gnu/packages/emacs-xyz.scm (emacs-sqlite3-api): Update to 0.18. Change-Id: I75d0fb063c1684e2f69ce3904561f6dae17f3344 --- 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 8d8f0a6b4b..acb9b1e57e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8102,7 +8102,7 @@ It is not intended as a user interface.") (define-public emacs-sqlite3-api (package (name "emacs-sqlite3-api") - (version "0.17") + (version "0.18") (source (origin (method git-fetch) (uri (git-reference @@ -8111,7 +8111,7 @@ It is not intended as a user interface.") (file-name (git-file-name name version)) (sha256 (base32 - "1y36818nd47mzfi3xcp31nr8n0izzmdyiqfx9hgp7ag98rbm7wlx")))) + "1d1r65ybcf5idbs8sv0l3dna4l1wy3jba9dvv1kkz7zj6qhr48fs")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 2b8317dad6db17811bb73ea694de82473c27884d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:39:54 +0100 Subject: gnu: emacs-solarized-theme: Update to 2.0.4. * gnu/packages/emacs-xyz.scm (emacs-solarized-theme): Update to 2.0.4. Change-Id: I70c14db16bdb0c5a892199793a77abe8401c7c67 --- 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 acb9b1e57e..00e68edbcf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11321,7 +11321,7 @@ variants.") (define-public emacs-solarized-theme (package (name "emacs-solarized-theme") - (version "2.0.3") + (version "2.0.4") (source (origin (method git-fetch) @@ -11330,7 +11330,7 @@ variants.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mip5da7glzylmagxkmi2f68i19phbbzn72vh3jd3w76labcvbzm")))) + (base32 "18z36nzyh4dsd8igys37x0r3lnav77fvjrkxv48v3yjsrwli19gl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit v1.2.3 From be8ce8a82505bf7dc9db63e6191eedf5003d169a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:41:31 +0100 Subject: gnu: emacs-robot-mode: Update to 0.8.0. * gnu/packages/emacs-xyz.scm (emacs-robot-mode): Update to 0.8.0. Change-Id: Ic7960db086e712a410c58a613c343dad4c7ca392 --- 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 00e68edbcf..2ab766dec8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7841,16 +7841,16 @@ method and constant name completion.") (define-public emacs-robot-mode (package (name "emacs-robot-mode") - (version "0.7.0") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/kopoli/robot-mode") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10i4lwjf60ms3dj8s7k9c0vb24rhszskhciz9lijphcdh8k622hz")))) + (base32 "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa")))) (build-system emacs-build-system) (home-page "https://github.com/kopoli/robot-mode") (synopsis "Emacs mode for Robot Framework") -- cgit v1.2.3 From 7597ca5806b26ddb4a02a9321b54cf64d6eb0372 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:42:42 +0100 Subject: gnu: emacs-plz: Update to 0.7.1. * gnu/packages/emacs-xyz.scm (emacs-plz): Update to 0.7.1. Change-Id: I8fc92e8f1376cf951cf104caee84103296fa5e82 --- 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 2ab766dec8..d1a12418e0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20398,7 +20398,7 @@ multiplexer.") (define-public emacs-plz (package (name "emacs-plz") - (version "0.7") + (version "0.7.1") (source (origin (method git-fetch) @@ -20407,7 +20407,7 @@ multiplexer.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18lq7v2gglfnax5r1svh9p0fcd5hs745js57nl8bk58ba047a9q8")))) + (base32 "0x2yhkdagwdqzjkaq54l095m3zvn49dg8y47wg27qdb5m2cjnswr")))) (build-system emacs-build-system) (inputs (list curl)) (arguments -- cgit v1.2.3 From f6fb1bbe2f86b10769eae4db5aa455ae80d627b5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:44:21 +0100 Subject: gnu: emacs-org-sidebar: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-org-sidebar): Update to 0.4. Change-Id: I1f1cb12a801f4fda59c060b1ca64616b8e170251 --- 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 d1a12418e0..cdddc727ca 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11131,7 +11131,7 @@ started with 20 minutes. All values are customizable.") (define-public emacs-org-sidebar (package (name "emacs-org-sidebar") - (version "0.3.2") + (version "0.4") (source (origin (method git-fetch) @@ -11140,7 +11140,7 @@ started with 20 minutes. All values are customizable.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1r8kp954ciin4j7j7j8ihdkryf5x09s3ryl7bi9h2j6xqc1ij4wq")))) + (base32 "1gccih9wgi31m59flljw4cphfyhlfcqbjih91gkcnldq5z7n83nj")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash emacs-org-super-agenda emacs-org emacs-org-ql -- cgit v1.2.3 From 69e59613dcd1b9f11020b8a1c3b05e3acb8b5992 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:45:12 +0100 Subject: gnu: emacs-org-sidebar: Improve package style. * gnu/packages/emacs-xyz.scm (emacs-org-sidebar)[propagated-inputs]: Re-order inputs alphabetically. Change-Id: I724c97f5235c3b7315d26a66e23114116b28f9d4 --- gnu/packages/emacs-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cdddc727ca..f2eb41fd4f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11143,7 +11143,10 @@ started with 20 minutes. All values are customizable.") (base32 "1gccih9wgi31m59flljw4cphfyhlfcqbjih91gkcnldq5z7n83nj")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-dash emacs-org-super-agenda emacs-org emacs-org-ql + (list emacs-dash + emacs-org + emacs-org-ql + emacs-org-super-agenda emacs-s)) (home-page "https://github.com/alphapapa/org-sidebar") (synopsis "Helpful sidebar for Org buffers") -- cgit v1.2.3 From 49eef61db5969f9fc9beb807c910defc89be222e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:46:37 +0100 Subject: gnu: emacs-org-re-reveal: Update to 3.25.0. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.25.0. Change-Id: Id3e3acaae62a4434c7a8354ae5d944268f8344f3 --- 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 f2eb41fd4f..0ec6a8f1ec 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24783,7 +24783,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.24.2") + (version "3.25.0") (source (origin (method git-fetch) @@ -24792,7 +24792,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "10x1cinn97wlm3dmv35dxrs78gfzgw59qf4j57m3vgss5q93mqq5")))) + (base32 "13q45c2a4y6pkaiixf931j4rq6sfpklxx854xwadik4a3mm06ipi")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit v1.2.3 From 00442d15c2109539e1e29413c28b72ea756216a6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:48:43 +0100 Subject: gnu: emacs-org-fc: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-org-fc): Update to 0.3.0. Change-Id: Iabf440ee97cfbb665c6d38a169c5526149a4e699 --- gnu/packages/emacs-xyz.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ec6a8f1ec..3b3f4e2c55 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4771,20 +4771,18 @@ that the binary uses instead of the actual binary contents.") (license license:gpl3+))) (define-public emacs-org-fc - (let ((commit "f64b5336485a42be91cfe77850c02a41575f5984") - (revision "0")) - (package + (package (name "emacs-org-fc") - (version (git-version "0.1.0" revision commit)) + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://git.sr.ht/~l3kn/org-fc") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1d0a3vr09zkplclypcgpfbfd6r0h0i3g3zsqb4pcz6x239d59gd5")))) + (base32 "17cdn4sdyb9fs9w725l155lb74inzdn86m8y62m6hn4dgb5l4spm")))) (build-system emacs-build-system) (arguments (list @@ -4819,7 +4817,7 @@ It allows you to mark headlines in a file as flashcards, turning pieces of knowledge you want to learn into a question-answer test. These cards are reviewed at regular interval. After each review, the next review interval is calculated based on how well you remembered the contents of the card.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-font-lock+ (let ((commit "aa1c82d05c9222b09099a0ccd7468e955497940c") -- cgit v1.2.3 From 0370998826fc9160410d526916bcdc39b5a06302 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:49:40 +0100 Subject: gnu: emacs-helm-company: Update to 0.2.8. * gnu/packages/emacs-xyz.scm (emacs-helm-company): Update to 0.2.8. Change-Id: I92ee5a5f91ee2c4480231eb5cc3da1e85c53488c --- 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 3b3f4e2c55..3f005e6db7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26707,7 +26707,7 @@ tracking.") (define-public emacs-helm-company (package (name "emacs-helm-company") - (version "0.2.7") + (version "0.2.8") (source (origin (method git-fetch) @@ -26717,7 +26717,7 @@ tracking.") (file-name (git-file-name name version)) (sha256 (base32 - "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338")))) + "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05")))) (build-system emacs-build-system) (propagated-inputs (list emacs-helm emacs-company)) -- cgit v1.2.3 From 7cf95dc5f419fbcf2d46dc870b12775ba5a60911 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:54:17 +0100 Subject: gnu: emacs-exwm-firefox: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-exwm-firefox): Update to 1.2. [arguments]: Add a phase to enter "lisp" sub-directory. Change-Id: Ia349cd008073f8de3d9ea6089fd54ba16edbb29c --- gnu/packages/emacs-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3f005e6db7..45f0a47493 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31363,11 +31363,10 @@ keypresses mapped in firefox to the action described in the function name.") (license (list license:gpl3+))))) (define-public emacs-exwm-firefox - (let ((commit "7390c3bc425894aeda3c12c23f61a234bb71a2d9") - (revision "1")) + (let ((commit "ba4044cf57f99656bbe1974278336b6abcb15497")) ;version bump (package (name "emacs-exwm-firefox") - (version (git-version "0.4" revision commit)) + (version "1.2") (source (origin (method git-fetch) @@ -31376,8 +31375,13 @@ keypresses mapped in firefox to the action described in the function name.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xmgij04h4cbcgqafyyf9qajf0wp6mxpfpwjm6gi1jgisrql882d")))) + (base32 "1x9hc94a5wygyw714q98jbk4kjvys2ra94qdc2cbgkm6iq982rvq")))) (build-system emacs-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) (inputs (list emacs-exwm-firefox-core emacs-s emacs-exwm)) (home-page "https://codeberg.org/emacs-weirdware/exwm-firefox") (synopsis "Enhanced support for Firefox under EXWM") -- cgit v1.2.3 From 91c4b76ad22f8732da0be21171b540a0652b8b96 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 11:57:17 +0100 Subject: gnu: emacs-exwm-firefox: Improve package style. * gnu/packages/emacs-xyz.scm (emacs-exwm-firefox)[inputs]: Re-order inputs alphabetically. Change-Id: Ide39e4d98434decb15b3e2f81fbeb547ad91c88e --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 45f0a47493..a7bee76961 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31382,7 +31382,7 @@ keypresses mapped in firefox to the action described in the function name.") #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "lisp")))))) - (inputs (list emacs-exwm-firefox-core emacs-s emacs-exwm)) + (inputs (list emacs-exwm emacs-exwm-firefox-core emacs-s)) (home-page "https://codeberg.org/emacs-weirdware/exwm-firefox") (synopsis "Enhanced support for Firefox under EXWM") (description -- cgit v1.2.3 From 8af16af043e0f9c9fff89ce5e6ecf0def8d191ed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 12:05:00 +0100 Subject: gnu: emacs-exwm-firefox: Run tests. * gnu/packages/emacs-xyz.scm (emacs-exwm-firefox)[arguments]: Run tests. Change-Id: I2efb314e899903f5047f65aad4dbbf78560bac64 --- gnu/packages/emacs-xyz.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a7bee76961..b0697a910f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31378,10 +31378,16 @@ keypresses mapped in firefox to the action described in the function name.") (base32 "1x9hc94a5wygyw714q98jbk4kjvys2ra94qdc2cbgkm6iq982rvq")))) (build-system emacs-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "lisp")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))) + #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-l" "../test/exwm-firefox--tests.el" + "-l" "exwm-firefox.el" + "-f" "ert-run-tests-batch-and-exit"))) (inputs (list emacs-exwm emacs-exwm-firefox-core emacs-s)) (home-page "https://codeberg.org/emacs-weirdware/exwm-firefox") (synopsis "Enhanced support for Firefox under EXWM") -- cgit v1.2.3 From 4d0d651366a0901abaffdac55ef064cb9cb90b01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 12:05:52 +0100 Subject: gnu: emacs-eat: Update to 0.9.4. * gnu/packages/emacs-xyz.scm (emacs-eat): Update to 0.9.4. Change-Id: Id8ec98ba1f8ebc5f63db5798a6dc7043ca6db393 --- 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 b0697a910f..1897560df1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29526,7 +29526,7 @@ tabulated-lists).") (define-public emacs-eat (package (name "emacs-eat") - (version "0.9.2") + (version "0.9.4") (source (origin (method git-fetch) @@ -29536,7 +29536,7 @@ tabulated-lists).") (file-name (git-file-name name version)) (sha256 (base32 - "1mw3iwid2iky0kwpn90bbswx8m4kkni5zdjc75clzhzzygh340sd")) + "0h4j40amdd92h1bhwcyw0kn6j2ihs671xfmz028qklx5cw8a31yg")) (modules '((guix build utils))) (snippet #~(begin -- cgit v1.2.3 From 7a851ee961aebce836263bffa8d5ae131956e1a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 12:06:55 +0100 Subject: gnu: emacs-citeproc-el: Update to 0.9.4. * gnu/packages/emacs-xyz.scm (emacs-citeproc-el): Update to 0.9.4. [propagated-inputs]: Add EMACS-COMPAT. Change-Id: Id04709379fcfa4e02f1a1e2535eb711bd3ea4848 --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1897560df1..a795510c15 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4547,7 +4547,7 @@ Its features are: (define-public emacs-citeproc-el (package (name "emacs-citeproc-el") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) @@ -4556,12 +4556,13 @@ Its features are: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0md8pfmd0v9ipnxj1q13vv81hl90wf4rm46czbk1fdzkyf9js08m")))) + (base32 "1l74c2f2xjzsp3i331sw3db4fhbvdbwyd856j1ygldwrh4rli9ml")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support (propagated-inputs - (list emacs-dash + (list emacs-compat + emacs-dash emacs-f emacs-parsebib emacs-queue -- cgit v1.2.3 From c7f133957507c92e50ae15e3b0bc8e7414461350 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 21 Nov 2023 14:31:19 -0800 Subject: gnu: emacs-blight: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-blight): Update to 1.1. [arguments]: Include Udev rules granting access to the backlight. Change-Id: If277c0845845555d99b9fc55c908ffcea6ea56e6 Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 62 +++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a795510c15..39aab1b8c2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6100,32 +6100,42 @@ english words between singular and plural.") (license license:gpl3+))) (define-public emacs-blight - (let ((commit "6bf9c6192d2bf979eebbfae1963401ef3ff4ef5d") - (revision "0")) - (package - (name "emacs-blight") - (version (git-version "0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://codeberg.org/emacs-weirdware/blight") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1x7s1fcva5kkl9iyb5grd6crf38rrz3zb0c6wb85khi9far10vgq")))) - (build-system emacs-build-system) - (home-page "https://codeberg.org/emacs-weirdware/blight") - (synopsis "Control display brightness") - (description - "Blight allows you to control display brightness from Emacs. It -features object-oriented code using EIEIO, a base class implementing -a reasonable API which focuses on the @emph{set the back light to this -percentage} functionality, it includes a concrete implementation that uses -SysFS to control brightness. Other systems (D-Bus, xbacklight, XELB using -XRandR) are easily supportable, giving the same experience across -environments.") - (license license:gpl3+)))) + (package + (name "emacs-blight") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/blight") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k1w1jr56pp8dgcpdxrymiam1hxsdy7nh6gi5l17pimwba3r4wbm")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-udev-rules-absolute-path-bins + (lambda _ + (substitute* "20-backlight.rules" + (("/bin/chgrp") (which "chgrp")) + (("/bin/chmod") (which "chmod"))))) + (add-after 'install 'install-udev-rules + (lambda _ + (install-file "20-backlight.rules" + (string-append #$output "/lib/udev/rules.d"))))))) + (home-page "https://codeberg.org/emacs-weirdware/blight") + (synopsis "Control display brightness") + (description + "Blight allows you to control display brightness from Emacs. It features +object-oriented code using EIEIO, a base class implementing a reasonable API +which focuses on the @emph{set the back light to this percentage} +functionality, it includes a concrete implementation that uses SysFS to +control brightness. Other systems (D-Bus, xbacklight, XELB using XRandR) are +easily supportable, giving the same experience across environments.") + (license license:gpl3+))) (define-public emacs-symon (package -- cgit v1.2.3 From f65e3ec0dfd250cbd56c3f3b508ee62d50bd7771 Mon Sep 17 00:00:00 2001 From: Ian Eure Date: Tue, 21 Nov 2023 14:32:32 -0800 Subject: gnu: Add emacs-sql-indent. * gnu/packages/emacs-xyz.scm (emacs-sql-indent): New variable. Change-Id: I56a5f1c2e5256ed2ebcfe58ff99faffe49bf8519 Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 39aab1b8c2..bce4191ae1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22596,6 +22596,26 @@ objects. All objects have to share a common superclass and subclasses cannot add any additional instance slots.") (license license:gpl3))) +(define-public emacs-sql-indent + (package + (name "emacs-sql-indent") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/sql-indent-" version + ".tar")) + (sha256 + (base32 "043qcy97a5hx68w0ac7xsk380l2i7bphgrdz6aby2zfpp90vrjpn")))) + (build-system emacs-build-system) + (home-page "https://github.com/alex-hhh/emacs-sql-indent") + (synopsis "Support for indenting code in SQL files") + (description + "This package provides a minor mode that enables syntax-based indentation +for SQL mode buffers. Indentation rules are flexible and can be customized to +match your personal coding style.") + (license license:gpl3+))) + (define-public emacs-epkg (package (name "emacs-epkg") -- cgit v1.2.3 From 84a7d72dd8441b54ec90cc02edd26e0a2a88ff76 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Wed, 29 Nov 2023 22:33:04 +0100 Subject: gnu: emacs-dnt: Propagate inputs. * gnu/packages/emacs-xyz.scm (emacs-dnt): Use propagated-inputs for runtime dependencies. Signed-off-by: Nicolas Goaziou Change-Id: I6b6d22beb749d6a97301a8b80209dbb40c1b8cfd --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bce4191ae1..bdf1ed4265 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3329,7 +3329,7 @@ incrementally confined in Isearch manner.") (file-name (git-file-name name version)) (sha256 (base32 "1bls9j1ibw0npjapslbrh6nmlbn3d4ajhjygsqlf6h9qg12sxm3r")))) - (inputs (list emacs-s)) + (propagated-inputs (list emacs-s)) (build-system emacs-build-system) (home-page "https://codeberg.org/emacs-weirdware/dnt") (synopsis "Strip trackers from URLs") -- cgit v1.2.3 From 6c05fb92866e6f7284b3173851d90a541e5aee9b Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Wed, 29 Nov 2023 22:33:05 +0100 Subject: gnu: emacs-debase: Remove unused inputs. * gnu/packages/emacs-xyz.scm (emacs-debase): Remove empty inputs list. Signed-off-by: Nicolas Goaziou Change-Id: I3d193fd901de4f79cc6309f80316b0502424e61c --- gnu/packages/emacs-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bdf1ed4265..bd9edf459e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34944,7 +34944,6 @@ on removable volumes in Linux.") (sha256 (base32 "112vk1svnc6516vhs47sx5jw6bg8lwrc15l99dxj0sc313lxjy3k")))) (build-system emacs-build-system) - (inputs (list)) (home-page "https://codeberg.org/emacs-weirdware/debase") (synopsis "D-Bus convenience layer for Emacs") (description -- cgit v1.2.3 From 39330065d6bc4bfde8cc7e24ea66783d1f82bb94 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Wed, 29 Nov 2023 22:33:06 +0100 Subject: gnu: emacs-discomfort: Propagate inputs. * gnu/packages/emacs-xyz.scm (emacs-discomfort): Use propagated-inputs for runtime dependencies. Signed-off-by: Nicolas Goaziou Change-Id: Ifbe4d9229ed1714eae0441d5fc4f600cf6a896dc --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bd9edf459e..d5957c5171 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34967,7 +34967,7 @@ services inside Emacs.") (sha256 (base32 "01p4bfiasqxfmp9x1bxdc7763bh712d3vlp2014y8pzrwb1jqdaq")))) (build-system emacs-build-system) - (inputs (list emacs-debase)) + (propagated-inputs (list emacs-debase)) (home-page "https://codeberg.org/emacs-weirdware/discomfort") (synopsis "User interface to mount & unmount disks in Emacs.") (description "Discomfort is an interface to mount and unmount disks in Emacs, using UDisks2.") -- cgit v1.2.3 From d9e54c187bbd2f747d62c631ba5387c1234bec1b Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Wed, 29 Nov 2023 22:33:07 +0100 Subject: gnu: emacs-hyperspace: Propagated inputs. * gnu/packages/emacs-xyz.scm (emacs-hyperspace): Use propagated inputs for runtime dependencies. Signed-off-by: Nicolas Goaziou Change-Id: Id090075ac3ac6531c25aee909739365f1b920446 --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d5957c5171..1bad67b936 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36542,7 +36542,7 @@ project root.") (sha256 (base32 "19h3d12a99i7a92k3iw4zmjmw3dazsgnkc6j4965h033r1s40amx")))) (build-system emacs-build-system) - (inputs (list emacs-s)) + (propagated-inputs (list emacs-s)) (home-page "https://codeberg.org/emacs-weirdware/hyperspace") (synopsis "Get there from here") (description -- cgit v1.2.3 From adbdb6e4948b0c4e1fc5b1c887926e2dad756883 Mon Sep 17 00:00:00 2001 From: casaca Date: Thu, 4 Jan 2024 12:42:34 +0100 Subject: gnu: emacs-xah-fly-keys: Update to 24.19.20231204080156. * gnu/packages/emacs-xyz.scm (emacs-xah-fly-keys): Update to 24.19.20231204080156. Signed-off-by: Nicolas Goaziou Change-Id: I1785fced0354ecc837bbe28323a86a3cad506035 --- gnu/packages/emacs-xyz.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1bad67b936..175bcfcb6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2950,26 +2950,27 @@ in certain cases. It also enables recursion for anonymous functions.") (license license:public-domain))) (define-public emacs-xah-fly-keys - (package - (name "emacs-xah-fly-keys") - (version "17.13.20220526011611") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xahlee/xah-fly-keys") - (commit "b1b1ea62c3f1a329376d9125592175cf2027ebc7"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gv8d9zgmhzjg6zk2a7y76dz30a3l91xb1p15vldka95faz197wn")))) - (build-system emacs-build-system) - (home-page "http://xahlee.info/emacs/misc/ergoemacs_vi_mode.html") - (synopsis "Modal keybinding system for Emacs, based on command frequency and + (let ((commit "e81f8143e9f7b8e55fa549ec6113048e4959b96e")) + (package + (name "emacs-xah-fly-keys") + (version "24.19.20231204080156") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xahlee/xah-fly-keys") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pnq4p5y0h7d3nj3vcsdfccc0aahdvcgskik337z6k7hmb32xz48")))) + (build-system emacs-build-system) + (home-page "http://xahlee.info/emacs/misc/ergoemacs_vi_mode.html") + (synopsis "Modal keybinding system for Emacs, based on command frequency and ergonomics") - (description "xah-fly-keys.el is a modal editing mode for Emacs, like Vi, + (description "xah-fly-keys.el is a modal editing mode for Emacs, like Vi, but the design of key/command choice is based on command frequency statistics and ease-of-key score. Most frequently used commands have most easy keys.") - (license license:gpl3))) + (license license:gpl3)))) (define-public emacs-xr (package -- cgit v1.2.3 From 6d2068f1735c55d917740b8d49cfe78ffe72bff4 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Thu, 4 Jan 2024 12:48:14 +0100 Subject: gnu: emacs-vterm: Update to 0.0.2-1-c3a3a23. * gnu/packages/emacs-xyz.scm (emacs-vterm): Update to 0.0.2-1-c3a3a23. Signed-off-by: Nicolas Goaziou Change-Id: I90238380792aee1b5f13fdad8ef4164048e2bab8 --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 175bcfcb6a..979c55bb99 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29612,10 +29612,11 @@ shell integration.") (license license:gpl3+))) (define-public emacs-vterm - (let ((commit "e19dc2bb9859a75616bf068c341a540d0d329e4d")) + (let ((commit "c3a3a23a5eace137947524c93644204bf6b56cff") + (revision "1")) (package (name "emacs-vterm") - (version "0.0.2") + (version (git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29624,7 +29625,7 @@ shell integration.") (file-name (git-file-name name version)) (sha256 (base32 - "0iqlzpy83ra6xz406fmddfj72bmkdb5b1j59m1dbxf3wxn55320d")))) + "0a3akvqmwh3frgbk1rgmi4b2gwdnpa3fymg7prin3k3jgqih1piv")))) (build-system emacs-build-system) (arguments `(#:modules ((guix build emacs-build-system) -- cgit v1.2.3 From 8df79db37a638cc267489f40d15e69682f757de4 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Tue, 2 Jan 2024 15:20:50 -0500 Subject: gnu: kicad: Update to 7.0.10. * gnu/packages/engineering.scm (kicad): Update to 7.0.10. Change-Id: I7461d2d6736a4618c52767fecc6c0af2c531c1f5 --- gnu/packages/engineering.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 28f5032982..4a52290e1b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1098,7 +1098,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "7.0.9") + (version "7.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -1106,7 +1106,7 @@ Emacs).") (commit version))) (sha256 (base32 - "1hq9rba1gcks14zwbr8nbicpsil4imslgfch6ll33fhizbks3fq4")) + "0rmlkgzgvpd70jzspyrrb2f618fimw52qrhpsp777flmpyh91wly")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1206,7 +1206,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "14dg99fvl6av9sn6gig6d6k1sdcf2svxy4fipqcz994z2khhz1sj")))) + "0lc7d6hn8ya8m51kjnf59v41pbp03l5ncxir75s21pb92l26xgnv")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1240,7 +1240,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "0ynsnjq3z126cjkgm1fjbjvdvpc0walnr42ya9dv46l27kxy2j77")))) + "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1269,7 +1269,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "16a4c2xs4i8wbm01a901yxabxk0qdsjkzlccfawddv82bkh4b87h")))) + "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1286,7 +1286,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1cly28vc07i54v487zbb8d1h70nrd3naxvq146b0xnbrjwnd2q28")))) + "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) @@ -1303,7 +1303,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "11582ldnv7hkljmhaym83962kixq1hjbfmdrn5laq7l4jk3l19vh")))) + "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm")))) (synopsis "Official KiCad project and worksheet templates") (description "This package contains the official KiCad project and worksheet templates."))) -- cgit v1.2.3 From 4f53dff911e80573bc77f8c76e4f101d6c3c7f46 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sat, 30 Dec 2023 20:36:17 +0100 Subject: gnu: python-hicexplorer: Fix build. * gnu/packages/bioinformatics.scm (python-hicexplorer)[snippet]: Remove catchall pattern of patch version numbers in setup.py. --- gnu/packages/bioinformatics.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 41cac296fe..2ceb0190b6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16790,7 +16790,16 @@ the HiCExplorer and pyGenomeTracks packages.") (file-name (git-file-name name version)) (sha256 (base32 - "1yavgxry38g326z10bclvdf8glmma05fxj5m73h15m1r2l9xmw3v")))) + "1yavgxry38g326z10bclvdf8glmma05fxj5m73h15m1r2l9xmw3v")) + (modules '((guix build utils))) + ;; setup.py is malformed. The requirements are defined using a catchall + ;; pattern for the patch version number. This has been fixed in version + ;; 3.7.3, but we cannot upgrade to this version yet, since some Guix + ;; packages are not new enough. (See upstream commit + ;; 4845c715ec7b105e938d0c2426e27d0181690bfe for the fix). + (snippet '(substitute* "setup.py" + (("\\.\\*") + ""))))) (build-system pyproject-build-system) (arguments (list -- cgit v1.2.3 From 4b070c750fe728a34108235ee56e81088205a5ec Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:53:24 +0000 Subject: gnu: cl-cmd: Update to 0.0.1-8.0164d57. * gnu/packages/lisp-xyz.scm (sbcl-cmd): Update to 0.0.1-8.0164d57. Change-Id: I1483861da5373f8bebe393ca7f8e80ad7f84cb06 Signed-off-by: Guillaume Le Vaillant --- 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 0d62f4f7fd..4b8563127f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17953,19 +17953,20 @@ standard library.") (sbcl-package->cl-source-package sbcl-shlex)) (define-public sbcl-cmd - (let ((commit "dda16c251992d2711dd98a073c436e73355cdb15")) + (let ((commit "0164d574ba236e2001ee1d9dba3f4774c7512a8c") + (revision "8")) (package (name "sbcl-cmd") - (version (git-version "0.0.1" "7" commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ruricolist/cmd/") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-cmd" version)) (sha256 - (base32 "1m72vir64h21y3z1dmdywr0r3dl9lwawgd5p9g0cl3bgmz2wjgqr")))) + (base32 "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit v1.2.3 From 2da9ee16e3f9887e47a6c52d8fb3e789da03d726 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:54:57 +0000 Subject: gnu: cl-cmd: Improve package style. * gnu/packages/lisp-xyz.scm (sbcl-cmd)[arguments]: Use G-expressions. Move above inputs. [inputs]: Remove labels. Sort. Change-Id: I7cafea4cce3b2dfb89b21c43d71b96767d55c7f5 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 54 ++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4b8563127f..bb30c39a96 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17968,33 +17968,35 @@ standard library.") (sha256 (base32 "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m")))) (build-system asdf-build-system/sbcl) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("coreutils" ,coreutils) - ("procps" ,procps) - ("serapeum" ,sbcl-serapeum) - ("shlex" ,sbcl-shlex) - ("trivia" ,sbcl-trivia))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref inputs "coreutils") "/bin")) - (ps-bin (string-append (assoc-ref inputs "procps") "/bin"))) - (substitute* "cmd.lisp" - (("\\(def \\+env\\+ \"env\"\\)") - (format #f "(def +env+ \"~a/env\")" bin)) - (("\\(def \\+kill\\+ \"kill\"\\)") - (format #f "(def +kill+ \"~a/kill\")" bin)) - (("\\(def \\+ps\\+ \"ps\"\\)") - (format #f "(def +ps+ \"~a/ps\")" ps-bin)) - (("\\(def \\+pwd\\+ \"pwd\"\\)") - (format #f "(def +pwd+ \"~a/pwd\")" bin)) - (("\\(def \\+sh\\+ \"/bin/sh\"\\)") - (format #f "(def +sh+ \"~a\")" (which "sh"))) - (("\\(def \\+tr\\+ \"tr\"\\)") - (format #f "(def +tr+ \"~a/tr\")" bin))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref inputs "coreutils") + "/bin")) + (ps-bin (string-append (assoc-ref inputs "procps") + "/bin"))) + (substitute* "cmd.lisp" + (("\\(def \\+env\\+ \"env\"\\)") + (format #f "(def +env+ \"~a/env\")" bin)) + (("\\(def \\+kill\\+ \"kill\"\\)") + (format #f "(def +kill+ \"~a/kill\")" bin)) + (("\\(def \\+ps\\+ \"ps\"\\)") + (format #f "(def +ps+ \"~a/ps\")" ps-bin)) + (("\\(def \\+pwd\\+ \"pwd\"\\)") + (format #f "(def +pwd+ \"~a/pwd\")" bin)) + (("\\(def \\+sh\\+ \"/bin/sh\"\\)") + (format #f "(def +sh+ \"~a\")" (which "sh"))) + (("\\(def \\+tr\\+ \"tr\"\\)") + (format #f "(def +tr+ \"~a/tr\")" bin))))))))) + (inputs + (list coreutils + procps + sbcl-alexandria + sbcl-serapeum + sbcl-shlex + sbcl-trivia)) (home-page "https://github.com/ruricolist/cmd") (synopsis "Conveniently run external programs from Common Lisp") (description -- cgit v1.2.3 From dfc27b63b901a862c46050890d190ea6bc98caf1 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 13:10:12 +0000 Subject: gnu: cl-dexador: Update to 0.9.15-2.051cbb7. * gnu/packages/lisp-xyz.scm (sbcl-dexador): Update to 0.9.15-2.051cbb7. [inputs]: Remove sbcl-cl-reexport. Add sbcl-trivial-garbage. [native-inputs]: Remove sbcl-cl-ppcre, sbcl-local-time, sbcl-prove, sbcl-trivial-features, and add sbcl-rove to commented list. Change-Id: Ic451756d90d84954aeddf0fab2c7216a63985d92 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bb30c39a96..9532c41708 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8316,8 +8316,8 @@ cookie headers, cookie creation, cookie jar creation and more.") (sbcl-package->ecl-package sbcl-cl-cookie)) (define-public sbcl-dexador - (let ((commit "74a233edb0ebf2b8c696fb8db984ac568fbcc4e5") - (revision "1")) + (let ((commit "051cbb784ea3015cef9731eb5a624f3122de84b5") + (revision "2")) (package (name "sbcl-dexador") (build-system asdf-build-system/sbcl) @@ -8331,7 +8331,7 @@ cookie headers, cookie creation, cookie jar creation and more.") (commit commit))) (file-name (git-file-name "cl-dexador" version)) (sha256 - (base32 "14cbykd9j8klm8sz3siq5zk78a0ljd6rdwfq12fi4h1ih50apyfi")))) + (base32 "1sggpi43la8dai102fmkzysh7760hvk6q68f0pkbb9187vz8nd3y")))) (inputs (list sbcl-alexandria sbcl-babel @@ -8342,22 +8342,19 @@ cookie headers, cookie creation, cookie jar creation and more.") sbcl-cl-base64 sbcl-cl-cookie sbcl-cl-ppcre - sbcl-cl-reexport sbcl-fast-http sbcl-fast-io sbcl-quri + sbcl-trivial-garbage sbcl-trivial-gray-streams sbcl-trivial-mimes sbcl-usocket)) ;; These native-inputs are for tests only, which are disabled. ;; Leave them commented since they add a lot to the closure size. ;; (native-inputs - ;; (list sbcl-cl-ppcre - ;; sbcl-clack + ;; (list sbcl-clack ;; sbcl-lack - ;; sbcl-local-time - ;; sbcl-prove - ;; sbcl-trivial-features)) + ;; sbcl-rove)) (arguments ;; TODO: Circular dependency: tests depend on clack-test which depends on dexador. `(#:tests? #f -- cgit v1.2.3 From a37beb4ef6e889d34d4e1a5e151ef5588ceec9f3 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 01:50:41 +0000 Subject: gnu: cl-atomics: Update to 1.0.0-2.b747702. * gnu/packages/lisp-xyz.scm (sbcl-atomics): Update to 1.0.0-2.b747702. Change-Id: I288ce4c336f7347ed596897afa24cd2669a94a4e Signed-off-by: Guillaume Le Vaillant --- 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 9532c41708..6cae410f75 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -21734,8 +21734,8 @@ impossible to merge back upstream.") (define-public sbcl-atomics ;; No release in years. - (let ((commit "9ee0bdebcd2bb9b242671a75460db13fbf45454c") - (revision "1")) + (let ((commit "b7477024894e322bff9c85e6d81e5e8d1d4eae59") + (revision "2")) (package (name "sbcl-atomics") (version (git-version "1.0.0" revision commit)) @@ -21745,9 +21745,9 @@ impossible to merge back upstream.") (uri (git-reference (url "https://github.com/Shinmera/atomics") (commit commit))) - (file-name (git-file-name "atomics" version)) + (file-name (git-file-name "cl-atomics" version)) (sha256 - (base32 "0mp5jdqq0aamdhgnvw149cqqi3zg7dkkibp25qi4rafw1fnpd40z")))) + (base32 "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-documentation-utils)) -- cgit v1.2.3 From 7d05e6c89e0de9853aa68dce6e21ea6451d40946 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 01:53:38 +0000 Subject: gnu: cl-numpy-file-format: Update to 0.0.0-2.e440c7b. * gnu/packages/lisp-xyz.scm (sbcl-numpy-file-format): Update to 0.0.0-2.e440c7b. Change-Id: I4b8b343ebfa7b0be04f54174e5bed479670a9e94 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 6cae410f75..3316b58a02 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7497,8 +7497,8 @@ port within a range.") (sbcl-package->ecl-package sbcl-find-port)) (define-public sbcl-numpy-file-format - (let ((commit "e97aef6c592a412fdd1afa9a5f09d0b1ce134510") - (revision "1")) + (let ((commit "e440c7bbc0d86b9abf73acb0fa665b77b82a6c98") + (revision "2")) (package (name "sbcl-numpy-file-format") (version (git-version "0.0.0" revision commit)) @@ -7510,7 +7510,7 @@ port within a range.") (commit commit))) (file-name (git-file-name "cl-numpy-file-format" version)) (sha256 - (base32 "0j7jjcf6k3anvgpm4nf81g6gbhff44v0v9rai7kwm2bm3abzsjfd")))) + (base32 "1n0nixc44z1cymm20wif0l2100ydv0h69l6i6xz5bmwcb2zc4gqr")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-ieee-floats sbcl-trivial-features)) -- cgit v1.2.3 From 3f5023a503a4cc232ced2097efe1ca3a57e80fe9 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 01:58:24 +0000 Subject: gnu: cl-nibbles: Update to 0.14-3.a46a677. * gnu/packages/lisp-xyz.scm (sbcl-nibbles): Update to 0.14-3.a46a677. [file-name]: Rename to cl-nibbles. Move above sha256. Change-Id: I6a95f3f24b043d7e2c192840d9bad62f5c661fb2 Signed-off-by: Guillaume Le Vaillant --- 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 3316b58a02..424931e0f8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3407,8 +3407,8 @@ than the body of the lambda.") (define-public sbcl-nibbles ;; No tagged release since 2018. - (let ((commit "dad25240928d5cf8f7df69c4398244e03570bb35") - (revision "2")) + (let ((commit "a46a67736e07b548cdd7485cb36834f7942313f1") + (revision "3")) (package (name "sbcl-nibbles") (version (git-version "0.14" revision commit)) @@ -3418,9 +3418,9 @@ than the body of the lambda.") (uri (git-reference (url "https://github.com/sharplispers/nibbles/") (commit commit))) + (file-name (git-file-name "cl-nibbles" version)) (sha256 - (base32 "0r6ljlpgjmkf87pmvdwzva8qj15bhznc3ylgcjjqyy4frbx9lygz")) - (file-name (git-file-name "nibbles" version)))) + (base32 "12qjich11hp31dhbvbsixyjbddmr6faaajigrivgbxy9kw6d279j")))) (build-system asdf-build-system/sbcl) (native-inputs ;; Tests only. -- cgit v1.2.3 From fe4c2a1277813d3f8e48671aad0a281e880a71cb Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 02:14:12 +0000 Subject: gnu: cl-eclector: Update to 0.9.0-0.d499b09. * gnu/packages/lisp-xyz.scm (sbcl-eclector): Update to 0.9.0-0.d499b09. Change-Id: Idb4dd189c39eed98b7992271a5dd4354c02ef641 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 58 ++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 424931e0f8..036b87e038 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18196,33 +18196,35 @@ the origin.") (sbcl-package->cl-source-package sbcl-concrete-syntax-tree)) (define-public sbcl-eclector - (package - (name "sbcl-eclector") - (version "0.9.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/s-expressionists/Eclector") - (commit version))) - (file-name (git-file-name "cl-eclector" version)) - (sha256 - (base32 "10whwpz08fkdcz59sz1b6rn5r1pdns5wnsb1g26gppiv3rrg3cvh")))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-fiveam)) - (inputs - (list sbcl-acclimation - sbcl-alexandria - sbcl-closer-mop - sbcl-concrete-syntax-tree)) - (arguments - '(#:asd-systems '("eclector" - "eclector-concrete-syntax-tree"))) - (home-page "https://s-expressionists.github.io/Eclector/") - (synopsis "Highly customizable, portable Common Lisp reader") - (description - "Eclector is a portable Common Lisp reader that is highly customizable, + (let ((commit "d499b09142c7e39b4ef52e821fa767d5a8d606a0") + (revision "0")) + (package + (name "sbcl-eclector") + (version (git-version "0.9.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/s-expressionists/Eclector") + (commit commit))) + (file-name (git-file-name "cl-eclector" version)) + (sha256 + (base32 "1sg8wmdpm8pcjwk394way5vs2ya3r995lddmi51q9zfn9hmzb7gn")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiveam)) + (inputs + (list sbcl-acclimation + sbcl-alexandria + sbcl-closer-mop + sbcl-concrete-syntax-tree)) + (arguments + '(#:asd-systems '("eclector" + "eclector-concrete-syntax-tree"))) + (home-page "https://s-expressionists.github.io/Eclector/") + (synopsis "Highly customizable, portable Common Lisp reader") + (description + "Eclector is a portable Common Lisp reader that is highly customizable, can recover from errors and can return concrete syntax trees. In contrast to many other reader implementations, eclector can recover from @@ -18231,7 +18233,7 @@ is realized as a restart. It can also produce instances of the concrete syntax tree classes provided by the concrete syntax tree library.") - (license license:bsd-2))) + (license license:bsd-2)))) (define-public ecl-eclector (sbcl-package->ecl-package sbcl-eclector)) -- cgit v1.2.3 From 7cbb8be044b0e577145a222674c617c88e528e3d Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 02:14:19 +0000 Subject: gnu: cl-coalton: Update to 0.0.1-4.9393424. * gnu/packages/lisp-xyz.scm (sbcl-coalton): Update to 0.0.1-4.9393424. [inputs]: Remove sbcl-json-streams and sbcl-split-sequence. Add sbcl-concrete-syntax-tree, sbcl-eclector and sbcl-named-readtables. Change-Id: Ibedd5bcf9b76e0300775503119babc4d4511e596 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 036b87e038..f0c80b7341 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19871,8 +19871,8 @@ abstract, final and singleton classes.") (sbcl-package->cl-source-package sbcl-abstract-classes)) (define-public sbcl-coalton - (let ((commit "ba758062bdc7c316438198601f43900c51df25d8") - (revision "3")) + (let ((commit "939342495f55991812c2c2767322c5e51e755216") + (revision "4")) (package (name "sbcl-coalton") (version (git-version "0.0.1" revision commit)) @@ -19884,16 +19884,17 @@ abstract, final and singleton classes.") (commit commit))) (file-name (git-file-name "cl-coalton" version)) (sha256 - (base32 "08sxfla1gyf9pczylaq1cn2j1nr2gzc9w0pk6aarsa4q2770zhf7")))) + (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiasco)) (inputs (list sbcl-alexandria + sbcl-concrete-syntax-tree + sbcl-eclector sbcl-float-features sbcl-fset - sbcl-json-streams - sbcl-split-sequence + sbcl-named-readtables sbcl-trivial-garbage)) (home-page "https://coalton-lang.github.io") (synopsis "Dialect of ML in Common Lisp") -- cgit v1.2.3 From 24c3b94e78bbeae048d263b4ae7ff453e180f555 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 05:47:16 +0000 Subject: gnu: cl-machine-state: Update to 1.0.0-2.3d258ee. * gnu/packages/lisp-xyz.scm (sbcl-machine-state): Update to 1.0.0-2.3d258ee. [home-page]: Fix URL. Change-Id: Ibeb3382f3722070f6c4b3fbcb19bda34addc6273 Signed-off-by: Guillaume Le Vaillant --- 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 f0c80b7341..6c988248bd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19196,8 +19196,8 @@ Lisp.") (sbcl-package->cl-source-package sbcl-percent-encoding)) (define-public sbcl-machine-state - (let ((commit "afa7392bc5dcb689cd170bcca765fb6ce6e4efc5") - (revision "1")) + (let ((commit "3d258eea63942e7d2fd7212f1ad8bbcf505634a2") + (revision "2")) (package (name "sbcl-machine-state") (version (git-version "1.0.0" revision commit)) @@ -19207,9 +19207,9 @@ Lisp.") (uri (git-reference (url "https://github.com/Shinmera/machine-state") (commit commit))) - (file-name (git-file-name "machine-state" version)) + (file-name (git-file-name "cl-machine-state" version)) (sha256 - (base32 "1b897wj06cnalzf5nl6rif1skpa79rzc9a562x1bdhvanhsp7hwa")))) + (base32 "1fjf2v8agx75qnna1n8fn54lvb01w1rk1vddi3p45a2xw1kwhzml")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-bordeaux-threads @@ -19219,7 +19219,7 @@ Lisp.") (arguments '(#:tests? #f ; No tests. #:asd-systems '("machine-state" "machine-state/opengl"))) - (home-page "https://notabug.org/cage/cl-mount-info.git") + (home-page "https://shinmera.github.io/machine-state/") (synopsis "Retrieve machine state information about CPU time, memory usage and more") (description "This library implements various functions to access status information -- cgit v1.2.3 From cf78318204aff1ed443094a3428dfeed859f0c8a Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 05:51:52 +0000 Subject: gnu: cl-clingon: Update to 0.5.0-0.379fc41. * gnu/packages/lisp-xyz.scm (sbcl-clingon): Update to 0.5.0-0.379fc41. Change-Id: I756845165eba3610bda8ec7c3598c797ced411a9 Signed-off-by: Guillaume Le Vaillant --- 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 6c988248bd..e68a3b22cf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1005,11 +1005,11 @@ Common Lisp, heavily influenced by Python's @code{optparse} and (sbcl-package->cl-source-package sbcl-adopt)) (define-public sbcl-clingon - (let ((commit "ff4fda1768551fecdf1c527a3097ae99ba5f40b5") - (revision "1")) + (let ((commit "379fc41e7b3977661f1454cf35acdbfae046d40d") + (revision "0")) (package (name "sbcl-clingon") - (version (git-version "0.4.0" revision commit)) + (version (git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -1018,7 +1018,7 @@ Common Lisp, heavily influenced by Python's @code{optparse} and (commit commit))) (file-name (git-file-name "cl-clingon" version)) (sha256 - (base32 "1b5ybq2x8bwsr541cznwv43lf9j5gz1ij52xj181kg32wb3x0y3n")))) + (base32 "11p9lplx0fc5ghx601i150vrd46zdbvw0hfrbrrrdqplxaqpywq5")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-rove)) -- cgit v1.2.3 From 6b8009510691b901ea292a89512c9f950f1509bd Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 06:28:02 +0000 Subject: gnu: Add cl-type-templates. * gnu/packages/lisp-xyz.scm (sbcl-type-templates, cl-type-templates, ecl-type-templates): New variables. Change-Id: I001451f5cdc3a5a65941982f11d756ecd7a1678a Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e68a3b22cf..d83df31764 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2021 Jacob MacDonald ;;; Copyright © 2022 Jai Vetrivelan -;;; Copyright © 2022, 2023 Paul A. Patience +;;; Copyright © 2022, 2023, 2024 Paul A. Patience ;;; Copyright © 2022 Thomas Albers Raviola ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Trevor Richards @@ -20565,6 +20565,44 @@ alternative 4x4 matrix representation.") (define-public cl-3d-transforms (sbcl-package->cl-source-package sbcl-3d-transforms)) +(define-public sbcl-type-templates + (let ((commit "5b389ebcff61b81585a64d0b899b69fa12aa5f96") + (revision "0")) + (package + (name "sbcl-type-templates") + (version (git-version "4.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/type-templates") + (commit commit))) + (file-name (git-file-name "cl-type-templates" version)) + (sha256 + (base32 "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; No tests + (list #:tests? #f)) + (inputs + (list sbcl-alexandria + sbcl-documentation-utils + sbcl-form-fiddle)) + (home-page "https://shinmera.github.io/type-templates/") + (synopsis "Library for defining and expanding templated functions") + (description + "The Type-Templates library allows you to define types and “template +functions” that can be expanded into various type-specialized versions to +eliminate runtime dispatch overhead. It was specifically designed to +implement low-level numerical data types and functionality.") + (license license:zlib)))) + +(define-public cl-type-templates + (sbcl-package->cl-source-package sbcl-type-templates)) + +(define-public ecl-type-templates + (sbcl-package->ecl-package sbcl-type-templates)) + (define-public sbcl-glsl-toolkit (let ((commit "4c4889e75c635772c4df70b11d6f14e7a596da43") (revision "2")) -- cgit v1.2.3 From 24f0d7eee52dc22bd629733c862d90a85795658c Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 06:28:09 +0000 Subject: gnu: Add cl-3d-math. * gnu/packages/lisp-xyz.scm (sbcl-3d-math, cl-3d-math, ecl-3d-math): New variables. Change-Id: Iaa5c63d7fb535b37c11528f5d7802ea62ebd0894 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d83df31764..0f4516cca0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20603,6 +20603,43 @@ implement low-level numerical data types and functionality.") (define-public ecl-type-templates (sbcl-package->ecl-package sbcl-type-templates)) +(define-public sbcl-3d-math + (let ((commit "3831b1706d225def95a7301ef48b393b563f0114") + (revision "0")) + (package + (name "sbcl-3d-math") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/3d-math") + (commit commit))) + (file-name (git-file-name "cl-3d-math" version)) + (sha256 + (base32 "052vzx5j7bag9dxvl0j0wrm244js1djldyn31rwxgkq7965rmi5r")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-parachute)) + (inputs + (list sbcl-documentation-utils + sbcl-type-templates)) + (home-page "https://shinmera.github.io/3d-math/") + (synopsis "Linear algebra for 2D and 3D computations") + (description + "The @code{3d-math} library implements types, operators, and algorithms +commonly used in math for 2D and 3D graphics. It supersedes and combines the +prior libraries @code{3d-vectors}, @code{3d-matrices}, @code{3d-quaternions}, +and @code{3d-transforms}. The new API is largely but not entirely backwards +compatible, and adds new functionality.") + (license license:zlib)))) + +(define-public cl-3d-math + (sbcl-package->cl-source-package sbcl-3d-math)) + +(define-public ecl-3d-math + (sbcl-package->ecl-package sbcl-3d-math)) + (define-public sbcl-glsl-toolkit (let ((commit "4c4889e75c635772c4df70b11d6f14e7a596da43") (revision "2")) -- cgit v1.2.3 From db784bef1d3c9e8b1fce540a644e596d05af6f2f Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 06:28:16 +0000 Subject: gnu: Add cl-3d-spaces. * gnu/packages/lisp-xyz.scm (sbcl-3d-spaces, cl-3d-spaces, ecl-3d-spaces): New variables. Change-Id: Ib15c90168f36c10697d67f69457de9c4b7d28666 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0f4516cca0..9196299f30 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20640,6 +20640,43 @@ compatible, and adds new functionality.") (define-public ecl-3d-math (sbcl-package->ecl-package sbcl-3d-math)) +(define-public sbcl-3d-spaces + (let ((commit "a93f4915affcf65617366297ad8bd2ec77bae702") + (revision "0")) + (package + (name "sbcl-3d-spaces") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shirakumo/3d-spaces") + (commit commit))) + (file-name (git-file-name "cl-3d-spaces" version)) + (sha256 + (base32 "1m5cg5zy1731dcgkm1p4m53z1zsp387xligxh32pdrnrhc2lzhmf")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-parachute)) + (inputs + (list sbcl-3d-math + sbcl-documentation-utils + sbcl-for + sbcl-trivial-extensible-sequences)) + (home-page "https://shirakumo.github.io/3d-spaces/") + (synopsis "Implementations of various spatial query structures") + (description + "The 3D-Spaces library implements a number of spatial query data +structures; structures that can answer spatial range queries for optimized +lookup, particularly suited for games.") + (license license:zlib)))) + +(define-public cl-3d-spaces + (sbcl-package->cl-source-package sbcl-3d-spaces)) + +(define-public ecl-3d-spaces + (sbcl-package->ecl-package sbcl-3d-spaces)) + (define-public sbcl-glsl-toolkit (let ((commit "4c4889e75c635772c4df70b11d6f14e7a596da43") (revision "2")) -- cgit v1.2.3 From 0eec27846b1c140c2c918921ba071b82bd6b37a5 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sat, 30 Dec 2023 06:37:08 +0000 Subject: gnu: cl-gltf: Update to 2.0.0-0.dab186e. * gnu/packages/lisp-xyz.scm (sbcl-cl-gltf): Update to 2.0.0-0.dab186e. Change-Id: I7e9d7f41774f433192dba30225499f36061bf280 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 9196299f30..aa3ea7c9ce 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -21609,11 +21609,11 @@ application development library.") (sbcl-package->cl-source-package sbcl-cl-glfw3)) (define-public sbcl-cl-gltf - (let ((commit "7f9193acec80cad775b61b1c7a125c14a7b35a0c") + (let ((commit "dab186ebf9169926ccfcdec121a157162ad6ed83") (revision "0")) (package (name "sbcl-cl-gltf") - (version (git-version "1.0.0" revision commit)) + (version (git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -21622,7 +21622,7 @@ application development library.") (commit commit))) (file-name (git-file-name "cl-gltf" version)) (sha256 - (base32 "0ni42242a4x052dqlycwrg5j6piwm87s4wgbn2q0a9s3l9f811vk")))) + (base32 "0ijy0paph7w037a2k14pv8j44mnj4gwhddhxzyqsz3qwl6fpb7yb")))) (build-system asdf-build-system/sbcl) (arguments ;; No tests provided. -- cgit v1.2.3 From c61532c4b472f9c438c1837a423f3d8f024423d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 15:02:50 +0100 Subject: gnu: emacs-ess: Update to 18.10.2-1.3691ecc. * gnu/packages/statistics.scm (emacs-ess): Update to 18.10.2-1.3691ecc. [arguments]: Skip failing tests. * gnu/packages/patches/emacs-ess-fix-obsolete-function-alias.patch: Delete file. * gnu/local.mk: Apply file removal. Change-Id: If8cd54c32c44cd2465f2cdb78317e8f8339f6bc3 --- gnu/local.mk | 1 - .../emacs-ess-fix-obsolete-function-alias.patch | 23 -------------- gnu/packages/statistics.scm | 35 +++++++++++++++++----- 3 files changed, 27 insertions(+), 32 deletions(-) delete mode 100644 gnu/packages/patches/emacs-ess-fix-obsolete-function-alias.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index ee25e1535e..f804f4ef5b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,7 +1111,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ %D%/packages/patches/emacs-exec-path.patch \ - %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ diff --git a/gnu/packages/patches/emacs-ess-fix-obsolete-function-alias.patch b/gnu/packages/patches/emacs-ess-fix-obsolete-function-alias.patch deleted file mode 100644 index f7b61391c3..0000000000 --- a/gnu/packages/patches/emacs-ess-fix-obsolete-function-alias.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9cc5520e1998d03f5dec0fbb1fe71b7cdec38b65 Mon Sep 17 00:00:00 2001 -From: Alex Branham -Date: Wed, 6 Jan 2021 06:41:20 -0500 -Subject: [PATCH] Add required when to obsolete function alias - -Closes #1085 ---- - lisp/ess-r-package.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lisp/ess-r-package.el b/lisp/ess-r-package.el -index 260959955..397ce14e6 100644 ---- a/lisp/ess-r-package.el -+++ b/lisp/ess-r-package.el -@@ -577,7 +577,7 @@ package mode. Use this function if state of the buffer such as - (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead")) - - (defalias 'ess-toggle-developer 'ess-developer) --(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder) -+(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "18.04") - (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04") - - (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c2cf68fca8..b3a2f44ecd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6757,11 +6757,9 @@ Java package that provides routines for various statistical distributions.") (license license:gpl2+))) (define-public emacs-ess - ;; Latest release is old. This is not the latest commit either due to bug - ;; reported here: . - (let ((commit "24da603184ce39246611dd5b8602e769d7ebd5bf") + (let ((commit "3691ecc642eab5d016887e42699648e0eeeef566") (version "18.10.2") - (revision "0")) + (revision "1")) (package (name "emacs-ess") (version (git-version version revision commit)) @@ -6772,7 +6770,7 @@ Java package that provides routines for various statistical distributions.") (url "https://github.com/emacs-ess/ESS") (commit commit))) (sha256 - (base32 "0j98lv07nzwzd54d4dgcfz01wy5gj48m0mnirxzh5r45ik2myh1r")) + (base32 "19p8djsbgvahpsx1w8i6h3qvpbdr4isjwm3wi82yk2648ri0qsq1")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -6803,9 +6801,7 @@ Java package that provides routines for various statistical distributions.") "$(MAKE) -C lisp install; $(MAKE) -C doc install") (("\\$\\(INSTALL) -R \\./\\* \\$\\(ESSDESTDIR)/") "$(MAKE) -C etc install")) - #t)) - (patches - (search-patches "emacs-ess-fix-obsolete-function-alias.patch")))) + #t)))) (build-system gnu-build-system) (arguments (let ((base-directory "/share/emacs/site-lisp")) @@ -6819,6 +6815,29 @@ Java package that provides routines for various statistical distributions.") #:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'check 'skip-failing-tests + ;; XXX: Skip 10 failing tests (out of 187). + (lambda _ + (let-syntax + ((disable-tests + (syntax-rules () + ((_ file ()) + (syntax-error "test names list must not be empty")) + ((_ file (test-name ...)) + (substitute* file + (((string-append "^\\(ert-deftest " test-name ".*") all) + (string-append all "(skip-unless nil)\n")) ...))))) + (disable-tests (list "test/ess-test-inf.el" "test/ess-test-r.el") + ("ess--derive-connection-path" + "ess-eval-line-test" + "ess-eval-region-test" + "ess-mock-remote-process" + "ess-r-load-ESSR-github-fetch-no" + "ess-r-load-ESSR-github-fetch-yes" + "ess-r-eval-ns-env-roxy-tracebug-test" + "ess-r-eval-sink-freeze-test" + "ess-set-working-directory-test" + "ess-test-r-startup-directory"))))) (replace 'check (lambda _ (invoke "make" "test"))))))) (native-inputs -- cgit v1.2.3 From 650b9021a1979fd96635001d542d2fc660a3dd87 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 15:12:10 +0100 Subject: gnu: emacs-ess: Improve package style. * gnu/packages/statistics.scm (emacs-ess)[origin]: Remove trailing #T from snippet. Use G-expressions. [arguments]: Use G-expressions. [inputs]: Remove labels. Change-Id: Iaaf6371577e00c2cc1da0192e5f9f9102b4e76b0 --- gnu/packages/statistics.scm | 130 ++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b3a2f44ecd..db2a11d791 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6774,77 +6774,77 @@ Java package that provides routines for various statistical distributions.") (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet - '(begin - ;; Stop ESS from trying to bundle an external julia-mode.el. - (substitute* "lisp/Makefile" - ((" \\$\\(JULIAS)") "") - (("\ttest.*julia-mode.*\\.el") "")) - ;; Only build docs in info format. - (substitute* "doc/Makefile" - (("all : info text") - "all : info") - (("install: install-info install-other-docs") - "install: install-info")) - ;; Stop install-info from trying to update the info directory. - (substitute* "doc/Makefile" - ((".*/dir.*") "")) - ;; Fix r-help-mode test. - (substitute* "test/ess-test-r.el" - (("\\(equal ess-help-object \"plot.default\")") "t")) - ;; Avoid generating ess-autoloads.el twice. - (substitute* "Makefile" - (("all: lisp doc etc autoloads") - "all: lisp doc etc")) - ;; Install to correct directories. - (substitute* "Makefile" - (("mkdir -p \\$\\(ESSDESTDIR)") - "$(MAKE) -C lisp install; $(MAKE) -C doc install") - (("\\$\\(INSTALL) -R \\./\\* \\$\\(ESSDESTDIR)/") - "$(MAKE) -C etc install")) - #t)))) + #~(begin + ;; Stop ESS from trying to bundle an external julia-mode.el. + (substitute* "lisp/Makefile" + ((" \\$\\(JULIAS)") "") + (("\ttest.*julia-mode.*\\.el") "")) + ;; Only build docs in info format. + (substitute* "doc/Makefile" + (("all : info text") + "all : info") + (("install: install-info install-other-docs") + "install: install-info")) + ;; Stop install-info from trying to update the info directory. + (substitute* "doc/Makefile" + ((".*/dir.*") "")) + ;; Fix r-help-mode test. + (substitute* "test/ess-test-r.el" + (("\\(equal ess-help-object \"plot.default\")") "t")) + ;; Avoid generating ess-autoloads.el twice. + (substitute* "Makefile" + (("all: lisp doc etc autoloads") + "all: lisp doc etc")) + ;; Install to correct directories. + (substitute* "Makefile" + (("mkdir -p \\$\\(ESSDESTDIR)") + "$(MAKE) -C lisp install; $(MAKE) -C doc install") + (("\\$\\(INSTALL) -R \\./\\* \\$\\(ESSDESTDIR)/") + "$(MAKE) -C etc install")))))) (build-system gnu-build-system) (arguments (let ((base-directory "/share/emacs/site-lisp")) - `(#:make-flags (list (string-append "PREFIX=" %output) - (string-append "ETCDIR=" %output - ,base-directory "/etc") - (string-append "LISPDIR=" %output - ,base-directory) - (string-append "INFODIR=" %output - "/share/info")) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'skip-failing-tests - ;; XXX: Skip 10 failing tests (out of 187). - (lambda _ - (let-syntax - ((disable-tests - (syntax-rules () - ((_ file ()) - (syntax-error "test names list must not be empty")) - ((_ file (test-name ...)) - (substitute* file - (((string-append "^\\(ert-deftest " test-name ".*") all) - (string-append all "(skip-unless nil)\n")) ...))))) - (disable-tests (list "test/ess-test-inf.el" "test/ess-test-r.el") - ("ess--derive-connection-path" - "ess-eval-line-test" - "ess-eval-region-test" - "ess-mock-remote-process" - "ess-r-load-ESSR-github-fetch-no" - "ess-r-load-ESSR-github-fetch-yes" - "ess-r-eval-ns-env-roxy-tracebug-test" - "ess-r-eval-sink-freeze-test" - "ess-set-working-directory-test" - "ess-test-r-startup-directory"))))) - (replace 'check - (lambda _ (invoke "make" "test"))))))) + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "ETCDIR=" #$output #$base-directory "/etc") + (string-append "LISPDIR=" #$output #$base-directory) + (string-append "INFODIR=" #$output "/share/info")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'skip-failing-tests + ;; XXX: Skip 10 failing tests (out of 187). + (lambda _ + (let-syntax + ((disable-tests + (syntax-rules () + ((_ file ()) + (syntax-error "test names list must not be empty")) + ((_ file (test-name ...)) + (substitute* file + (((string-append "^\\(ert-deftest " test-name ".*") + all) + (string-append all "(skip-unless nil)\n")) + ...))))) + (disable-tests (list "test/ess-test-inf.el" + "test/ess-test-r.el") + ("ess--derive-connection-path" + "ess-eval-line-test" + "ess-eval-region-test" + "ess-mock-remote-process" + "ess-r-load-ESSR-github-fetch-no" + "ess-r-load-ESSR-github-fetch-yes" + "ess-r-eval-ns-env-roxy-tracebug-test" + "ess-r-eval-sink-freeze-test" + "ess-set-working-directory-test" + "ess-test-r-startup-directory"))))) + (replace 'check + (lambda _ (invoke "make" "test"))))))) (native-inputs (list perl r-roxygen2 texinfo)) (inputs - `(("emacs" ,emacs-minimal) - ("r-minimal" ,r-minimal))) + (list emacs-minimal r-minimal)) (propagated-inputs (list emacs-julia-mode)) (home-page "https://ess.r-project.org/") -- cgit v1.2.3 From 3c1f25fc7b3cd1942c33a48e71697f94c4c86bc2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jan 2024 16:13:55 +0100 Subject: gnu: emacs-ess: Fix build. * gnu/packages/statistics.scm (emacs-ess)[arguments]<#:phases>: Fix test file lists for skipped tests. Change-Id: I0ef581080811535dbf32118c3ed37f91e9f58cfe --- gnu/packages/statistics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index db2a11d791..d5747ef9f7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6828,7 +6828,8 @@ Java package that provides routines for various statistical distributions.") (string-append all "(skip-unless nil)\n")) ...))))) (disable-tests (list "test/ess-test-inf.el" - "test/ess-test-r.el") + "test/ess-test-r.el" + "test/ess-test-r-eval.el") ("ess--derive-connection-path" "ess-eval-line-test" "ess-eval-region-test" -- cgit v1.2.3 From c69230c81f9657fd6338c1cd625139a1c1d1c39f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:32 +0200 Subject: gnu: Add support for x86_64-linux-gnux32. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add entry for x86_64-linux-gnux32. * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Add configure-flag for x86_64-linux-gnux32. * guix/platforms/x86.scm (x86_64-linux-gnux32): New variable. * guix/utils.scm (gnu-triplet->nix-system): Force x86_64-linux-gnux32 to output a different nix-system than x86_64-linux-gnu. Change-Id: I519fea2f8357e4b9895ede05fe8a5e373e9b034a Signed-off-by: Efraim Flashner --- gnu/packages/bootstrap.scm | 5 ++++- gnu/packages/gcc.scm | 5 ++++- guix/platforms/x86.scm | 10 ++++++++++ guix/utils.scm | 4 +++- 4 files changed, 21 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 602d8f26c5..a36bb289cd 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver -;;; Copyright © 2017, 2020 Efraim Flashner +;;; Copyright © 2017, 2020, 2024 Efraim Flashner ;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter @@ -323,6 +323,9 @@ or false to signal an error." ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") + ;; TODO: Differentiate between x86_64-linux-gnu and x86_64-linux-gnux32. + ((string=? system "x86_64-linux-gnux32") "/lib/ld-linux-x32.so.2") + ;; XXX: This one is used bare-bones, without a libc, so add a case ;; here just so we can keep going. ((string=? system "arm-eabi") "no-ld.so") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a8b74a3632..5590cd3d7e 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, 2023 Andreas Enge -;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner +;;; Copyright © 2015-2018, 2020-2024 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020, 2022 Marius Bakke @@ -75,6 +75,9 @@ where the OS part is overloaded to denote a specific ABI---into GCC "--with-mode=thumb" "--with-fpu=neon")) + ((string-match "x86_64-linux-gnux32" target) + '("--with-abi=mx32")) + ((and (string-suffix? "-gnu" target) (not (string-contains target "-linux"))) ;; Cross-compilation of libcilkrts in GCC 5.5.0 to GNU/Hurd fails diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 4ed5638c14..0c8fc7296c 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Mathieu Othacehe +;;; Copyright © 2023, 2024 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix records) #:export (i686-linux x86_64-linux + x86_64-linux-x32 i686-mingw x86_64-mingw i586-gnu)) @@ -41,6 +43,14 @@ (rust-target "x86_64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) +(define x86_64-linux-x32 + (platform + (target "x86_64-linux-gnux32") + (system #f) + (linux-architecture "x86_64") + (rust-target "x86_64-unknown-linux-gnux32") + (glibc-dynamic-linker "/lib/ld-linux-x32.so.2"))) + (define i686-mingw (platform (target "i686-w64-mingw32") diff --git a/guix/utils.scm b/guix/utils.scm index 8e71f97e1c..f4bf965e9a 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018, 2020 Marius Bakke -;;; Copyright © 2020, 2021 Efraim Flashner +;;; Copyright © 2020, 2021, 2024 Efraim Flashner ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Chris Marusich @@ -634,6 +634,8 @@ returned by `config.guess'." (else triplet)))) (cond ((string-match "^arm[^-]*-([^-]+-)?linux-gnueabihf" triplet) "armhf-linux") + ;; Otherwise it will show up as x86_64-linux... which isn't wrong. + ((string-match "x86_64-linux-gnux32" triplet) "x86_64-linux-gnux32") ((string-match "^([^-]+)-([^-]+-)?linux-gnu.*" triplet) => (lambda (m) -- cgit v1.2.3 From 568c12d7266c7372f04f16bcb91cbe0f88d9e70b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:34 +0200 Subject: gnu: openssl: Fix building on x86_64-linux-gnux32. * gnu/packages/tls.scm (target->openssl-target): Add entry for x86_64-linux-gnux32. Change-Id: Icbbdb76134da0811b8493c55ca2d3acdb77c5883 Signed-off-by: Efraim Flashner --- gnu/packages/tls.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 75e6370c72..208a7ff640 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari -;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -429,6 +429,8 @@ OpenSSL for TARGET." (cond ((target-x86-32? target) "x86") + ((target-x32? target) + "x32") ((target-x86-64? target) "x86_64") ((target-mips64el? target) -- cgit v1.2.3 From 744e06c867925b29682a75f8a1a19bb7b775fb13 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:35 +0200 Subject: gnu: gmp: Fix building on x86_64-linux-gnux32. * gnu/packages/multiprecision.scm (gmp)[arguments]: When building for x86_64-linux-gnux32 add a configure-flag to use the x32 ABI. Change-Id: I321c707b3f7df5eeb338f03dacf08b29181ecf53 Signed-off-by: Efraim Flashner --- gnu/packages/multiprecision.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 0c6255c129..591170b508 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier -;;; Copyright © 2018, 2019, 2021, 2023 Efraim Flashner +;;; Copyright © 2018, 2019, 2021, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen @@ -71,6 +71,8 @@ ;; they produce different headers. We need shared. `("--disable-static" "--enable-shared")) + ((target-x32?) + `("ABI=x32")) (else '()))) ;; Remove after core-updates merge. ;; Workaround for gcc-7 transition breakage, -system and cross-build, -- cgit v1.2.3 From 9816a5371663396bc092eb359222635e5675b174 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jan 2024 09:27:36 +0200 Subject: gnu: libsigsegv: Fix cross-compiling. * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: When cross-compiling add a phase to not include extra headers. Change-Id: Ie2d23fd037ed533dacf08acf52771b7ab1d446ac Signed-off-by: Efraim Flashner --- gnu/packages/libsigsegv.scm | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index ebbdd2ad90..71afb35be0 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2018 Ludovic Courtès -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2024 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libsigsegv @@ -40,21 +41,15 @@ (arguments `(;; The shared library isn't built by default but some packages need it. #:configure-flags '("--enable-shared") - - ;; On MIPS, work around this error: - ;; - ;; In file included from fault-linux-mips-old.h:18:0, - ;; [...] - ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' - ,@(if (string-contains (or (%current-target-system) (%current-system)) - "mips64el") - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-mips-old-h - (lambda _ - (substitute* "src/fault-linux-mips-old.h" - (("#include ") "")) - #t)))) - '()))) + ;; On some architectures 'struct sigcontext' gets redefined from + ;; %linux-libre-headers/include/asm/sigcontext.h + ,@(cond ((%current-target-system) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-asm-sigcontext-h + (lambda _ + (substitute* (find-files "src" "^fault-.*-old\\.h$") + (("#include ") ""))))))) + (else '())))) (description "GNU libsigsegv is a library to handle page faults, which occur when a program tries to access an unavailable region of memory, in user mode. By -- cgit v1.2.3 From be1d05c10766a979dd0720b677889ed950d3b895 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Wed, 20 Dec 2023 14:40:24 +0100 Subject: gnu: icecat-minimal: Fix WM Class. * gnu/packages/gnuzilla.scm (icecat-minimal)[arguments]: Set the MOZ_APP_REMOTINGNAME environment variable and replace "Navigator" with "Icecat" in icecat.desktop. The WM Class should be "Navigator, Icecat" instead of "Navigator, icecat-default". StartupWMClass in icecat.desktop should be "Icecat" instead of "Navigator" so that other browsers (they often have the "Navigator" class) won't be associated with Icecat. Change-Id: I57bec957938c56e8acf9cd5c955e57dbad081678 --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bf9bf34e3a..188aa02293 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1034,6 +1034,9 @@ variable defined below. It requires guile-json to be installed." (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") (setenv "MOZ_BUILD_DATE" #$%icecat-build-id) ; avoid timestamp + ;; WM_CLASS (default is "$MOZ_APP_NAME-$MOZ_UPDATE_CHANNEL"). + (setenv "MOZ_APP_REMOTINGNAME" "Icecat") + ;; XXX TODO: Fix this to work on systems other than x86_64-linux. (setenv "GUIX_PYTHONPATH" (string-append (getcwd) @@ -1126,7 +1129,7 @@ variable defined below. It requires guile-json to be installed." (("NewWindow") "new-window") (("NewPrivateWindow") "new-private-window") (("StartupNotify=true") - "StartupNotify=true\nStartupWMClass=Navigator")) + "StartupNotify=true\nStartupWMClass=Icecat")) (install-file desktop-file applications)))) (add-after 'install-desktop-entry 'install-icons (lambda _ -- cgit v1.2.3 From a59922dab6e2b957ca882113a231c1e318ee8269 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 23 Oct 2023 00:04:07 +0100 Subject: gnu: Add python-av. * gnu/packages/python-xyz.scm (python-av): New variable. --- gnu/packages/python-xyz.scm | 99 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2afce6c667..898e849997 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9236,6 +9236,105 @@ converting, and viewing many of the proprietary file formats used to store experimental data and metadata at the Laboratory for Fluorescence Dynamics.") (license license:bsd-3))) +(define-public python-av + (package + (name "python-av") + (version "10.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "av" version)) + (sha256 + (base32 "01byqsjclkg65mhr6b4i2r2n4y7af9kdd2c35lxny27121b3vzca")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list + ;; Tests require outbound access to download data samples from + ;; http://fate.ffmpeg.org/fate-suite: + ;; + ;; E urllib.error.URLError: + ;; + "--ignore=tests/test_doctests.py" + "--ignore=tests/test_timeout.py" + "-k" + (string-append + "not test_data" + " and not test_container_probing" + " and not test_stream_probing" + " and not test_transcode" + " and not test_codec_tag" + " and not test_parse" + " and not test_decode_audio_sample_count" + " and not test_decoded_motion_vectors" + " and not test_decoded_motion_vectors_no_flag" + " and not test_decoded_time_base" + " and not test_decoded_video_frame_count" + " and not test_encoding_aac" + " and not test_encoding_dnxhd" + " and not test_encoding_dvvideo" + " and not test_encoding_h264" + " and not test_encoding_mjpeg" + " and not test_encoding_mp2" + " and not test_encoding_mpeg1video" + " and not test_encoding_mpeg4" + " and not test_encoding_pcm_s24le" + " and not test_encoding_png" + " and not test_encoding_tiff" + " and not test_encoding_xvid" + " and not test_reading_from_buffer" + " and not test_reading_from_buffer_no_seek" + " and not test_reading_from_file" + " and not test_reading_from_pipe_readonly" + " and not test_reading_from_write_readonly" + " and not test_writing_to_custom_io_dash" + " and not test_writing_to_custom_io_image2" + " and not test_decode_half" + " and not test_seek_end" + " and not test_seek_float" + " and not test_seek_int64" + " and not test_seek_middle" + " and not test_seek_start" + " and not test_stream_seek" + " and not test_selection" + " and not test_stream_tuples" + " and not test_movtext" + " and not test_vobsub" + " and not test_roundtrip" + " and not test_stream_probing")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (native-inputs + (list pkg-config + python-cython + python-editorconfig + python-numpy + python-pillow + python-pytest)) + (inputs + ;; XXX: Build is failing with FFmpeg 6.0, unresolved upstream. + ;; See https://github.com/PyAV-Org/PyAV/issues/1106 + (list ffmpeg-5)) + (home-page "https://github.com/PyAV-Org/PyAV") + (synopsis "Pythonic bindings for FFmpeg's libraries") + (description + "PyAV is a Python library that allows for direct and precise manipulation +of media through containers, streams, packets, codecs, and frames. It provides +access to the powerful FFmpeg libraries while managing the complex details as +much as possible. +PyAV also facilitates data transformation and integration with +other packages such as Numpy and Pillow. However, working with media is a +challenging task and PyAV cannot abstract it away or make all the best decisions +for you. If you can accomplish your tasks with the ffmpeg command, PyAV may not +be necessary. Nonetheless, PyAV is an essential tool when working with media +that requires its specific capabilities.") + (license license:bsd-3))) + (define-public python-ffmpeg-python ;; The latest release (0.2.0) is old and its test suite crashs on Python 3.10. (let ((commit "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6") (revision "0")) -- cgit v1.2.3 From 2ef73c6bf5a6885153f2ab0594961878ee0dbf04 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 23 Oct 2023 00:04:08 +0100 Subject: gnu: Add python-djitellopy. * gnu/packages/python-xyz.scm (python-djitellopy): New variable. Modified-by: Maxim Cournoyer Change-Id: I3e1fe9ecc7c02cb22a979c494fd76db678019e2e --- gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 898e849997..f8bb943122 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30275,6 +30275,45 @@ heterogeneous and multi-platform clusters (including clusters running other applications with variable CPU loads).") (license license:bsd-3))) +(define-public python-djitellopy + (package + (name "python-djitellopy") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "djitellopy" version)) + (sha256 + (base32 "1kc0syb4hpn7fay0rxpazmczag6jw3pncrrc6v762jj0afiwkrps")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:phases + #~(modify-phases %standard-phases + ;; OpenCV does not ship metadata files for its Python library, which + ;; makes it invisible to the sanity_check script (see: + ;; https://github.com/opencv/opencv/issues/24810). + (delete 'sanity-check)))) + (propagated-inputs + (list opencv ;for opencv-python + python-av + python-numpy + python-pillow)) + (home-page "https://github.com/damiafuentes/DJITelloPy") + (synopsis + "DJI Tello drone video streaming, swarms and state packets library") + (description + "DJI Tello drone Python interface using the official Tello SDK and Tello +EDU SDK. This library has the following features: +@itemize +@item Implementation of all tello commands +@item Retrieve a video stream easily +@item Receive and parse state packets +@item Control a swarm of drones. +@end itemize") + (license license:expat))) + (define-public python-djvulibre (package (name "python-djvulibre") -- cgit v1.2.3 From e963dcd2e2e1b494d1d8e02453866d00ba3419fa Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Sat, 23 Dec 2023 16:38:57 -0500 Subject: gnu: grml-zsh-config: Update to 0.19.6. * gnu/packages/shellutils.scm (grml-zsh-config): Update to 0.19.6. Change-Id: I0609ec27e98fe1c842cb76d0aaebb491b2e966fe Signed-off-by: Maxim Cournoyer --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 9993c0b807..00352dc327 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -331,7 +331,7 @@ particularly in catching syntax errors.") (define-public grml-zsh-config (package (name "grml-zsh-config") - (version "0.19.5") + (version "0.19.6") (source (origin (method url-fetch) (uri (string-append @@ -339,7 +339,7 @@ particularly in catching syntax errors.") version ".tar.gz")) (sha256 (base32 - "0ifw490z3v9ljccbmm04adz39fj2dmx8mjgayxqj0a9ln90yfdc4")))) + "1k1m2fbmvw73qy9mc6k2ygjg6zz8h7nn3d9pvj6jbjadnx4pz770")))) (build-system copy-build-system) (arguments (list -- cgit v1.2.3 From cf075984fc630465bae1361c14552178450b41db Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 25 Dec 2023 07:54:58 +0800 Subject: gnu: irrlicht-for-minetest: Update to 1.9.0mt13. Message-ID: <33df226b8a59a668741a971401024bea785d203d.1703461178.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Mon, 25 Dec 2023 07:16:25 +0800 Subject: [PATCH 1/2] gnu: irrlicht-for-minetest: Update to 1.9.0mt13. * gnu/packages/games.scm (irrlicht-for-minetest): Update to 1.9.0mt13. Signed-off-by: Maxim Cournoyer --- 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 c7813790a1..8117886583 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3833,7 +3833,7 @@ for common mesh file formats, and collision detection.") (package (inherit irrlicht) (name "irrlicht-for-minetest") - (version "1.9.0mt10") + (version "1.9.0mt13") (source (origin (method git-fetch) @@ -3843,7 +3843,7 @@ for common mesh file formats, and collision detection.") (file-name (git-file-name name version)) (sha256 (base32 - "0y5vchz91khs8dmrkpgc7sqmvzx2yjj6svivvm80r4yppv7s03rw")))) + "11pxg0yh50ym1hvh8va5jbbcjz5dsshj3xxvm3qhkgg96vpism06")))) (build-system cmake-build-system) (arguments ;; No check target. -- cgit v1.2.3 From f96590fb3662300058022f0aaee594e766f8941f Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 25 Dec 2023 07:56:21 +0800 Subject: gnu: minetest: Update to 5.8.0. Message-ID: In-Reply-To: <33df226b8a59a668741a971401024bea785d203d.1703461038.git.adam.faiz@disroot.org> References: <33df226b8a59a668741a971401024bea785d203d.1703461038.git.adam.faiz@disroot.org> From: AwesomeAdam54321 Date: Mon, 25 Dec 2023 07:19:27 +0800 Subject: [PATCH 2/2] gnu: minetest: Update to 5.8.0. * gnu/packages/minetest.scm (minetest, minetest-data): Update to 5.8.0. Signed-off-by: Maxim Cournoyer --- gnu/packages/minetest.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index bf0df314a7..14c47430e3 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -52,7 +52,7 @@ (define-public minetest (package (name "minetest") - (version "5.7.0") + (version "5.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "008l44zwwsarwk4hn7wx2nj2m21b1iqsphl7g69rrlxj760zl0pl")) + "1sww17h8z77w38jk19nsqxn8xcj27msq0glbil7pyj4i0ffprjrr")) (modules '((guix build utils))) (snippet '(begin @@ -166,7 +166,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "02kbj1h6jsq6k8x4v2ir0njczdz7nyx6dbym85ixxp3mrqxiws61")))) + "1pq4rm15lzwcqv6npgyz6v89hi3zj8zybw25n9i0d27qj786xc4z")))) (build-system copy-build-system) (arguments (list #:install-plan -- cgit v1.2.3 From 05fad99a431c6708ec18c7d0db67178bd8d36597 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Mon, 25 Dec 2023 12:10:43 +0800 Subject: gnu: sddm: Update to 0.20.0. * gnu/packages/display-managers.scm (sddm)[version]: Update to 0.20.0. [source]: Remove snippet and use git-fetch method instead. [arguments]: Use gexp, remove outdate comment and handle /include/qt5 dir of qtdeclarative. Change-Id: I6f6bd80291c36b1b80c9ff7f2154593cea2c9d87 Signed-off-by: Maxim Cournoyer --- gnu/packages/display-managers.scm | 80 ++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 43 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7120c2ad75..2df4e6311b 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -69,25 +69,16 @@ (define-public sddm (package (name "sddm") - (version "0.19.0") + (version "0.20.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/sddm/sddm" - "/releases/download/v" version "/" - "sddm-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sddm/sddm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")) - (snippet - #~(begin - ;; https://github.com/sddm/sddm/issues/1536 - ;; https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308 - ;; Commit comes shortly after the 0.19.0 release. - (use-modules ((guix build utils))) - (substitute* "src/daemon/XorgDisplayServer.cpp" - (("m_cookie\\[i\\] = digits\\[dis\\(gen\\)\\]") - "m_cookie[i] = QLatin1Char(digits[dis(gen)])")))))) + "1450zv03d3mbid27986p4mdshw9qf3ar8crl4idybf7khxgan22y")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools-5)) @@ -109,36 +100,39 @@ shadow wayland)) (arguments - `(#:configure-flags - ,#~(list - ;; This option currently does nothing, but will presumably be enabled - ;; if/when is merged. - "-DENABLE_WAYLAND=ON" - "-DENABLE_PAM=ON" - ;; Both flags are required for elogind support. - "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON" - "-DCONFIG_FILE=/etc/sddm.conf" - ;; Set path to /etc/login.defs. - ;; An alternative would be to use -DUID_MIN and -DUID_MAX. - (string-append "-DLOGIN_DEFS_PATH=" - #$(this-package-input "shadow") - "/etc/login.defs") - (string-append "-DQT_IMPORTS_DIR=" - #$output "/lib/qt5/qml") - (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" - #$output "/etc")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-loginctl-reference - (lambda _ - (substitute* "CMakeLists.txt" - (("/usr/bin/loginctl") (which "loginctl"))) - #t))))) + (list + #:configure-flags + #~(list + "-DENABLE_WAYLAND=ON" + "-DENABLE_PAM=ON" + ;; Both flags are required for elogind support. + "-DNO_SYSTEMD=ON" + "-DUSE_ELOGIND=ON" + "-DCONFIG_FILE=/etc/sddm.conf" + ;; Set path to /etc/login.defs. + ;; An alternative would be to use -DUID_MIN and -DUID_MAX. + (string-append "-DLOGIN_DEFS_PATH=" + #$(this-package-input "shadow") + "/etc/login.defs") + (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input + "qtdeclarative") "/include/qt5") + (string-append "-DQT_IMPORTS_DIR=" + #$output "/lib/qt5/qml") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" + #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-loginctl-reference + (lambda _ + (substitute* "CMakeLists.txt" + (("/usr/bin/loginctl") + (which "loginctl")))))))) (synopsis "QML based X11 and Wayland display manager") (description "SDDM is a display manager for X11 and Wayland aiming to be fast, simple and beautiful. SDDM is themeable and puts no restrictions on the -user interface design. It uses QtQuick which gives the designer the ability to -create smooth, animated user interfaces.") +user interface design. It uses QtQuick which gives the designer the ability +to create smooth, animated user interfaces.") (home-page "https://github.com/sddm/sddm") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) -- cgit v1.2.3 From 036d2fc88afb641a5765dd57308a8bd228c7575c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 08:40:40 +0100 Subject: gnu: python-tbb: Fix build. * gnu/packages/tbb.scm (python-tbb)[arguments]: Call "python setup.py install" with "--root" argument. Change-Id: I290c45f3d64c0bb6ec57a0e406132b4f42808eec --- gnu/packages/tbb.scm | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index ec630a029f..da3ea74fb6 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2022 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2022, 2024 Ricardo Wurmus ;;; Copyright © 2016 Nikita ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2021 Guillaume Le Vaillant @@ -51,31 +51,31 @@ `(#:configure-flags '(,@(if (or (target-riscv64?) (target-ppc32?)) - '("-DTBB_TEST_LINK_FLAGS=-latomic") - `()) + '("-DTBB_TEST_LINK_FLAGS=-latomic") + `()) ,@(if (or (target-arm32?) (target-ppc32?)) - '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD") - `()) - "-DTBB_STRICT=OFF") ;; Don't fail on warnings + '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD") + `()) + "-DTBB_STRICT=OFF") ;; Don't fail on warnings #:phases (modify-phases %standard-phases ,@(cond - ((target-arm32?) - `((add-after 'unpack 'adjust-test-suite - (lambda _ - (substitute* "test/CMakeLists.txt" - ;; Bus error, skipped on mips. - ((".*test_malloc_pools.*") "")))))) - ((target-ppc32?) - `((add-after 'unpack 'adjust-test-suite - (lambda _ - (substitute* "test/CMakeLists.txt" - ;; These tests hang forever. - ((".*test_function_node.*") "") - ((".*test_multifunction_node.*") "") - ((".*test_async_node.*") "")))))) - (else '()))))) + ((target-arm32?) + `((add-after 'unpack 'adjust-test-suite + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; Bus error, skipped on mips. + ((".*test_malloc_pools.*") "")))))) + ((target-ppc32?) + `((add-after 'unpack 'adjust-test-suite + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; These tests hang forever. + ((".*test_function_node.*") "") + ((".*test_multifunction_node.*") "") + ((".*test_async_node.*") "")))))) + (else '()))))) (home-page "https://www.threadingbuildingblocks.org") (synopsis "C++ library for parallel programming") (description @@ -101,7 +101,9 @@ tasks, synchronization primitives, atomic operations, and more.") (lambda _ (substitute* "python/CMakeLists.txt" (("\\$\\{PYTHON_BUILD_WORK_DIR\\}/build") - #$output)) + #$output) + (("install --prefix.*-f" m) + (string-append m " --root=/"))) (substitute* "python/setup.py" (("extra_link_args=tbb_flag,") (string-append "extra_link_args=['-Wl,-rpath=" -- cgit v1.2.3 From d2a6480e8e7156a14f834a21af01f164ab16a624 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 08:43:29 +0100 Subject: gnu: Add r-scrnaseq. * gnu/packages/bioconductor.scm (r-scrnaseq): New variable. Change-Id: Iee25b59af0000f4d2fd7482183b43404840a336c --- gnu/packages/bioconductor.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1ea5e47321..bf38afb762 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015-2023 Ricardo Wurmus +;;; Copyright © 2015-2024 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Ben Woodcroft @@ -10510,6 +10510,38 @@ expression information. The package functions as a wrapper for Startrac and powerTCR R packages.") (license license:gpl2))) +(define-public r-scrnaseq + (package + (name "r-scrnaseq") + (version "2.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "scRNAseq" version + 'experiment)) + (sha256 + (base32 "0dbh3sqq7lkkdf7vls5qg7fbn6y74c7hsigb4d69pvk934ll88aw")))) + (properties `((upstream-name . "scRNAseq"))) + (build-system r-build-system) + (propagated-inputs (list r-annotationdbi + r-annotationhub + r-biocgenerics + r-ensembldb + r-experimenthub + r-genomicfeatures + r-genomicranges + r-s4vectors + r-singlecellexperiment + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/scRNAseq") + (synopsis "Collection of public single-cell RNA-seq datasets") + (description + "This package contains gene-level counts for a collection of public +@code{scRNA-seq} datasets, provided as @code{SingleCellExperiment} objects +with cell- and gene-level metadata.") + (license license:cc0))) + (define-public r-scry (package (name "r-scry") -- cgit v1.2.3 From cc0fb54f7794bf770bff21c0d56c709bf2578b7f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 5 Jan 2024 10:55:25 +0100 Subject: gnu: emacs-ess: Fix build (part 2). * gnu/packages/statistics.scm (emacs-ess)[arguments]<#:phases>: Use a different process in order to disable two tests. This is a followup to 3c1f25fc7b3cd1942c33a48e71697f94c4c86bc2. Change-Id: I78ee735ef7ee1dea86af602dc714d88bf8185da5 --- gnu/packages/statistics.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d5747ef9f7..712b1a9c37 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6805,6 +6805,12 @@ Java package that provides routines for various statistical distributions.") (arguments (let ((base-directory "/share/emacs/site-lisp")) (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) #:make-flags #~(list (string-append "PREFIX=" #$output) (string-append "ETCDIR=" #$output #$base-directory "/etc") @@ -6828,18 +6834,26 @@ Java package that provides routines for various statistical distributions.") (string-append all "(skip-unless nil)\n")) ...))))) (disable-tests (list "test/ess-test-inf.el" - "test/ess-test-r.el" - "test/ess-test-r-eval.el") + "test/ess-test-r.el") ("ess--derive-connection-path" "ess-eval-line-test" "ess-eval-region-test" "ess-mock-remote-process" "ess-r-load-ESSR-github-fetch-no" "ess-r-load-ESSR-github-fetch-yes" - "ess-r-eval-ns-env-roxy-tracebug-test" - "ess-r-eval-sink-freeze-test" "ess-set-working-directory-test" - "ess-test-r-startup-directory"))))) + "ess-test-r-startup-directory"))) + ;; The two tests below use a different syntax. + (emacs-batch-edit-file "test/ess-test-r-eval.el" + '(progn + (mapc (lambda (test) + (goto-char (point-min)) + (search-forward (format "etest-deftest %s " test)) + (beginning-of-line) + (kill-sexp)) + '("ess-r-eval-ns-env-roxy-tracebug-test" + "ess-r-eval-sink-freeze-test")) + (basic-save-buffer))))) (replace 'check (lambda _ (invoke "make" "test"))))))) (native-inputs -- cgit v1.2.3 From b43e11643cf3b28a1d53b0779cdd737e7d77193d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 5 Jan 2024 11:08:21 +0100 Subject: gnu: emacs-tagedit: Fix build. * gnu/packages/emacs-xyz.scm (emacs-tagedit)[arguments]: Add phases to remove a spurious require. Change-Id: I37fe4fb9ed0a44514d650d709a49f0e4ae20cbef --- 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 979c55bb99..be34f2ef42 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10105,6 +10105,13 @@ constants and units into an Emacs buffer.") (sha256 (base32 "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb")))) (build-system emacs-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-spurious-require + (lambda _ + (substitute* "tagedit.el" + (("\\(require 'assoc\\)") ""))))))) (propagated-inputs (list emacs-s emacs-dash)) (home-page "https://github.com/magnars/tagedit") -- cgit v1.2.3 From ac69b423865f12310cef5662d9c303aa4b90c869 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 5 Jan 2024 11:10:16 +0100 Subject: gnu: emacs-tagedit: Improve package style. * gnu/packages/emacs-xyz.scm (emacs-tagedit)[propagated-inputs]: Reorder inputs alphabetically. [synopsis, description]: Use proper capitalization. Change-Id: I9361a67d61165bf1492df8760f632fef3fe107aa --- 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 be34f2ef42..f2953295c2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10113,12 +10113,12 @@ constants and units into an Emacs buffer.") (substitute* "tagedit.el" (("\\(require 'assoc\\)") ""))))))) (propagated-inputs - (list emacs-s emacs-dash)) + (list emacs-dash emacs-s)) (home-page "https://github.com/magnars/tagedit") - (synopsis "Some paredit-like features for html-mode") + (synopsis "Some Paredit-like features for HTML mode") (description - "This package provides a collection of paredit-like functions for editing -in @code{html-mode}.") + "This package provides a collection of Paredit-like functions for editing +in HTML mode.") (license license:gpl3+))) (define-public emacs-slime -- cgit v1.2.3 From 03ae69f5874b68f7b74ff678d0aa9b25eaf4569f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 12:12:33 +0100 Subject: gnu: onnx: Relax requirement on python-protobuf. * gnu/packages/machine-learning.scm (onnx)[arguments]: Add phase 'relax-requirements. (onnx-for-torch2)[arguments]: Delete 'relax-requirements phase. (onnx-optimizer)[arguments]: Same. Change-Id: If3bde363d06f16f2b82e175076041441d29e8d6e --- gnu/packages/machine-learning.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 14fc2a0a72..b4651c80e5 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-2023 Ricardo Wurmus +;;; Copyright © 2015-2024 Ricardo Wurmus ;;; Copyright © 2016, 2020-2023 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel @@ -1151,6 +1151,11 @@ in terms of new algorithms.") (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + ;; Does this difference really matter? + (substitute* "requirements.txt" + (("3.20.1") "3.20.2")))) (add-before 'build 'pass-cmake-arguments (lambda* (#:key outputs #:allow-other-keys) ;; Pass options to the CMake-based build process. @@ -1235,7 +1240,13 @@ operators and standard data types.") '(begin (delete-file-recursively "third_party") (substitute* "onnx/backend/test/runner/__init__.py" - (("urlretrieve\\(.*") "raise unittest.SkipTest('Skipping download')\n")))))))) + (("urlretrieve\\(.*") "raise unittest.SkipTest('Skipping download')\n")))))) + (arguments + ;; reuse build system tweaks + (substitute-keyword-arguments (package-arguments onnx) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'relax-requirements))))))) (define-public python-onnx ;; This used to be called "python-onnx" because it provided nothing but @@ -1262,7 +1273,12 @@ operators and standard data types.") (modules '((guix build utils))) (snippet '(delete-file-recursively "third_party")))) (build-system python-build-system) - (arguments (package-arguments onnx)) ;reuse build system tweaks + (arguments + ;; reuse build system tweaks + (substitute-keyword-arguments (package-arguments onnx) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'relax-requirements))))) (native-inputs (list cmake python-pytest python-pytest-runner python-nbval python-coverage)) -- cgit v1.2.3 From 9476bf870190aaff796043c6d74b60843dff3c4f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 15:25:11 +0100 Subject: gnu: scvelo: Disable two broken tests. * gnu/packages/bioinformatics.scm (scvelo)[build-system]: Use pyproject-build-system. [arguments]: Disable test_perfect_fit and test_perfect_fit_2d tests because they fail with unexpected results; use G-expression. Change-Id: Ied22a2bc044167012ffaaee15a9626e9f5bccdd5 --- gnu/packages/bioinformatics.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2ceb0190b6..fa22399136 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -20521,24 +20521,28 @@ aligner.") (uri (pypi-uri "scvelo" version)) (sha256 (base32 "0h5ha1459ljs0qgpnlfsw592i8dxqn6p9bl08l1ikpwk36baxb7z")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#: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"))) - (replace 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - ;; The discovered test file names must match the names of the - ;; compiled files, so we cannot run the tests from - ;; /tmp/guix-build-*. - (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/lib/python3.10/site-packages/scvelo/core/tests/") - (invoke "pytest" "-v")))))))) + (list + #:test-flags + ;; XXX: these two tests fail for unknown reasons + '(list "-k" "not test_perfect_fit and not test_perfect_fit_2d") + #: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"))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + ;; The discovered test file names must match the names of the + ;; compiled files, so we cannot run the tests from + ;; /tmp/guix-build-*. + (with-directory-excursion + (string-append #$output + "/lib/python3.10/site-packages/scvelo/core/tests/") + (apply invoke "pytest" "-v" test-flags)))))))) (propagated-inputs (list python-anndata python-hnswlib -- cgit v1.2.3 From 5cec983e043259d2b13c194bff0a70459eed11d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 17:17:33 +0100 Subject: gnu: r-edger: Update to 4.0.5. * gnu/packages/bioconductor.scm (r-edger): Update to 4.0.5. Change-Id: Ibf41684a81da1a842f1a8e41309113fb50db6ef9 --- 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 bf38afb762..a7af5c42ce 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7324,13 +7324,13 @@ global-scaling and full-quantile normalization.") (define-public r-edger (package (name "r-edger") - (version "4.0.3") + (version "4.0.5") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "0sz46pwa1bsqrff2igswfhhj1fcwzn34zrlawy4fnb58z48kccb0")))) + "16cghh83v14jdq5n6xkm3jxj87n6l6zrxjgqdwb2ffgc26vkpb7w")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5dbfd2db62354d96eb69d30a66422f362688ebbb Mon Sep 17 00:00:00 2001 From: Yuval Langer Date: Sat, 16 Dec 2023 02:09:20 +0200 Subject: gnu: Add guile-srfi-133. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-srfi-133): New variable. Co-authored-by: Ludovic Courtès Change-Id: I9466a7def7a90aeabf40c92bd8d78608e8011021 --- gnu/packages/guile-xyz.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index afd8900848..328c2cdf18 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3565,6 +3565,80 @@ structures. This package re-uses the SRFI sample implementation.") ;; contains ISC code from the SRFI sample implementation license:isc)))) +(define-public guile-srfi-133 + (package + (name "guile-srfi-133") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/scheme-requests-for-implementation/srfi-133") + (commit "db81a114cd3e23375f024baec15482614ec90453"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a7srl72291yah0aj6rwddhj041v2spximhknjj7hczlparsrm7f")))) + (build-system guile-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-create-and-delete-files + (lambda _ + (rename-file "vectors" "srfi") + (rename-file "srfi/vectors-test.scm" "srfi/srfi-test.scm") + (rename-file "srfi/vectors-impl.scm" "srfi/srfi-impl.scm") + (with-output-to-file "srfi/srfi-133.scm" + (lambda () + (display "(define-module (srfi srfi-133) + #:replace (;; Constructors + vector-copy + + ;; Mutators + vector-fill! vector-copy! + + ;; Conversion + vector->list list->vector) + #:export (;; Constructors + vector-unfold vector-unfold-right vector-reverse-copy + vector-append vector-concatenate vector-append-subvectors + + ;; Predicates + vector-empty? vector= + + ;; Iteration + vector-fold vector-fold-right vector-map vector-map! + vector-for-each vector-count vector-cumulate + + ;; Searching + vector-index vector-index-right vector-skip vector-skip-right + vector-binary-search vector-any vector-every vector-partition + + ;; Mutators + vector-swap! vector-reverse! + vector-reverse-copy! vector-unfold! vector-unfold-right! + + ;; Conversion + reverse-vector->list reverse-list->vector + vector->string string->vector)) + +(include \"srfi-impl.scm\")"))) + (for-each (lambda (filename) + (delete-file filename)) + '("tests/run.scm" + "srfi/vectors.sld" + "srfi/vectors.scm"))))))) + (native-inputs + (list guile-3.0)) + (home-page "https://github.com/scheme-requests-for-implementation/srfi-133") + (synopsis "R7RS-compatible vector library for Guile") + (description + "This package provides a Guile implementation of +@uref{https://srfi.schemers.org/srfi-133/srfi-133.html, SRFI-133}, a +comprehensive library of vector operations.") + (license license:expat))) + (define-public guile-srfi-145 (package (name "guile-srfi-145") -- cgit v1.2.3 From 5279bd453f354cbbaafff44e46c6fa03a39bc10a Mon Sep 17 00:00:00 2001 From: Yuval Langer Date: Mon, 11 Dec 2023 03:00:50 +0200 Subject: gnu: Add guile-srfi-232. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-srfi-232): New variable. Signed-off-by: Ludovic Courtès Change-Id: Id5b3511d51a7f8f391231c2129bec96b78887880 --- gnu/packages/guile-xyz.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 328c2cdf18..75e3754046 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3840,6 +3840,56 @@ Either represents the concept of values which are either correct (Right) or errors (Left).") (license license:expat)))) +(define-public guile-srfi-232 + (package + (name "guile-srfi-232") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/scheme-requests-for-implementation/srfi-232") + (commit "c3f580d220778cd71492aba4fdd0c7040968e705"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lp4zcqjjj6hwfh3ix71wak1nffgg4npzsg7cdxfn9hf6iwf9xby")))) + (build-system guile-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-and-delete-things + (lambda _ + (let* ((srfi-directory (string-append #$output "/srfi"))) + (mkdir-p "srfi") + (with-output-to-file "srfi/srfi-232.scm" + (lambda () + (display "(define-library (srfi srfi-232) + (export curried define-curried) + (import (only (guile) import) + (scheme base)) + (include \"../srfi-232.scm\"))"))) + (for-each (lambda (filename) + (delete-file filename)) + '("test-body.scm" + "test-chibi.scm" + "test-srfi-64.scm")))))))) + (native-inputs + (list guile-3.0)) + (home-page "https://github.com/scheme-requests-for-implementation/srfi-232") + (synopsis "Flexible curried procedures") + (description + " This package provides an implementation of +@uref{https://srfi.schemers.org/srfi-232/srfi-232.html, SRFI-232}, which +describes @code{curried}, a variant of @code{lambda} that creates true curried +procedures which also behave just like ordinary Scheme procedures. They can +be applied to their arguments one by one, all at once, or anywhere in between, +without any novel syntax. @code{curried} also supports nullary and variadic +procedures, and procedures created with it have predictable behavior when +applied to surplus arguments.") + (license license:expat))) + (define-public emacsy (package (name "emacsy") -- cgit v1.2.3 From 41f0de65b498477da0783a69226dfa92848897ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 17:44:54 +0100 Subject: gnu: Add trinityrnaseq. * gnu/packages/bioinformatics.scm (trinityrnaseq): New variable. Change-Id: Ia2c45623576e7e2e51b040b1001b1dd88c1324bb --- gnu/packages/bioinformatics.scm | 121 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fa22399136..4bed2e4fe8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -130,6 +130,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) @@ -4999,6 +5000,126 @@ be of arbitrary length. Repeats with pattern size in the range from 1 to 2000 bases are detected.") (license license:agpl3+))) +(define-public trinityrnaseq + (package + (name "trinityrnaseq") + (version "2.13.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trinityrnaseq/trinityrnaseq.git") + (commit (string-append "Trinity-v" version)) + (recursive? #true))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qszrxqbx4q5pavpgm4rkrh1z1v1mf7qx83vv3fnlqdmncnsf1gv")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:modules + '((guix build gnu-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-1)) + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + ;; Do not require version.h, which triggers a local build of a + ;; vendored htslib. + (substitute* "trinity-plugins/bamsifter/Makefile" + (("sift_bam_max_cov.cpp htslib/version.h") + "sift_bam_max_cov.cpp")))) + (add-after 'build 'build-plugins + (lambda _ + ;; Run this in the subdirectory to avoid running the + ;; tests right here. + (with-directory-excursion "trinity-plugins" + (invoke "make" "plugins")))) + ;; The install script uses rsync, provides no overrides for the + ;; default location at /usr/local/bin, and patching it would change + ;; all lines that do something. + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + (let ((share (string-append #$output "/share/trinity/")) + (bin (string-append #$output "/bin/"))) + (mkdir-p bin) + (copy-recursively "." share) + (delete-file (string-append share "/Chrysalis/build/CMakeFiles/CMakeOutput.log")) + (delete-file (string-append share "/Inchworm/build/CMakeFiles/CMakeOutput.log")) + + (wrap-program (string-append share "Trinity") + `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) + `("PERL5LIB" ":" = (,(getenv "PERL5LIB"))) + `("PYTHONPATH" ":" = (,(getenv "GUIX_PYTHONPATH"))) + `("PATH" ":" = + ,(cons (string-append share "/trinity-plugins/BIN") + (filter-map (match-lambda + ((name . dir) + (string-append dir "/bin"))) + inputs)))) + (symlink (string-append share "Trinity") + (string-append bin "Trinity")))))))) + (inputs + (list blast+ + bowtie + fastqc + hisat + htslib + icedtea-8 + jellyfish + kallisto + multiqc + perl + perl-uri-escape + python-numpy + python-wrapper + r-ape + r-argparse + r-biobase + r-ctc + r-deseq2 + r-edger + r-fastcluster + r-glimma + r-goplot + r-goseq + r-gplots + r-minimal + r-qvalue + r-rots + r-sm + r-tidyverse + rsem + salmon + samtools + sra-tools + star + zlib)) + (propagated-inputs + (list coreutils + gzip + which)) + (native-inputs (list cmake)) + (home-page "https://github.com/trinityrnaseq/trinityrnaseq/wiki") + (synopsis "Trinity RNA-Seq de novo transcriptome assembly") + (description "Trinity assembles transcript sequences from Illumina RNA-Seq +data. Trinity represents a novel method for the efficient and robust de novo +reconstruction of transcriptomes from RNA-seq data. Trinity combines three +independent software modules: Inchworm, Chrysalis, and Butterfly, applied +sequentially to process large volumes of RNA-seq reads. Trinity partitions +the sequence data into many individual de Bruijn graphs, each representing the +transcriptional complexity at a given gene or locus, and then processes each +graph independently to extract full-length splicing isoforms and to tease +apart transcripts derived from paralogous genes.") + (license license:bsd-3))) + (define-public repeat-masker (package (name "repeat-masker") -- cgit v1.2.3 From cb15b360aabb9a572dd8f4a697e50cba4481902e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 17:55:17 +0100 Subject: gnu: Add python-snaptools. * gnu/packages/bioinformatics.scm (python-snaptools): New variable. Change-Id: I4f4b32cbbb64472e65d2d88184173b6e1a75e8d2 --- 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 4bed2e4fe8..a363298386 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2366,6 +2366,40 @@ sequencing data and the end result are tables of UMI-unique DamID and CEL-Seq counts.") (license license:expat))) +(define-public python-snaptools + (package + (name "python-snaptools") + (version "1.4.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "snaptools" version)) + (sha256 + (base32 + "1s5373g5jjbshh3q39zy7dlxr7nda6ksxq9d1gw46h82c4fsmfbn")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-future + python-h5py + python-louvain + python-numpy + python-pybedtools + python-pysam)) + (home-page "https://github.com/r3fang/SnapTools") + (synopsis "Tools for processing snap files" ) + (description + "@code{SnapTools} can operate on snap files the following types of +operations: + +@itemize +@item index the reference genome before alignment; +@item align reads to the corresponding reference genome; +@item pre-process by convert pair-end reads into fragments, checking the + mapping quality score, alingment and filtration; +@item create the cell-by-bin matrix. +@end itemize") + (license license:asl2.0))) + (define-public python-bioframe (package (name "python-bioframe") -- cgit v1.2.3 From 657fd534fb3ba3daf3852780f5f1eb9be50e6842 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 18:11:52 +0100 Subject: gnu: Add python-louvain-igraph. * gnu/packages/graph.scm (python-louvain-igraph): New variable. Change-Id: I773ee905af81731a12b60ebfa0c2f94e9cb50c45 --- gnu/packages/graph.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index a40b580417..26b9d03a73 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, 2023 Ricardo Wurmus +;;; Copyright © 2017-2024 Ricardo Wurmus ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021, 2022 Efraim Flashner @@ -426,6 +426,48 @@ algorithm for community detection in large networks.") large networks.") (license license:gpl3+))) +(define-public python-louvain-igraph + (package + (name "python-louvain-igraph") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vtraag/louvain-igraph") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j2ybihvvzggwjb9zvm829aqb5b94q10h8bw6v0h42xd9w75z9sv")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'find-igraph + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + (substitute* "setup.py" + (("/usr/include/igraph") + (string-append #$(this-package-input "igraph") + "/include/igraph")))))))) + (propagated-inputs (list python-igraph)) + (inputs (list igraph)) + (native-inputs + (list python-ddt + python-setuptools-scm + pkg-config)) + (home-page "https://github.com/vtraag/louvain-igraph") + (synopsis "Implementation of the Louvain algorithm") + (description "This package implements the Louvain algorithm for community +detection in C++ and exposes it to Python. Besides the relative flexibility +of the implementation, it also scales well, and can be run on graphs of +millions of nodes (as long as they can fit in memory). The core function is +@code{find_partition} which finds the optimal partition using the louvain +algorithm for a number of different methods.") + (license license:gpl3+))) + (define-public faiss (package (name "faiss") @@ -449,8 +491,8 @@ large networks.") (build-system cmake-build-system) (arguments `(#:configure-flags - (list "-DBUILD_WITH_GPU=OFF" ; thanks, but no thanks, CUDA. - "-DBUILD_TUTORIAL=OFF") ; we don't need those + (list "-DBUILD_WITH_GPU=OFF" ; thanks, but no thanks, CUDA. + "-DBUILD_TUTORIAL=OFF") ; we don't need those #:phases (modify-phases %standard-phases (add-after 'unpack 'prepare-build @@ -466,7 +508,7 @@ large networks.") '())))))) (substitute* "CMakeLists.txt" (("-m64") "") - (("-mpopcnt") "") ; only some architectures + (("-mpopcnt") "") ; only some architectures (("-msse4") (string-append (string-join features) -- cgit v1.2.3 From 9068dc9f29a81f8f061f66e1b1105361cea7242d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jan 2024 18:21:06 +0100 Subject: gnu: Add bustools. * gnu/packages/bioinformatics.scm (bustools): New variable. Change-Id: I24a936ad1d630663a41855a833e35fb9caa0155c --- 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 a363298386..7dbebcf3da 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -575,6 +575,30 @@ BED, GFF/GTF, VCF.") whole-genome bisulfite sequencing (WGBS) reads from directional protocol.") (license license:asl2.0))) +(define-public bustools + (package + (name "bustools") + (version "0.43.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BUStools/bustools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "068kjlc4d528269nl5mc3j8h2c95r1v545d3fi1iw1ckg8rba0hg")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) ;no test target + (inputs (list zlib)) + (home-page "https://bustools.github.io") + (synopsis "Tools for working with BUS files") + (description "bustools is a program for manipulating BUS files for single +cell RNA-Seq datasets. It can be used to error correct barcodes, collapse +UMIs, produce gene count or transcript compatibility count matrices, and is useful +for many other tasks.") + (license license:bsd-2))) + (define-public cellsnp-lite ;; Last release is from November 2021 and does not contain fixes. (let ((commit "0885d746b0b1ea65c8ef92f8943ca7669ca9734a") -- cgit v1.2.3 From dd865cb515b752d04794c44cd1a6e1b941b7aafe Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Tue, 2 Jan 2024 00:25:10 +0100 Subject: gnu: Update my copyright. * gnu/packages/linux.scm: Update copyright header. Change-Id: Idaa9c90e05eba9d0f417f11e86a80bf8119a7a65 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c359cb300..18fb2ffeab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -76,7 +76,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 dan ;;; Copyright © 2023 Foundation Devices, Inc. -;;; Copyright © 2023 Wilko Meyer +;;; Copyright © 2023, 2024 Wilko Meyer ;;; Copyright © 2023 Jaeme Sifat ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From 8873e4cc1671e68fcd0d1f3c6a36815492d751d8 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Tue, 2 Jan 2024 00:25:11 +0100 Subject: gnu: linux-libre 6.6: Update to 6.6.9. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.9. (linux-libre-6.6-pristine-source, deblob-scripts-6.6): Update hashes. Change-Id: Id68891618879662b08e539f684482c4a8ef02541 Signed-off-by: Leo Famulari --- 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 18fb2ffeab..dfd47418b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -494,17 +494,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.6-version "6.6.8") +(define-public linux-libre-6.6-version "6.6.9") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts linux-libre-6.6-version linux-libre-6.6-gnu-revision (base32 "0g8m0rb15b0231dv8ji456s75a67szsaim71may3yprplycz6pav") - (base32 "1hg3ck1j8288fhlhcvhgs1zzwh3i62nfvphw7x3vsaqr75kiwbjp"))) + (base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh"))) + (hash (base32 "1cs8ym3yq9czjx6sbxpmn16l6a577mc4c1ff7nk1p2gw1jpnbg4f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -- cgit v1.2.3 From 9abca269ddc5cd1b689ec6137e6def2402ccce19 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Tue, 2 Jan 2024 00:25:12 +0100 Subject: gnu: linux-libre 6.1: Update to 6.1.70. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.70. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. Change-Id: I5bcebd56f3b4d6cc7ad7419264c78c56c6f3ff95 Signed-off-by: Leo Famulari --- 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 dfd47418b2..0fe64bacf3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -512,17 +512,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-6.1-version "6.1.69") +(define-public linux-libre-6.1-version "6.1.70") (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 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "1hdibv43xbn1lv83i6qjgfmf1bvqxvq17fryfsq4r4sjgs9212js"))) + (base32 "1jg2v1nxd6i5x536vmd1l14xhpzrcimpmjfipb1zkrwil102y25f"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby"))) + (hash (base32 "1vxgardfm2fi4c7zkxpljqicllfqqnp835a9lyb7dh2nchk6a4zd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit v1.2.3 From deeb7d1f53d7ddfa977b3eadd760312bbd0a2509 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Jan 2024 13:12:31 -0500 Subject: gnutls: Update to 3.8.2 (fixes CVE-2023-5981). * gnu/packages/tls.scm (gnutls): Graft with gnutls-3.8.2. (gnutls-3.8.1): Replace with... (gnutls-3.8.2): ... this. Remove obsolete set-path-max phase, and make the variable private. Change-Id: Ib5cd276c9ecc87d1adc2f4f9633d49676cfe856d --- gnu/packages/tls.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 208a7ff640..806a761d9b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen -;;; Copyright © 2020, 2021, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos @@ -200,7 +200,7 @@ living in the same process.") (package (name "gnutls") (version "3.7.7") - (replacement gnutls-3.8.1) + (replacement gnutls-3.8.2) (source (origin (method url-fetch) ;; Note: Releases are no longer on ftp.gnu.org since the @@ -305,11 +305,11 @@ required structures.") (define-deprecated/public-alias gnutls-latest gnutls) ;; Replacement for gnutls@3.7.7 to address GNUTLS-SA-2020-07-14 / -;; CVE-2023-0361 -(define-public gnutls-3.8.1 +;; CVE-2023-0361 and GNUTLS-SA-2023-10-23 / CVE-2023-5981. +(define gnutls-3.8.2 (package (inherit gnutls) - (version "3.8.1") + (version "3.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnutls/v" @@ -318,20 +318,7 @@ required structures.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "1742jiigwsfhx7nj5rz7dwqr8d46npsph6b68j7siar0mqarx2xs")))) - (arguments - (if (target-hurd?) - ;; Fix reference to undefined 'PATH_MAX'. This is fixed in GnuTLS - ;; commit 3b6ec1e01de4e96d36276dfe34ee9e183f285264. - (substitute-keyword-arguments (package-arguments gnutls) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (add-after 'unpack 'set-path-max - (lambda _ - (substitute* "lib/pathbuf.h" - (("^#define GNUTLS_PATH_MAX PATH_MAX") - "#define GNUTLS_PATH_MAX 8192\n"))))))) - (package-arguments gnutls))))) + "0xzgmp1ck5ifvdki4jg29r278w2p1m3a0qz38g99v6zsdw0yarg7")))))) (define-public gnutls/dane ;; GnuTLS with build libgnutls-dane, implementing DNS-based -- cgit v1.2.3 From 67c9cdfdce6b33bf0f3f90ad1f8db82086c8142a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:36:51 -0500 Subject: gnu: ffmpeg: Update to 6.1.1 (fixes CVE-2023-47342, CVE-2023-47344). * gnu/packages/video.scm (ffmpeg): Update to 6.1.1. Fixes CVE-2023-47342 and CVE-2023-47344 (see: https://ffmpeg.org/security.html) Change-Id: I5196a62fc56341809ed597389b431dae32bd50da --- 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 6da4897a57..e70aa5352e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1657,14 +1657,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "6.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp")))) + "0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146")))) (outputs '("out" "debug")) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From ce0d654bb5bbb94881b8d20ca9f1ca9cc8511e90 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Jan 2024 17:03:58 -0500 Subject: gnu: mpd: Update to 0.23.15. * gnu/packages/mpd.scm (mpd): Update to 0.23.15. Change-Id: I584f33d5be6b1b62a97b014a758dfbecc8a6fa99 --- 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 e462f0f01d..c5e8f2bdff 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -117,7 +117,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.23.14") + (version "0.23.15") (source (origin (method url-fetch) (uri @@ -126,7 +126,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1lh9nn4a7ng6i08df7rbs8c4nbgmz883pss9p2gswa6m4rsadfc5")))) + "06k60ych9crifyx6zfc98hdcihixq5nba1c9rwngib6ik8ik40am")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From c0e21e523d93081153a2ffc91e5a9f06afe62b91 Mon Sep 17 00:00:00 2001 From: Leo Nikkilä Date: Fri, 1 Dec 2023 05:58:44 +0200 Subject: gnu: mpd: Add D-Bus dependency. MPD requires D-Bus for Zeroconf support. Avahi is currently included as a dependency, but Zeroconf isn't actually enabled due D-Bus. This also enables udisks support. Before this change, `mpd -V' returns: Other features: epoll icu inotify ipv6 systemd tcp un After this change, `mpd -V' returns: Other features: avahi dbus udisks epoll icu inotify ipv6 systemd tcp un * gnu/packages/mpd.scm (mpd): Add D-Bus dependency. [inputs]: Add dbus. Signed-off-by: Maxim Cournoyer --- gnu/packages/mpd.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c5e8f2bdff..e16c6bb964 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -162,6 +162,7 @@ interfacing MPD in the C, C++ & Objective C languages.") boost chromaprint curl + dbus elogind expat ffmpeg -- cgit v1.2.3 From 837e5f737e263f7f0da8bef84ec347e209839f1e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Jan 2024 03:03:30 +0000 Subject: gnu: go-github-com-hjson-hjson-go: Fix commit. This package was updated in ada2152893eda2301890e6a438c3e9fb4e0f190d and moved with lower version which broke yggdrasil. Author: Artyom V. Poptsov AuthorDate: Wed Nov 1 00:15:16 2023 +0300 Commit: Christopher Baines CommitDate: Fri Nov 3 10:14:06 2023 +0000 gnu: go-github-com-hjson-hjson-go: Update to 4.3.1. * gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Update to 4.3.1. Change-Id: Iee2aef614686cbf79f388e2dd9435745d5502e2a Signed-off-by: Andrew Tropin --- gnu/packages/golang-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7759916c35..3e60bfaf33 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -870,7 +871,7 @@ protocol.") (define-public go-github-com-hjson-hjson-go (package (name "go-github-com-hjson-hjson-go") - (version "3.1.0") + (version "4.3.1") (source (origin (method git-fetch) @@ -879,7 +880,7 @@ protocol.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + (base32 "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) (build-system go-build-system) (arguments '(#:import-path "github.com/hjson/hjson-go")) -- cgit v1.2.3 From 50514b8d5559d78f542fb97b476736cada61cec2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Jan 2024 03:03:31 +0000 Subject: gnu: yggdrasil: Sort inputs alphabetically. * gnu/packages/networking.scm (yggdrasil)[propagated-inputs]: Sort alphabetically to ease maintenance. Change-Id: I336307433842bd1dce0cfb62d93be767e0a92dbb Signed-off-by: Andrew Tropin --- gnu/packages/networking.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c3796f7328..bf72fd7de2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4450,31 +4450,31 @@ QUIC protocol.") #:deep? #true))) (cons go-golang-org-x-sys-0.8 (map p - (list go-golang-zx2c4-com-wireguard - go-golang-org-x-text - go-golang-org-x-net - go-golang-org-x-crypto - go-golang-org-x-tools - go-netns - go-netlink + (list go-github-com-arceliar-ironwood + go-github-com-arceliar-phony go-github-com-bits-and-blooms-bitset go-github-com-bits-and-blooms-bloom - go-github-com-quic-go-quic-go + go-github-com-cheggaaa-pb-v3 + go-github-com-fatih-color + go-github-com-gologme-log + go-github-com-hashicorp-go-syslog go-github-com-hjson-hjson-go - go-github-com-olekukonko-tablewriter - go-github-com-mitchellh-mapstructure - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-mattn-go-colorable - go-github-com-kardianos-minwinsvc go-github-com-hjson-hjson-go - go-github-com-hashicorp-go-syslog - go-github-com-gologme-log - go-github-com-fatih-color - go-github-com-cheggaaa-pb-v3 + go-github-com-kardianos-minwinsvc + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-mitchellh-mapstructure + go-github-com-olekukonko-tablewriter + go-github-com-quic-go-quic-go go-github-com-vividcortex-ewma - go-github-com-arceliar-phony - go-github-com-arceliar-ironwood))))) + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-text + go-golang-org-x-tools + go-golang-zx2c4-com-wireguard + go-netlink + go-netns))))) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") -- cgit v1.2.3 From e994bc0abf39db228fa61f1aaf24840c19c47647 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Jan 2024 03:03:32 +0000 Subject: gnu: yggdrasil: Remove duplicated input. * gnu/packages/networking.scm (yggdrasil)[propagated-inputs]: Remove duplicated go-github-com-hjson-hjson-go. Change-Id: I13b1808ffcbf80a2b4fd17188a8b62557a943d24 Signed-off-by: Andrew Tropin --- gnu/packages/networking.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bf72fd7de2..9844430656 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4459,7 +4459,6 @@ QUIC protocol.") go-github-com-gologme-log go-github-com-hashicorp-go-syslog go-github-com-hjson-hjson-go - go-github-com-hjson-hjson-go go-github-com-kardianos-minwinsvc go-github-com-mattn-go-colorable go-github-com-mattn-go-isatty -- cgit v1.2.3 From 9891dd881489be65980f326d87ca580c0001c778 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Sat, 30 Dec 2023 20:25:50 +0100 Subject: gnu: Add qcheckers. * gnu/packages/games.scm (qcheckers): New variable. Change-Id: I399ac6aa0c268a8fcf68aabe716fe2d2d5e42605 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/games.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8117886583..4a2b2fd832 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -79,6 +79,7 @@ ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic ;;; Copyright © 2023 gemmaro +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -10115,6 +10116,36 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (home-page "https://github.com/bernds/q5Go") (license license:gpl2+))) +(define-public qcheckers + (package + (name "qcheckers") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/portnov/qcheckers") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05wzql6abzdf6l0vdzki4rfy2zn31mcplh1wkw3ddk8w81pvaymw")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "qmake" + (string-append "PREFIX=" #$output))))))) + (inputs (list qtbase-5 qtsvg-5)) + (home-page "https://portnov.github.io/qcheckers/") + (synopsis "Qt-based checkers boardgame") + (description "QCheckers, formely known as KCheckers, is a is a Qt version +of the classic boardgame checkers (also known as draughts).") + (license license:gpl2+))) + (define-public xmoto (package (name "xmoto") -- cgit v1.2.3 From 157ad70182ade608203e9c0a42fb45b022039698 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 6 Jan 2024 15:30:57 +0100 Subject: gnu: p2pool: Update to 3.10. * gnu/packages/finance.scm (p2pool): Update to 3.10. Change-Id: Iebc332cdbd1204a43d5cb53b78994c11191429ca --- 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 749f741710..eadaa46102 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2300,7 +2300,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "3.7") + (version "3.10") (source (origin (method git-fetch) @@ -2309,7 +2309,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "1sghdk8yq8si0bq0z83fji48q8yrq0ymvsxbbh5mscw6223syrjq")) + (sha256 (base32 "0lp9slfwaq3wp4x6xpsiazam5lv6dz57m20adzlzzk0anb1ascr0")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively -- cgit v1.2.3 From aec0dea1f63fe3b7e64bb611274590d570205b95 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 30 Dec 2023 16:14:53 +0800 Subject: gnu: catfish: Update to 4.18.0. * gnu/packages/xfce.scm (catfish): Update to 4.18.0. Change-Id: Ibc9a9774b20d918ea7aa17404d093d2043ce6855 --- 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 73889c945e..5bde8de444 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -216,7 +216,7 @@ to share commonly used Xfce widgets among the Xfce applications.") (define-public catfish (package (name "catfish") - (version "4.16.4") + (version "4.18.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -224,7 +224,7 @@ to share commonly used Xfce widgets among the Xfce applications.") "/catfish-" version ".tar.bz2")) (sha256 (base32 - "1z5m9f4cj473n68rrhhbkq3x5df5k394qp4n27lqqyny6k2h2p3f")))) + "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From fc973ae399584c4a345b6c3080c611d64b321495 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 30 Dec 2023 16:17:37 +0800 Subject: gnu: elementary-xfce-icon-theme: Update to 0.18. * gnu/packages/xfce.scm (elementary-xfce-icon-theme): Update to 0.18. Change-Id: Ibcb595e20553c18893db3cad5d95bd85ef1c04fc --- 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 5bde8de444..a44a871ba2 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -270,7 +270,7 @@ it to your needs by using several command line options.") (define-public elementary-xfce-icon-theme (package (name "elementary-xfce-icon-theme") - (version "0.17") + (version "0.18") (source (origin (method git-fetch) (uri @@ -280,7 +280,7 @@ it to your needs by using several command line options.") (file-name (git-file-name name version)) (sha256 (base32 - "0jlawp6rg55w5cm4d7836r660i2pnc5gkzpdjsq7w5875i85arzm")))) + "124bdgghkjkpcsfn9a2ad6zqy233pi9jqmv8w8a3ha6q3al2s11s")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From e661c1f31d66dcc06316ae58850c8c0773845e6b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 31 Dec 2023 11:26:17 +0800 Subject: gnu: bbcsdl: Update to 1.39a. * gnu/packages/game-development.scm (bbcsdl): Update to 1.39a. [arguments]: Replace bundled "DejaVuSans-Oblique.ttf" with symlink in the 'install' phase. Change-Id: I7b7c8ec8a8216812e1c7a1fab74695b14f4d3ca2 --- gnu/packages/game-development.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 73f93a9992..37d8442222 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -3269,16 +3269,16 @@ progresses the level, or you may regenerate tiles as the world changes.") (define-public bbcsdl (package (name "bbcsdl") - (version "1.35a") + (version "1.39a") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rtrussell/BBCSDL/") - (commit "b9b2a3eb438cb799edb2766055b3c38e9518e3e3"))) + (commit "93b0ffae960f4c4f45fdc2202bc6e83ee5ca277c"))) (file-name (git-file-name name version)) (sha256 (base32 - "1d03xmhrl6ba6w0vwfk46mpyc9d0w3bixxj2d4irx7wl7bh3bfic")))) + "03ga14k2hbhflnaynbyx9lwlbxlzx3rv6zqq21yhl183s6d4c0wa")))) (build-system gnu-build-system) (arguments (list @@ -3318,6 +3318,7 @@ progresses the level, or you may regenerate tiles as the world changes.") inputs (string-append "share/fonts/truetype/" font)) (string-append opt "/lib/" font))) '("DejaVuSans.ttf" "DejaVuSansMono.ttf" + "DejaVuSans-Oblique.ttf" "FreeSans.ttf" "FreeMono.ttf" "FreeSerif.ttf")) (mkdir bin) (symlink (string-append opt "/bbcsdl") -- cgit v1.2.3 From 2538a773c53e0f7fce4de0c49b6ec1d41acc25c0 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 31 Dec 2023 17:15:57 +0800 Subject: plan9port: Install into "$output/plan9" instead of "$output". This fixes . * gnu/packages/plan9.scm (plan9port)[arguments]: Add 'strip-directories'. : Use "$output/plan9" as PLAN9_TARGET. Remove 'wrap-executables phase, instead invoke "./INSTALL -c" to change hard-coded /usr/local/plan9 paths. Change-Id: I7e24f64445c9b6cdcc0d803239e10b226931a845 --- gnu/packages/plan9.scm | 130 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 67 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index f78c26e215..5af0f2f74f 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -94,73 +94,69 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'setup - (lambda _ - (delete-file "src/cmd/mk/mk.pdf") - (substitute* "src/cmd/acme/acme.c" - (("/lib/font/bit/lucsans/euro.8.font") - (string-append #$output - "/font/fixed/unicode.5x8.font")) - (("/lib/font/bit/lucm/unicode.9.font") - (string-append #$output - "/font/fixed/unicode.6x9.font"))) - (substitute* (find-files "src") - (("/lib/font/bit") - (string-append #$output "/font"))) - (substitute* "bin/9c" - (("which") - (which "which"))) - (substitute* "src/cmd/fontsrv/freetyperules.sh" - (("'\\$i'/freetype2") - (string-append "-I" - #$freetype - "/include/freetype2"))) - (with-output-to-file "LOCAL.config" - (lambda _ - (format #t "CC9=~a~%" #$(cc-for-target)) - (format #t "FONTSRV=fontsrv~%"))) - (setenv "X11" - #$libx11) - (setenv "PLAN9" - (getcwd)) - (setenv "PLAN9_TARGET" - #$output))) - (delete 'configure) ;no configure - (replace 'build - (lambda _ - (invoke "./INSTALL" "-b"))) - (replace 'install - (lambda _ - (for-each (lambda (x) - (let ((out (string-append #$output - "/" x))) - (mkdir-p out) - (copy-recursively x out))) - ;; TODO: use external sky and dict packages - '("bin" "face" - "font" - "include" - "lib" - "lp" - "mail" - "man" - "ndb" - "plumb" - "tmac" - "troff" - "postscript")) - (install-file "rcmain" #$output))) - (add-after 'install 'wrap-executables - (lambda _ - (for-each (lambda (exe) - (wrap-program exe - `("PLAN9" ":" prefix - (,#$output)))) - (find-files - (string-append #$output "/bin"))))) - ;; Plan9 doesn't compress man pages - (delete 'compress-documentation)))) + #:strip-directories #~'("plan9/bin") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'setup + (lambda _ + (let ((dest (string-append #$output "/plan9"))) + (delete-file "src/cmd/mk/mk.pdf") + (substitute* "src/cmd/acme/acme.c" + (("/lib/font/bit/lucsans/euro.8.font") + (string-append dest + "/font/fixed/unicode.5x8.font")) + (("/lib/font/bit/lucm/unicode.9.font") + (string-append dest + "/font/fixed/unicode.6x9.font"))) + (substitute* (find-files "src") + (("/lib/font/bit") + (string-append dest "/font"))) + (substitute* "bin/9c" + (("which") + (which "which"))) + (substitute* "src/cmd/fontsrv/freetyperules.sh" + (("'\\$i'/freetype2") + (string-append "-I" + #$freetype + "/include/freetype2"))) + (with-output-to-file "LOCAL.config" + (lambda _ + (format #t "CC9=~a~%" #$(cc-for-target)) + (format #t "FONTSRV=fontsrv~%"))) + (setenv "X11" #$libx11) + (setenv "PLAN9" (getcwd)) + (setenv "PLAN9_TARGET" dest)))) + (delete 'configure) ;no configure + (replace 'build + (lambda _ + (invoke "./INSTALL" "-b"))) + (replace 'install + (lambda _ + (invoke "./INSTALL" "-c") + (let ((dest (getenv "PLAN9_TARGET"))) + (for-each (lambda (x) + (let ((out (string-append dest "/" x))) + (mkdir-p out) + (copy-recursively x out))) + ;; TODO: use external sky and dict packages + '("bin" "face" + "font" + "include" + "lib" + "lp" + "mail" + "man" + "ndb" + "plumb" + "tmac" + "troff" + "postscript")) + (install-file "rcmain" dest) + (mkdir-p (string-append #$output "/bin")) + (symlink (string-append dest "/bin/9") + (string-append #$output "/bin/9"))))) + ;; Plan9 doesn't compress man pages + (delete 'compress-documentation)))) (native-inputs (list perl which)) (inputs (list bash-minimal ;for 'wrap-program' fontconfig libx11 libxext libxt)) -- cgit v1.2.3 From 25bcf4eda05b501758b11a53823867dc500ac7d1 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 31 Dec 2023 17:18:44 +0800 Subject: plan9port: Update to 0.1.0-1.f8681ac. * gnu/packages/plan9.scm (plan9port): Update to 0.1.0-1.f8681ac. Change-Id: I35eb40eb4213478db48989d8ed2c5865e7ce7afc --- gnu/packages/plan9.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 5af0f2f74f..b2d8d75471 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -73,8 +73,8 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (define-public plan9port ;; no releases - (let ((commit "cc4571fec67407652b03d6603ada6580de2194dc") - (revision "0")) + (let ((commit "f8681acb374fa0d5ed1568dbedb00a4abe1ca6f1") + (revision "1")) (package (name "plan9port") (version (git-version "0.1.0" revision commit)) @@ -86,7 +86,7 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (file-name (git-file-name name version)) (sha256 (base32 - "1g2kzlghcghs560na6xalfsjq5zwp015wv9wk8wxn26981zs759x")) + "01343jvn8kr63i78h8xlgscn6wihdsr44xzh1cylvhigjbqw8n2x")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively '("font/luc" ;nonfree -- cgit v1.2.3 From 11136fb0ad90937516ce0421a352e3a4513fca3b Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Sun, 31 Dec 2023 14:17:33 +0100 Subject: gnu: Add morris. * gnu/packages/games.scm (morris): New variable. Change-Id: I35158d1f5cfd5f7267dcb8295d8102e2dd3f575c Signed-off-by: Liliana Marie Prikler --- gnu/packages/games.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4a2b2fd832..4883d33374 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10446,6 +10446,31 @@ sunfish, but is written in C rather than Python. It also has TUI tools for using any UCI engine and also to connect UCI engines to Lichess.") (license license:agpl3+)))) +(define-public morris + (package + (name "morris") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/farindk/morris") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv")))) + (build-system glib-or-gtk-build-system) + (inputs (list automake autoconf pkg-config intltool + gnu-gettext libtool glib gtk+-2 boost)) + (arguments `(#:tests? #f)) + (home-page "http://nine-mens-morris.net/downloads.html") + (synopsis "Morris is an implementation of the board game Nine Men's Morris") + (description "Morris is an implementation of the board game Nine Men's Morris. +It supports not only the standard game, but also several rule-variants and different +board layouts. You can play against the computer, or simply use the program to +present the board, but play against another human opponent.") + (license license:gpl3))) + (define-public barrage (package (name "barrage") -- cgit v1.2.3 From 3b4e71c4734910f1850b40fa636cd7d52f2b0b5e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Dec 2023 15:08:45 +0100 Subject: gnu: dds: Update to 2.9.0-1.d2bc4c2. * gnu/packages/game-development.scm (dds): Update to 2.9.0-1.d2bc4c2. Change-Id: I3c6db4e81d70112f020f2d7a0f7db26069c7591f Signed-off-by: Liliana Marie Prikler --- gnu/packages/game-development.scm | 124 +++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 61 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 37d8442222..ea1adf0ecf 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -196,69 +196,71 @@ is used in some video games and movies.") (license license:zlib))) (define-public dds - (package - (name "dds") - (version "2.9.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dds-bridge/dds") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1iv09qic43nvla02lm8zgnkqpjgnc95p8zh3wyifmnmlh1rz02yj")))) - (build-system gnu-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "src"))) - (replace 'configure - ;; Configuration is done by copying the appropriate - ;; make file in the working directory. There is no - ;; configure script. - (lambda _ - (copy-file "Makefiles/Makefile_linux_shared" - "Makefile"))) - (replace 'check - ;; There is no "check" traget. We must compile - ;; a "dtest" program and apply it on a data set. - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (install-file "libdds.so" "../test") - (with-directory-excursion "../test" - (copy-file "Makefiles/Makefile_linux" - "Makefile") - (substitute* "Makefile" - (("-Werror") "")) - (invoke "make") - (invoke "./dtest" "-f" "../hands/list100.txt"))))) - (replace 'install - ;; "install" target merely moves ".so" file around - ;; the source directory. We install it in the store, - ;; along with all shipped documentation (which cannot - ;; be built from source unfortunately). - (lambda _ - (install-file "libdds.so" - (string-append #$output "/lib")) - (let ((doc (string-append #$output - "/share/doc/" - #$name "-" #$version))) - (install-file "../LICENSE" doc) - (copy-recursively "../doc" doc))))))) - (native-inputs - (list gawk procps)) - (inputs - (list boost)) - (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 + (let ((commit "d2bc4c2c703941664fc1d73e69caa5233cdeac18") + (revision "1")) + (package + (name "dds") + (version (git-version "2.9.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dds-bridge/dds") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ishbb69cvyv96xdxshnly0m5ydwljgdf8fwa1cr9rj2qj40q4rm")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "src"))) + (replace 'configure + ;; Configuration is done by copying the appropriate + ;; make file in the working directory. There is no + ;; configure script. + (lambda _ + (copy-file "Makefiles/Makefile_linux_shared" + "Makefile"))) + (replace 'check + ;; There is no "check" traget. We must compile + ;; a "dtest" program and apply it on a data set. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (install-file "libdds.so" "../test") + (with-directory-excursion "../test" + (copy-file "Makefiles/Makefile_linux" + "Makefile") + (substitute* "Makefile" + (("-Werror") "")) + (invoke "make") + (invoke "./dtest" "-f" "../hands/list100.txt"))))) + (replace 'install + ;; "install" target merely moves ".so" file around + ;; the source directory. We install it in the store, + ;; along with all shipped documentation (which cannot + ;; be built from source unfortunately). + (lambda _ + (install-file "libdds.so" + (string-append #$output "/lib")) + (let ((doc (string-append #$output + "/share/doc/" + #$name "-" #$version))) + (install-file "../LICENSE" doc) + (copy-recursively "../doc" doc))))))) + (native-inputs + (list gawk procps)) + (inputs + (list boost)) + (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 offers a wide range of functions, including par-score calculations.") - (license license:asl2.0))) + (license license:asl2.0)))) (define-public deutex (package -- cgit v1.2.3 From a8f2c03a60e7f3fa93d537dd81c98b2f11ceab81 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Dec 2023 15:08:46 +0100 Subject: gnu: Add redeal. * gnu/packages/games.scm (redeal): New variable. Change-Id: I89c000c7afdd594af3555bf23b0f028f99219ec3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4883d33374..6f4f8c14ac 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -231,6 +231,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system trivial) @@ -2368,6 +2369,55 @@ Every puzzle has a complete solution, although there may be more than one.") "PrBoom+ is a Doom source port developed from the original PrBoom project.") (license license:gpl2+))) +(define-public redeal + (let ((commit "e2e81a477fd31ae548a340b5f0f380594d3d0ad6") + (revision "1")) + (package + (name "redeal") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anntzer/redeal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vac36bg4ah9gs4hgmp745xq6nnmd7s71vsq99d72ng3sxap0wa3")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unbundle-dds + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "setup.py" + (("cmdclass=.*") "")) + (let ((libdds (search-input-file inputs "lib/libdds.so"))) + (substitute* "redeal/dds.py" + ((" and os.path.exists\\(dll_path\\)") "") + (("dll = DLL\\(dll_path\\)") + (format #f "dll = DLL(~s)" libdds)))))) + (add-after 'install 'install-examples + (lambda _ + (let* ((doc (string-append #$output "/share/doc/")) + (examples + (string-append doc #$name "-" #$version "/examples"))) + (mkdir-p examples) + (copy-recursively "examples" examples))))))) + (inputs (list dds `(,python "tk"))) + (propagated-inputs (list python-colorama)) + (home-page "https://github.com/anntzer/redeal") + (synopsis + "Deal generator for bridge card game, written in Python") + (description + "Redeal is a deal generator written in Python. It outputs deals +satisfying whatever conditions you specify --- deals with a double void, deals +with a strong 2♣ opener opposite a yarborough, etc. Using Bo Haglund's double +dummy solver, it can even solve the hands it has generated for you.") + (license license:gpl3)))) + (define-public retux (let ((release "1.6.1") (revision 0)) -- cgit v1.2.3 From 33e6572beea174a087809c02bd33ead97e14bf33 Mon Sep 17 00:00:00 2001 From: gemmaro Date: Sat, 6 Jan 2024 11:20:51 +0900 Subject: gnu: taisei: Use new package style. * gnu/packages/games.scm (taisei)[arguments]: Convert to list of G-Expressions. [license]: Reformat with guix style. Change-Id: I717a7e408f5ae274c5aafa0f3e20bb7bca377b3a Signed-off-by: Liliana Marie Prikler --- gnu/packages/games.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6f4f8c14ac..c4284e54c4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -78,7 +78,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic -;;; Copyright © 2023 gemmaro +;;; Copyright © 2023, 2024 gemmaro ;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. @@ -3447,12 +3447,12 @@ a C library, so they can easily be integrated into other programs.") (base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) (build-system meson-build-system) (arguments - `(#:build-type "release" ;comment out for bug-reporting (and cheats) - #:configure-flags - (list "-Dr_default=gles30" - "-Dr_gles20=true" - "-Dr_gles30=true" - "-Dshader_transpiler=true"))) + (list + #:build-type "release" ;comment out for bug-reporting (and cheats) + #:configure-flags #~(list "-Dr_default=gles30" + "-Dr_gles20=true" + "-Dr_gles30=true" + "-Dshader_transpiler=true"))) (native-inputs (list pkg-config python python-docutils python-pygments)) (inputs @@ -3475,14 +3475,15 @@ a C library, so they can easily be integrated into other programs.") "The player controls a character (one of three: Good, Bad, and Dead), dodges the missiles (lots of it cover the screen, but the character's hitbox is very small), and shoot at the adversaries that keep appear on the screen.") - (license (list ;;game - license:expat - ;;resources/00-taisei.pkgdir/bgm/ - ;;atlas/portraits/ - license:cc-by4.0 - ;;miscellaneous - license:cc0 - license:public-domain)))) + (license (list + ;; game + license:expat + ;; resources/00-taisei.pkgdir/bgm/ + ;; atlas/portraits/ + license:cc-by4.0 + ;; miscellaneous + license:cc0 + license:public-domain)))) (define-public cmatrix (package -- cgit v1.2.3 From b212e6934643e085f168a5364cb593f61aa616ba Mon Sep 17 00:00:00 2001 From: gemmaro Date: Sat, 6 Jan 2024 11:20:52 +0900 Subject: gnu: taisei: Update to 1.4. * gnu/packages/games.scm (taisei): Update to 1.4. [inputs]: Add zstd:lib. [native-inputs]: Add python-zstd. Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28 Signed-off-by: Liliana Marie Prikler --- gnu/packages/games.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c4284e54c4..cf2e38f49c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -194,6 +194,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -3436,15 +3437,15 @@ a C library, so they can easily be integrated into other programs.") (define-public taisei (package (name "taisei") - (version "1.3.2") + (version "1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/taisei-project/" "taisei/releases/download/v" version - "/taisei-v" version ".tar.xz")) + "/taisei-" version ".tar.xz")) (sha256 - (base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) + (base32 "1glrr99xiyz674d1izgvmk9w1zxanc94d34pacd0wya66bbml0nc")))) (build-system meson-build-system) (arguments (list @@ -3454,7 +3455,11 @@ a C library, so they can easily be integrated into other programs.") "-Dr_gles30=true" "-Dshader_transpiler=true"))) (native-inputs - (list pkg-config python python-docutils python-pygments)) + (list pkg-config + python + python-docutils + python-pygments + python-zstandard)) (inputs (list cglm freetype @@ -3468,7 +3473,8 @@ a C library, so they can easily be integrated into other programs.") sdl2-mixer shaderc spirv-cross - zlib)) + zlib + (list zstd "lib"))) (home-page "https://taisei-project.org/") (synopsis "Shoot'em up fangame and libre clone of Touhou Project") (description -- cgit v1.2.3