[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/19: gnu: slang: Update code style.
From: |
guix-commits |
Subject: |
19/19: gnu: slang: Update code style. |
Date: |
Wed, 20 Jul 2022 06:42:33 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 479d9ea0c2498e6dca1bd3790da8fca4acb83018
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jun 19 02:00:00 2022 +0200
gnu: slang: Update code style.
* gnu/packages/slang.scm (slang)[source]: Turn the snippet into a
G-expression and remove the trailing #t.
[arguments]: Use G-expressions. Use 'fix-configure-script phase
from most.
---
gnu/packages/slang.scm | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm
index 90945dd7c3..f335dc1a39 100644
--- a/gnu/packages/slang.scm
+++ b/gnu/packages/slang.scm
@@ -48,31 +48,29 @@
"06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"))
(modules '((guix build utils)))
(snippet
- '(begin
- (substitute* "src/Makefile.in"
- (("/bin/ln") "ln"))
- #t))))
+ #~(begin
+ (substitute* "src/Makefile.in"
+ (("/bin/ln") "ln"))))))
(build-system gnu-build-system)
(arguments
- '(#:parallel-tests? #f
- #:parallel-build? #f ; there's at least one race
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'reduce-array-test-size
- ;; Reduce the size of the array, otherwise the array.sl/array.slc
- ;; tests fails with "Unable to create a multi-dimensional array of
- ;; the desired size" on 32 bit systems.
- (lambda _
- (substitute* "src/test/array.sl"
- (("10000,10000,10000,10000,10000,10000")
- "10,10,10,10,10,10"))))
- (add-before 'configure 'substitute-before-config
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((ncurses (assoc-ref inputs "ncurses")))
- (substitute* "configure"
- (("MISC_TERMINFO_DIRS=\"\"")
- (string-append "MISC_TERMINFO_DIRS="
- "\"" ncurses "/share/terminfo" "\"")))))))))
+ (list #:parallel-tests? #f
+ #:parallel-build? #f ; race to build/use elfobj
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'reduce-array-test-size
+ ;; Fix array.sl/array.slc failure on 32-bit systems ("Unable
to
+ ;; to create a multi-dimensional array of the desired size").
+ (lambda _
+ (substitute* "src/test/array.sl"
+ (("10000,10000,10000,10000,10000,10000")
+ "10,10,10,10,10,10"))))
+ (add-before 'configure 'fix-configure-script
+ ;; Don't try to link to the long-obsolete (and gone)
-ltermcap.
+ (lambda _
+ (substitute* "configure"
+ (("(MISC_TERMINFO_DIRS)=.*" _ variable)
+ (format #f "~a=\"~a/share/terminfo\"\n" variable
+ #$(this-package-input "ncurses")))))))))
(inputs
(list readline zlib libpng pcre ncurses))
(home-page "https://www.jedsoft.org/slang/")
- 06/19: gnu: cpuid: Update to 20220620., (continued)
- 06/19: gnu: cpuid: Update to 20220620., guix-commits, 2022/07/20
- 07/19: gnu: cpuid: Use G-expressions., guix-commits, 2022/07/20
- 14/19: gnu: feh: Use G-expressions., guix-commits, 2022/07/20
- 13/19: gnu: feh: Update to 3.9., guix-commits, 2022/07/20
- 15/19: gnu: libdeflate: Update to 1.12., guix-commits, 2022/07/20
- 17/19: gnu: hdparm: Update to 9.64., guix-commits, 2022/07/20
- 05/19: gnu: dmidecode: Use G-expressions., guix-commits, 2022/07/20
- 08/19: gnu: diffoscope: Update to 219., guix-commits, 2022/07/20
- 11/19: gnu: hwinfo: Update to 21.82., guix-commits, 2022/07/20
- 16/19: gnu: libdeflate: Use G-expressions., guix-commits, 2022/07/20
- 19/19: gnu: slang: Update code style.,
guix-commits <=
- 09/19: gnu: libdmtx: Update to 0.7.7., guix-commits, 2022/07/20
- 10/19: gnu: libdmtx: Omit static library., guix-commits, 2022/07/20
- 12/19: gnu: inxi-minimal: Update to 3.3.19-1., guix-commits, 2022/07/20
- 18/19: gnu: Add most., guix-commits, 2022/07/20