From 5eb1d1b6482e29239f1d40dfcb815cdc12a2bdf0 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Mon, 24 Apr 2023 20:54:31 +0200 Subject: [PATCH 01/27] gnu: dezyne: Add patch to avoid "Exec format error". This fixes In execvp of ./test/all/parse_import_order/run: Exec format error on shell scripts that lack a shebang. * gnu/packages/patches/dezyne-add-missing-shebangs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/dezyne.scm (dezyne): Use it. --- gnu/local.mk | 1 + gnu/packages/dezyne.scm | 2 + .../patches/dezyne-add-missing-shebangs.patch | 61 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 gnu/packages/patches/dezyne-add-missing-shebangs.patch diff --git a/gnu/local.mk b/gnu/local.mk index ee90d102ac7..24c08b792e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1049,6 +1049,7 @@ dist_patch_DATA = \ %D%/packages/patches/dee-vapi.patch \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ + %D%/packages/patches/dezyne-add-missing-shebangs.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index 303c3f0436c..c13374069fd 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages guile) @@ -37,6 +38,7 @@ (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) + (patches (search-patches "dezyne-add-missing-shebangs.patch")) (sha256 (base32 "1v0anwr0iic26ck796b29dfyj1dxkjf935g134z98s95hvzzrhm3")))) (inputs (list bash-minimal diff --git a/gnu/packages/patches/dezyne-add-missing-shebangs.patch b/gnu/packages/patches/dezyne-add-missing-shebangs.patch new file mode 100644 index 00000000000..bf88e95c8a2 --- /dev/null +++ b/gnu/packages/patches/dezyne-add-missing-shebangs.patch @@ -0,0 +1,61 @@ +Upstream status: Taken from upstream development. + +From aace425e41247c1dd6b16eb7eabce50be7310d15 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Mon, 24 Apr 2023 16:58:32 +0200 +Subject: [PATCH] DRAFT test: Add missing shebangs to run scripts. + +This fixes `make check' on current ci.guix.gnu.org. + +* test/all/parse_import_order/run, +test/all/parse_locations/run, +test/all/parse_peg_locations/run: Add #! /bin/sh. +--- + test/all/parse_import_order/run | 3 ++- + test/all/parse_locations/run | 3 ++- + test/all/parse_peg_locations/run | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/test/all/parse_import_order/run b/test/all/parse_import_order/run +index 6e231de4f9..c383e4f223 100755 +--- a/test/all/parse_import_order/run ++++ b/test/all/parse_import_order/run +@@ -1,6 +1,7 @@ ++#! /bin/sh + # Dezyne --- Dezyne command line tools + # +-# Copyright © 2022 Jan (janneke) Nieuwenhuizen ++# Copyright © 2022, 2023 Jan (janneke) Nieuwenhuizen + # + # This file is part of Dezyne. + # +diff --git a/test/all/parse_locations/run b/test/all/parse_locations/run +index 0b092b26dd..6c48ee1392 100755 +--- a/test/all/parse_locations/run ++++ b/test/all/parse_locations/run +@@ -1,7 +1,8 @@ ++#! /bin/sh + # Dezyne --- Dezyne command line tools + # + # Copyright © 2021 Paul Hoogendijk +-# Copyright © 2020, 2021 Jan (janneke) Nieuwenhuizen ++# Copyright © 2020, 2021, 2023 Jan (janneke) Nieuwenhuizen + # + # This file is part of Dezyne. + # +diff --git a/test/all/parse_peg_locations/run b/test/all/parse_peg_locations/run +index 5b5ced0bb4..5206a23db6 100755 +--- a/test/all/parse_peg_locations/run ++++ b/test/all/parse_peg_locations/run +@@ -1,6 +1,7 @@ ++#! /bin/sh + # Dezyne --- Dezyne command line tools + # +-# Copyright © 2020 Jan (janneke) Nieuwenhuizen ++# Copyright © 2020, 2023 Jan (janneke) Nieuwenhuizen + # + # This file is part of Dezyne. + # +-- +2.39.2 + From 74f2a0bd79579105c47d61ede8b8861b122620b0 Mon Sep 17 00:00:00 2001 From: Dominik Delgado Steuter via Guix-patches via Date: Wed, 19 Apr 2023 23:56:10 +0200 Subject: [PATCH 02/27] gnu: Add texstudio. * gnu/packages/tex.scm (texstudio): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c8f79235529..9e1b3e521ff 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2023 Thomas Albers Raviola ;;; Copyright © 2023 John Kehayias +;;; Copyright © 2023 Dominik Delgado Steuter ;;; ;;; This file is part of GNU Guix. ;;; @@ -8591,6 +8592,36 @@ PDF documents.") develop documents with LaTeX, in a single application.") (license license:gpl2+))) +(define-public texstudio + (package + (name "texstudio") + (version "4.5.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/texstudio-org/texstudio") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bzdcsc0273809hx04zqd2famq05q9rpvqcbqhkjqnqp9vxbisig")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f)) ;tests work only with debug build + (native-inputs + (list pkg-config + poppler-qt5 + qtdeclarative-5 + qtsvg-5 + qttools-5)) + (home-page "https://www.texstudio.org/") + (synopsis "Feature-packed LaTeX editor") + (description + "TeXstudio is an integrated writing environment for creating LaTeX +documents. It makes writing LaTeX comfortable by providing features such as +syntax-highlighting, an integrated viewer and reference checking.") + (license license:gpl3))) + (define-public dvisvgm (package (name "dvisvgm") From 81519a3ccf0a96a25c3bed4f7458eaf9fb67f8ce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 25 Apr 2023 01:04:33 +0200 Subject: [PATCH 03/27] gnu: emacs-posframe: Update to 1.4.2. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 1.4.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f46ccde1e81..4f8552860e4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17700,14 +17700,14 @@ the center of the screen and not at the bottom.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "02kw3d6760015q61sryw8k3zqdnzhcwwyfjfysbfs07cljkqpjnh")))) + (base32 "0ca43wgbr0n5ri7cyxjmn7blq59xq43rx9z9q02a2j4yn05w8nss")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments From 69e9349adc79b1d24ac7a3efb7664628c7ecd7da Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Thu, 20 Apr 2023 10:58:23 -0400 Subject: [PATCH 04/27] gnu: recoll: Update to 1.34.0. * gnu/packages/search.scm (recoll): Update to 1.34.0. [arguments]: Add --enable-recollq configure flag. Signed-off-by: Nicolas Goaziou --- gnu/packages/search.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 71609a21fa1..1829a0eeb82 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -421,14 +421,14 @@ Search Engine. It is written in C and based on GTK3.") (define-public recoll (package (name "recoll") - (version "1.32.7") + (version "1.34.0") (source (origin (method url-fetch) (uri (string-append "https://www.lesbonscomptes.com/recoll/" "recoll-" version ".tar.gz")) (sha256 - (base32 "1fkx6dk8s808ay4hf7ycfcs38kywmavsjqm02pwrnl8bpgsac26a")))) + (base32 "0s26b737brxp5hpqcwfxg19z40w6acnnr63ghrnzzjwxqz1ambkv")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -436,6 +436,7 @@ Search Engine. It is written in C and based on GTK3.") "--disable-python-module" "--without-systemd" "--with-inotify" + "--enable-recollq" (string-append "QMAKEPATH=" (assoc-ref %build-inputs "qtbase") "/bin/qmake")) #:phases From 14970395cc737231c1c4b91a904ffe3ec98a2c75 Mon Sep 17 00:00:00 2001 From: Dominik Delgado Steuter Date: Thu, 20 Apr 2023 17:46:39 -0500 Subject: [PATCH 05/27] gnu: Add python-gtts. * gnu/packages/python-xyz.scm (python-gtts): New variable. Co-authored-by: jgart Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6ea91a27195..dd1b4a64f27 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -135,6 +135,7 @@ ;;; Copyright © 2023 Gabriel Wicki ;;; Copyright © 2023 Amade Nemes ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2023 Dominik Delgado Steuter ;;; ;;; This file is part of GNU Guix. ;;; @@ -20840,6 +20841,30 @@ while only declaring the test-specific fields.") several utilities, as well as an API for building localization tools.") (license license:gpl2+))) +(define-public python-gtts + (package + (name "python-gtts") + (version "2.3.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "gTTS" version)) + (sha256 + (base32 + "1jsg1prpzr7gj5sn385mkv2v1i8xfc83ycm87hvsi2j0y366plps")))) + (build-system pyproject-build-system) + (arguments + ;; Disable tests that require internet. + (list #:test-flags '(list "-k" "not net"))) + (native-inputs + (list python-pytest python-testfixtures python-click python-requests)) + (home-page "https://github.com/pndurette/gTTS") + (synopsis "Google Translate text-to-speech interface") + (description + "Google Text-to-Speech (gTTS) is a Python library and CLI tool to +interface with the Google Translate text-to-speech API. It lets you write +spoken MP3 data to a file, a file-like object (bytestring) for further audio +manipulation, or @code{stdout}.") + (license license:expat))) (define-public python-packaging (package/inherit python-packaging-bootstrap From 621dad1a374375329442446b025bcac4652f07ee Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Thu, 20 Apr 2023 22:11:00 +0300 Subject: [PATCH 06/27] gnu: audacious: Update to 4.3. * gnu/packages/music.scm (audacious): Update to 4.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b5690f3ad94..dc6f7fbbca0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2023 Jonathan Brielmaier ;;; Copyright © 2023 Antero Mejr ;;; Copyright © 2023 Sharlatan Hellseher +;;; Copyright © 2023 Yovan Naumovski ;;; ;;; This file is part of GNU Guix. ;;; @@ -205,14 +206,14 @@ (define-public audacious (package (name "audacious") - (version "4.2") + (version "4.3") (source (origin (method url-fetch) (uri (string-append "https://distfiles.audacious-media-player.org/" "audacious-" version ".tar.bz2")) (sha256 - (base32 "1cq4brifp992dhg0sbf180jjdv137g5wk8ac7hmzx0d4f3j09czy")))) + (base32 "14chrsh1dacw5r2qpzw0rhg2lchpbya90y96r6w0vry78p44sn17")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -256,7 +257,7 @@ (uri (string-append "https://distfiles.audacious-media-player.org/" "audacious-plugins-" version ".tar.bz2")) (sha256 - (base32 "0zs1k91z272ql49qr7kxlxb0lajamc9ra41pgj3ynh8h7afgd83g")))) + (base32 "1ilzz2fv0mirlfhzhrcbccv996slj65z1ifibzrx0w5xqk4gcbk6")))) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for gdbus-codegen ("pkg-config" ,pkg-config))) @@ -290,6 +291,7 @@ mesa mpg123 neon + opusfile pulseaudio sdl2 soxr From e1c1090a0a32c7af9ee86da7fbc51bc769cf9ead Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 20 Apr 2023 17:09:00 -0500 Subject: [PATCH 07/27] gnu: purescript: Update to 0.15.8. * gnu/packages/purescript.scm (purescript): Update to 0.15.8. Signed-off-by: Nicolas Goaziou --- gnu/packages/purescript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index 0a5eccc4594..3ae078db756 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -34,13 +34,13 @@ (define-public purescript (package (name "purescript") - (version "0.15.7") + (version "0.15.8") (source (origin (method url-fetch) (uri (hackage-uri "purescript" version)) (sha256 - (base32 "1krjkgmxpfqf5a1jqs7qbg6r7ball1464zw6vgrdfzl9057c6l4f")))) + (base32 "1h5d5hjc9hrlk718lf62qzaq1l6ppr0l2b3fl78csyh86cihh750")))) (build-system haskell-build-system) (properties '((upstream-name . "purescript"))) (inputs (list ghc-aeson From 83167bc1315c40835a76d2e1ab9511833744f53b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 23 Apr 2023 17:19:41 +0200 Subject: [PATCH 08/27] gnu: giac: Update to 1.9.0-45. * gnu/packages/algebra.scm (giac): Update to 1.9.0-45. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 76b3da80840..fdca6da95e4 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -329,7 +329,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.9.0-43") + (version "1.9.0-45") (source (origin (method url-fetch) @@ -341,7 +341,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "1fqs9nxjj0kimisfsfhscgzfmc470lyzm63hwla7ka2iqq3s7bp3")))) + (base32 "0yxsl1vvwcbpwcmzp9v9rfm9djmapab0nhb3gs7zmjv5yvzbgj4d")))) (build-system gnu-build-system) (arguments (list From 1d3bba01eadea98c88dcfeca7e24de920d377eb9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 23 Apr 2023 17:22:00 +0200 Subject: [PATCH 09/27] gnu: fet: Update to 6.9.0. * gnu/packages/education.scm (fet): Update to 6.9.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 60aced1be41..acd1297a727 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -582,7 +582,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.8.7") + (version "6.9.0") (source (origin (method url-fetch) @@ -591,7 +591,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "0wcl2scgqf1vj0zy5an7hhhmsl5j1y605fcz0d7ylbzw5ixnbf1m")))) + (base32 "1lnw58ga1ldhqfznclmk9l21698pg152w3slq2cwmr69ywqr5wys")))) (build-system gnu-build-system) (arguments (list From 2ad1a3731f1c85f2e5a79b08a61d42b003dc30d8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 23 Apr 2023 17:24:12 +0200 Subject: [PATCH 10/27] gnu: lagrange: Update to 1.15.8. * gnu/packages/web-browsers.scm (lagrange): Update to 1.15.8. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 7b06e54cdfc..99895ea8828 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -697,7 +697,7 @@ is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.15.5") + (version "1.15.8") (source (origin (method url-fetch) @@ -705,7 +705,7 @@ is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "187h42qqddf7595bzf0wb2vc9yd76ad99vbwl9sdhmy8d6qma6gs")) + (base32 "0ss1d522f4nnzwhjix58qfbmva9w5j6y6lhlqmjrshv18b1ay4bm")) (modules '((guix build utils))) (snippet '(begin From 7decb4c39458898d494ffca02e5330ef71ddbecb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 4 Apr 2023 23:50:04 +0200 Subject: [PATCH 11/27] gnu: Add deal. * gnu/packages/games.scm (deal): New variable. --- gnu/packages/games.scm | 79 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 727854afdaa..6ede4fbf8a9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1152,6 +1152,83 @@ cows can think too: all you have to do is run @command{cowthink}. If you're tired of cows, a variety of other ASCII-art messengers are available.") (license license:gpl3+))) +(define-public deal + (package + (name "deal") + (version "3.1.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gtwilliams/deal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wcrx3yq5ycnkdnygcq80ljpgc9iwyrr8zayprzvbibvj77hdm0c")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:make-flags + #~(let* ((tcl #$(this-package-input "tcl")) + (tcl-version #$(version-major+minor (package-version tcl)))) + (list "CPPFLAGS += -O3" + (string-append "CC=" #$(cc-for-target)) + (string-append "TCL_INCL=" tcl "/include") + (string-append "LDFLAGS=-L" tcl "/lib" + " -ltcl" tcl-version + " -lm") + (string-append "DATA_DIR=" #$output "/share/deal/"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'locate-pod2man + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr/bin/pod2man") + (search-input-file inputs "/bin/pod2man"))))) + (delete 'configure) ;no configure script + ;; Prevent the error: "Makefile:248: Make.dep: No such file + ;; or directory". + (add-before 'build 'create-Make.dep + (lambda _ + (call-with-output-file "Make.dep" (const #t)))) + ;; There is no install target. Do everything manually. + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin")) + (man (string-append #$output "/share/man/man6")) + (data (string-append #$output "/share/deal"))) + (install-file "deal" bin) + (install-file "deal.6" man) + (install-file "deal.tcl" data) + (for-each (lambda (d) + (let ((target (string-append data "/" d))) + (mkdir-p target) + (copy-recursively d target))) + '("ex" "format" "input" "lib"))))) + ;; Tests need to happen once the data is properly installed + ;; because the "deal.tcl" script file location is hard-coded + ;; in the "deal" binary. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) + (native-inputs + (list perl)) + (inputs + (list tcl)) + (home-page "https://bridge.thomasoandrews.com/deal/") + (synopsis "Bridge hand generator") + (description + "This program generates bridge hands. It can be told to generate only +hands satisfying conditions like being balanced, having a range of +High Cards Points (HCP), controls, or other user-definable properties. +Hands can be output in various formats, like PBN for feeding to other +bridge programs, Deal itself, or split up into a file per player for +practise.") + (license (list license:gpl2+ + license:gpl1+ ;ansidecl.h + license:bsd-3)))) ;random.c + (define-public falltergeist (package (name "falltergeist") @@ -1167,7 +1244,7 @@ tired of cows, a variety of other ASCII-art messengers are available.") "05cg58i2g32wbmrvmdsicic8xs83gld3qr1p7r4lnlckcl1l7dy4")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests provided + `(#:tests? #f)) ; no tests provided (native-inputs (list pkg-config)) (inputs `(("sdl" ,(sdl-union (list sdl2 sdl2-image From 960647f0161c2c99ea3417d129662181e882cfeb Mon Sep 17 00:00:00 2001 From: Mekeor Melire Date: Mon, 24 Apr 2023 10:12:49 +0000 Subject: [PATCH 12/27] gnu: emacs-password-store: Update to 2.3.0. * gnu/packages/emacs-xyz.scm (emacs-password-store): Update to 2.3.0. [propagated-inputs]: Remove emacs-auth-source-pass. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4f8552860e4..14b5a19bd9f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20962,50 +20962,50 @@ close, copy, cut, paste, undo, redo.") (license license:gpl3+))) (define-public emacs-password-store - (let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") - (revision "1")) - (package - (name "emacs-password-store") - ;; The emacs package version does not match the password-store version, - ;; even though it is part of the same repository. When updating, look - ;; at the version declared in password-store.el. - (version (git-version "2.1.4" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.zx2c4.com/password-store") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")))) - (build-system emacs-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'extract-el-file - (lambda _ - (copy-file "contrib/emacs/password-store.el" - "password-store.el") - (delete-file-recursively "contrib") - (delete-file-recursively "man") - (delete-file-recursively "src") - (delete-file-recursively "tests"))) - (add-after 'extract-el-file 'patch-executables - (lambda* (#:key inputs #:allow-other-keys) - (emacs-substitute-variables "password-store.el" - ("password-store-executable" - (search-input-file inputs "/bin/pass")))))))) - (inputs - (list password-store)) - (propagated-inputs - (list emacs-auth-source-pass emacs-s emacs-with-editor)) - (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") - (synopsis "Password store (pass) support for Emacs") - (description - "This package provides functions for working with pass (\"the -standard Unix password manager\").") - (license license:gpl3+)))) + (package + (name "emacs-password-store") + ;; The emacs package version does not match the password-store version, + ;; even though it is part of the same repository. When updating, look at + ;; the version declared in password-store.el. + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zx2c4.com/password-store") + (commit "26d2dae04bb76a87be6960861c10432820cd5d55"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pkx6pgkkpddxrshzq3x8ilfwqjw9gawnbbskcbssxc88wrpbcjb")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'extract-el-file + (lambda _ + (copy-file "contrib/emacs/password-store.el" + "password-store.el") + (delete-file-recursively "contrib") + (delete-file-recursively "man") + (delete-file-recursively "src") + (delete-file-recursively "tests"))) + (add-after 'extract-el-file 'patch-executables + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "password-store.el" + ("password-store-executable" + (search-input-file inputs "/bin/pass")))))))) + (inputs + (list password-store)) + (propagated-inputs + (list emacs-s emacs-with-editor)) + (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") + (synopsis "Password store (pass) support for Emacs") + (description + "This package provides functions for working with pass (\"the + standard Unix password manager\").") + (license license:gpl3+))) (define-public emacs-password-store-otp (package From 08c63aac53b47d21ea2b7618601fe9118c1e4992 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Apr 2023 10:32:46 +0300 Subject: [PATCH 13/27] gnu: slimevolley: Build with gcc-7. * gnu/packages/games.scm (slimevolley)[native-inputs]: Add gcc-7. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6ede4fbf8a9..288d470c8c2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8717,7 +8717,8 @@ and cooperative.") ;; missing from command line". #:configure-flags (list "-DCMAKE_EXE_LINKER_FLAGS=-lm"))) (native-inputs - `(("gettext" ,gettext-minimal))) + `(("gcc-7" ,gcc-7) + ("gettext" ,gettext-minimal))) (inputs `(("sdl" ,(sdl-union (list sdl sdl-image sdl-net sdl-ttf))))) (home-page "https://slime.tuxfamily.org/") From 2ebe270927051abe993ccbbac7fbd2664003dbca Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Apr 2023 10:36:45 +0200 Subject: [PATCH 14/27] gnu: sbcl-njson: Update to 1.0.0. * gnu/packages/lisp-xyz.scm (sbcl-njson): Update to 1.0.0. --- gnu/packages/lisp-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7b0531bcca..9465155d81a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -26267,7 +26267,7 @@ instead of #'FOO. (define-public sbcl-njson (package (name "sbcl-njson") - (version "0.2.3") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -26276,12 +26276,12 @@ instead of #'FOO. (file-name (git-file-name "cl-njson" version)) (sha256 (base32 - "11s6qq719zlrpy0kb1id9qnrm73yrc3xi560k4s8cj79fy4nj0ib")))) + "1apwccrvivrq57rlrw6vffrn3a5hikk10s0dndszjw5ri29b3qyd")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-cl-json)) (native-inputs (list sbcl-lisp-unit2)) (arguments - '(#:asd-systems '("njson" "njson/aliases" "njson/cl-json"))) + '(#:asd-systems '("njson" "njson/cl-json"))) (home-page "https://github.com/atlas-engineer/njson") (synopsis "JSON handling framework for Common Lisp") (description @@ -26293,7 +26293,6 @@ loadable as additional system. @code{cl-json} is included by default, though. Conveniences that NJSON provides are: @itemize - @item @code{encode} and @code{decode} as single entry points for JSON reading and writing, be it from streams/string/files, or from those. From ffb7ea6b630717072bd29eb16195a2bae85d5498 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Apr 2023 10:44:16 +0200 Subject: [PATCH 15/27] gnu: sbcl-serapeum: Update to 20230423. * gnu/packages/lisp-xyz.scm (sbcl-serapeum): Update to 20230423. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9465155d81a..b202c992b1b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9762,8 +9762,8 @@ implementation specific equivalent.") (sbcl-package->ecl-package sbcl-trivial-macroexpand-all)) (define-public sbcl-serapeum - (let ((commit "fbfd2a219fb22c70c1c5b86910c5106fd0f9b447") - (revision "8")) + (let ((commit "ce6c3b320cde38767caea2b86afa87ff280b9c11") + (revision "9")) (package (name "sbcl-serapeum") (version (git-version "0.0.0" revision commit)) @@ -9776,7 +9776,7 @@ implementation specific equivalent.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0gz70hwlsyawmm7j85yjg449hpy57w5jdd7rkal6lhmmfnl0nsbp")))) + (base32 "0vpxgvxniyn12wkhmav2iq4x4bj12hjrsf2ajwcapp0sh06qg1j9")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria From 27e1451891db22067f569c60065a7ee1091a6993 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 24 Apr 2023 12:53:34 +0200 Subject: [PATCH 16/27] gnu: python-trio: Downgrade to 0.21. Version 0.22 deprecates MultiError, which trips up testsuites of dependents. python-anyio for instance is explicitly not compatible with >= 0.22, so stick to an older release. * gnu/packages/python-xyz.scm (python-trio): Downgrade to 0.21. [arguments]: Disable failing test. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dd1b4a64f27..95898c31da7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24837,13 +24837,13 @@ project.") (define-public python-trio (package (name "python-trio") - (version "0.22.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (pypi-uri "trio" version)) (sha256 - (base32 "1kxa9v0cds0xnklvzppv4ix4xg81r73p5pm4qlvv2iqa832z2s6f")))) + (base32 "04qwzy4295ajxpns0hrmn3asma80sjpimzpb3i877vwynsvkjgsj")))) (build-system python-build-system) (arguments `(#:phases @@ -24876,6 +24876,8 @@ _cyclic_garbage" " and not test_locals_destroyed_promptly_on_cancel" " and not test_ipython_exc_handler" " and not test_for_leaking_fds" + ;; Signals don’t work in the build sandbox. + " and not test_open_signal_receiver" ;; These try to raise KeyboardInterrupt which does not work ;; in the build environment. " and not test_ki_self" From e619750d0072677df12a4f8eb87e714a6de4e491 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 24 Apr 2023 12:53:48 +0200 Subject: [PATCH 17/27] Revert "gnu: python-pytest-trio: Update to 0.8.0." Not compatible with python-trio 0.8. This reverts commit 27a4bfbd07022ebabc352a419c7588fcfc881d88. --- gnu/packages/python-check.scm | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 9ce093697d7..10466028003 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1086,42 +1086,33 @@ simpler.") (define-public python-pytest-trio (package (name "python-pytest-trio") - (version "0.8.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-trio" version)) (sha256 - (base32 "0bmmdyjqj5v4a637i4rzm55crv6v3nj268as6x9nr7m76rixnqw3")))) + (base32 "0c8cqf9by2884riksrqymqfp2g1d2d798a2zalcw9hmf34c786y0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "setup.py" - (("pytest >= 7.2.0") - "pytest")))) (replace 'check (lambda* (#:key tests? inputs outputs #:allow-other-keys) (when tests? - (invoke - "pytest" "-W" "error" "-ra" "-v" "--pyargs" - "pytest_trio" "--verbose" "--cov" "-k" - (string-append - ;; These tests require network. - "not test_async_yield_fixture_with_nursery " - "and not test_try " - ;; No keyboard interrupt in our build environment. - "and not test_actual_test " - ;; These tests fail due to unclean teardown (see: - ;; https://github.com/python-trio/pytest-trio/issues/122). - "and not crashed_teardown " - "and not test_error_collection ")))))))) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-W" "error" "-ra" "-v" "--pyargs" + "pytest_trio" "--verbose" "--cov" "-k" + (string-append + ;; Needs network + "not test_async_yield_fixture_with_nursery" + " and not test_try" + ;; No keyboard interrupt in our build environment. + " and not test_actual_test")))))))) (native-inputs (list python-hypothesis python-pytest python-pytest-cov)) (propagated-inputs - (list python-async-generator python-outcome python-pytest python-trio)) + (list python-async-generator python-outcome python-pytest python-trio)) (home-page "https://github.com/python-trio/pytest-trio") (synopsis "Pytest plugin for trio") (description From 54771a5b6a4ca8cad4e66e90756c82ac7f9e3c9b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 25 Apr 2023 08:34:44 +0200 Subject: [PATCH 18/27] gnu: python-anyio: Upgrade to 3.6.2. * gnu/packages/python-xyz.scm (python-anyio): Upgrade to 3.6.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 95898c31da7..38c182ca960 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25738,14 +25738,14 @@ standard error channel (stderr) in your program.") (define-public python-anyio (package (name "python-anyio") - (version "3.5.0") + (version "3.6.2") (source (origin (method url-fetch) (uri (pypi-uri "anyio" version)) (sha256 (base32 - "19m58805wir4i2s45dd5ynwlzb7ky1218isbir53gpqzzgigzbm0")))) + "08bljjq5xq0l9id36q3vvjgygirq7g7q2bs41hdg82p379khvsi5")))) (build-system python-build-system) (arguments `(#:phases From a50f0dc5ca14201d092afb4fb7b5c0b7ad9dbab0 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Tue, 18 Apr 2023 01:39:31 +0000 Subject: [PATCH 19/27] gnu: schismtracker: Update to 20221201. * gnu/packages/music.scm (schismtracker): Update to 20221201. [source]: Convert snippet to gexp. [arguments]: Convert to gexp, add configure flags for FLAC and Wayland support. [inputs]: Remove libx11, libxext, and sdl; add flac and sdl2. Signed-off-by: Christopher Baines --- gnu/packages/music.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dc6f7fbbca0..5d74200ca0f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4141,7 +4141,7 @@ modes available for improved Amiga ProTracker 2/3 compatibility.") (define-public schismtracker (package (name "schismtracker") - (version "20190805") + (version "20221201") (source (origin (method git-fetch) (uri (git-reference @@ -4150,26 +4150,27 @@ modes available for improved Amiga ProTracker 2/3 compatibility.") (file-name (git-file-name name version)) (sha256 (base32 - "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd")) + "11yy5zrdfvnwzwdwmc3s3lx1ymwiyp1si5mmv4h9qxipd9j96ijp")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. - `(begin - (substitute* "schism/version.c" - (("Schism Tracker built %s %s.*$") - (string-append "Schism Tracker version " ,version "\") ;"))) - #t)))) + #~(substitute* "schism/version.c" + (("Schism Tracker built %s %s.*$") + (string-append + "Schism Tracker version " #$version "\") ;")))))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'link-libm - (lambda _ (setenv "LIBS" "-lm") #t))))) + (list #:configure-flags #~(list "--with-flac=yes" "--with-x11=no") + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'link-libm + (lambda _ + (setenv "LIBS" "-lm")))))) (native-inputs (list autoconf automake python)) (inputs (list alsa-lib ; for asound dependency - libx11 libxext sdl)) + flac + sdl2)) (home-page "https://schismtracker.org") (synopsis "Oldschool sample-based music composition tool") (description From 8a5b6d53829fb94018c4aba15fc5571a3231c9a4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 25 Apr 2023 10:24:43 +0100 Subject: [PATCH 20/27] gnu: guix-build-coordinator: Update to 0-79.6a4e827. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-79.6a4e827. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5d2416f35b4..e78cdd9b3e2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1377,8 +1377,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "2efcd8b11954708f0b2f26ce6eb9d785e2f6aae4") - (revision "78")) + (let ((commit "6a4e827f304178d3d20c2037b4f1bf62e969ddce") + (revision "79")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1389,7 +1389,7 @@ environments.") (commit commit))) (sha256 (base32 - "1s7q3bn1cccbafd5b4dk0xn2r5qjabl7rclbwf7hfjj7csv8ag2i")) + "1w4iqmv493rs94dc2h6l3dnhx2513pz1fknzl6a643d2z6bkb7zj")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments From af3daff5ea27837193b968b2a42725fcac586b5f Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Tue, 25 Apr 2023 11:34:15 +0200 Subject: [PATCH 21/27] gnu: Add emacs-xonsh-mode. * gnu/packages/emacs-xyz.scm (emacs-xonsh-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 14b5a19bd9f..2f5d49e99f5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35136,6 +35136,31 @@ the TypeScript implementation.") service.") (license license:expat)))) +(define-public emacs-xonsh-mode + ;; There is no tagged release yet. + (let ((commit "7fa581524533a9b6b770426e4445e571a69e469d") + (revision "0")) + (package + (name "emacs-xonsh-mode") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/seanfarley/xonsh-mode") + (commit commit))) + (sha256 + (base32 "0lfi2372clkkzi4a940fwparsfhxxzb7bmysfd50n1myakgldri5")))) + (build-system emacs-build-system) + (home-page "https://github.com/seanfarley/xonsh-mode") + (synopsis "Emacs major mode for editing Xonsh files") + (description + "This package implements a major mode for Xonsh scripts. The basic +functionality includes syntax highlight for Xonsh operators. Files with the +@file{.xonshrc} or @file{.xsh} extension are automatically opened with this +mode.") + (license license:gpl3+)))) + (define-public emacs-monokai-theme (package (name "emacs-monokai-theme") From 26cdc7be84623b1e99d0d0f85124c7d4b4469c00 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 25 Apr 2023 11:37:49 +0200 Subject: [PATCH 22/27] gnu: emacs-auctex: Update to 13.2.0. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2f5d49e99f5..3d2f595894e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3715,14 +3715,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.1.10") + (version "13.2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0vxf3aw7j73d0cbfh8d5fp5gyi7vxq9vb7fqxmxxs24pvdnlym15")))) + (base32 "1jk05cca7lrwykj3by4s7c198bffam0mga7hgwmcz5bgxl79ijvf")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). From 11f078a1fb332c1ec242e1defe4c66b4f5ef5de6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 21 Apr 2023 21:53:29 +0100 Subject: [PATCH 23/27] gnu: Add trurl. * gnu/packages/curl.scm (trurl): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/curl.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 4bfb0572a33..0c404881d76 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -413,3 +414,39 @@ curl, curlie is what you are searching for. Curlie is a frontend to on features and performance. All @code{curl} options are exposed with syntax sugar and output formatting inspired from @code{httpie}.") (license license:expat))) + +(define-public trurl + (package + (name "trurl") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/curl/trurl") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mvkpjs6wnz5hzmp2iglik85zljrzglsa6fm839l78fhw89dg3w6")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list python)) + ;; Tests failed on older curl version + ;; (see https://github.com/curl/trurl/pull/165) + (inputs (list curl-7.84.0)) + (home-page "https://curl.se/trurl/") + (synopsis "Command line tool for URL parsing and manipulatio") + (description "@code{trurl} is a tool in a similar spirit of @code{tr} but +for URLs. Here, @code{tr} stands for translate or transpose. + +@code{trurl} is a command line tool that parses and manipulates URLs, designed +to help shell script authors everywhere.") + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")))) From c9c4fea7c5eb76e501b31c7d8bf9782c25bccc4a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 23 Apr 2023 19:47:25 +0200 Subject: [PATCH 24/27] gnu: nethack: Update to 3.6.7. * gnu/packages/games.scm (nethack): Update to 3.6.7. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 288d470c8c2..8966379f772 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2070,7 +2070,7 @@ watch your CPU playing while enjoying a cup of tea!") (define-public nethack (package (name "nethack") - (version "3.6.6") + (version "3.6.7") (source (origin (method url-fetch) @@ -2078,7 +2078,7 @@ watch your CPU playing while enjoying a cup of tea!") (string-append "https://www.nethack.org/download/" version "/nethack-" (string-join (string-split version #\.) "") "-src.tgz")) (sha256 - (base32 "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng")))) + (base32 "1cmc596x8maixi2bkx9kblp3daxw156ahnklc656dygbdpgngkwq")))) (native-inputs (list bison flex)) (inputs From 95787ffaa2e61ba76a4bbcdf13592c330bd9218b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 25 Apr 2023 11:46:45 +0200 Subject: [PATCH 25/27] gnu: emacs-eshell-syntax-highlighting: Update to 0.5. * gnu/packages/emacs-xyz.scm (emacs-eshell-syntax-highlighting): Update to 0.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3d2f595894e..b6cdbf5eabb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24945,7 +24945,7 @@ appropriate directory if no @code{eshell} session is active.") (define-public emacs-eshell-syntax-highlighting (package (name "emacs-eshell-syntax-highlighting") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -24954,7 +24954,7 @@ appropriate directory if no @code{eshell} session is active.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ib46fs70grx7rmw45i817v1dyvcj0b8xdmndvaz7papiimf6vrj")))) + (base32 "1la604vdj56s934j16yz8rlvzhd69433rrbgfyw9c7njxqldwcs7")))) (build-system emacs-build-system) (home-page "https://github.com/akreisher/eshell-syntax-highlighting") (synopsis "Add syntax highlighting to Eshell") From 0daa747de24a9739b32a13e0c55ae2bfe4666bf1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Apr 2023 13:48:17 +0300 Subject: [PATCH 26/27] gnu: alacritty: Patch reference to xdg-open. * gnu/packages/terminals.scm (alacritty)[arguments]: Add a phase to add an absolute reference to xdg-open. [inputs]: Add xdg-utils. --- gnu/packages/terminals.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ef9f16bce57..de8ea394733 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1450,6 +1450,10 @@ basic input/output.") (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "alacritty_terminal/Cargo.toml" (("0.22.0") "^0.23.0")))) + (add-after 'unpack 'patch-xdg-open + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "alacritty/src/config/ui_config.rs" + (("xdg-open") (search-input-file inputs "/bin/xdg-open"))))) (add-after 'configure 'add-absolute-library-references (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys) (let* ((glutin-name ,(package-name rust-glutin-0.26)) @@ -1547,6 +1551,7 @@ basic input/output.") ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-winapi" ,rust-winapi-0.3) + ("xdg-utils" ,xdg-utils) ("wayland" ,wayland))) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is From 472706ae2f9160833951a4e4bcc4c206e03097b0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 25 Apr 2023 14:25:49 +0200 Subject: [PATCH 27/27] gnu: python-asyncssh: Update to 2.13.1. Includes fix for python-cryptography>=39 disallowing SHA-1 signatures, which caused the testsuite to fail. * gnu/packages/ssh.scm (python-asyncssh): Update to 2.13.1. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b91e70aaed7..1b4b6472d2a 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -805,14 +805,14 @@ shell services and remote host selection.") (define-public python-asyncssh (package (name "python-asyncssh") - (version "2.11.0") + (version "2.13.1") (source (origin (method url-fetch) (uri (pypi-uri "asyncssh" version)) (sha256 (base32 - "0mkvyv2fmbdfnfdh7g2im0gxnp8hwxv5g1xdazfsipd9ggknrhsr")))) + "11zq9ywzgyljzihdygawzad0ydly0l32zvz11liwyi8bbk087fzb")))) (build-system python-build-system) (propagated-inputs (list python-cryptography python-pyopenssl python-gssapi