[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/13: gnu: mc: Use G-expressions.
From: |
guix-commits |
Subject: |
02/13: gnu: mc: Use G-expressions. |
Date: |
Mon, 14 Aug 2023 15:37:09 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 6048467f0686e1fe9e9bd114e69a5290645f3243
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Aug 6 02:00:00 2023 +0200
gnu: mc: Use G-expressions.
* gnu/packages/mc.scm (mc)[arguments]: Rewrite as G-expressions.
---
gnu/packages/mc.scm | 81 +++++++++++++++++++++++++++--------------------------
1 file changed, 41 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 881ed323cd..a80bcd6fae 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages)
#:use-module (guix build-system gnu)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages))
@@ -47,6 +48,46 @@
(sha256
(base32 "1py7jm620lsas7rcv5j69608gdshmp25d9gx958hr5sb2jr3rg2y"))))
(build-system gnu-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "--with-screen=ncurses"
+ "--enable-aspell")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'patch-FHS-file-names
+ (lambda _
+ ;; Patch files to refer to executables in the store or $PATH.
+ (substitute* "misc/mcedit.menu.in"
+ (("#! /bin/sh") (string-append "#!" (which "sh")))
+ (("/bin/bash") (which "bash")))
+ (substitute* "misc/ext.d/misc.sh.in"
+ (("/bin/cat") "cat"))
+ (substitute* (list "lib/utilunix.c"
+ "src/usermenu.c"
+ "src/vfs/fish/fish.c"
+
"tests/src/vfs/extfs/helpers-list/Makefile.in")
+ (("/bin/sh") (which "sh")))
+ (substitute* "src/filemanager/ext.c"
+ (("/bin/rm") "rm")
+ (("/bin/sh") (which "sh")))
+
+ ;; There are other /bin/<shell>s hard-coded in this file, but
they
+ ;; are never tried after bash (mc's first choice) is found.
+ (substitute* "lib/shell.c"
+ (("/bin/bash") (which "bash")))))
+ (add-before 'check 'fix-tests
+ (lambda _
+ ;; Don't expect a UID or GID of ‘0’ in the build environment.
+ (with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
+ (substitute* (list "rpm.custom.output"
+ "rpm.glib.output")
+ ((" 0 0") "<<uid>> <<gid>>")))
+ ;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
+ ;; (resolved_path == data->expected_string): ("" == "/usr/bin")
+ (substitute* "tests/lib/mc_realpath.c"
+ (("/usr/bin") "/")
+ (("usr/bin") "/")))))))
(native-inputs (list perl pkg-config))
(inputs (list aspell
check
@@ -55,46 +96,6 @@
libssh2
ncurses
unzip))
- (arguments
- `(#:configure-flags
- '("--with-screen=ncurses" "--enable-aspell")
- #:phases
- (modify-phases %standard-phases
- (add-after 'patch-source-shebangs 'patch-FHS-file-names
- (lambda _
- ;; Patch files to refer to executables in the store or $PATH.
- (substitute* "misc/mcedit.menu.in"
- (("#! /bin/sh") (string-append "#!" (which "sh")))
- (("/bin/bash") (which "bash")))
- (substitute* "misc/ext.d/misc.sh.in"
- (("/bin/cat") "cat"))
- (substitute* (list "lib/utilunix.c"
- "src/usermenu.c"
- "src/vfs/fish/fish.c"
- "tests/src/vfs/extfs/helpers-list/Makefile.in")
- (("/bin/sh") (which "sh")))
- (substitute* "src/filemanager/ext.c"
- (("/bin/rm") "rm")
- (("/bin/sh") (which "sh")))
-
- ;; There are other /bin/<shell>s hard-coded in this file, but they
- ;; are never tried after bash (mc's first choice) is found.
- (substitute* "lib/shell.c"
- (("/bin/bash") (which "bash")))
- #t))
- (add-before 'check 'fix-tests
- (lambda _
- ;; Don't expect a UID or GID of ‘0’ in the build environment.
- (with-directory-excursion "tests/src/vfs/extfs/helpers-list/data"
- (substitute* (list "rpm.custom.output"
- "rpm.glib.output")
- ((" 0 0") "<<uid>> <<gid>>")))
- ;; XXX ERROR:mc_realpath.c:99:realpath_test: assertion failed
- ;; (resolved_path == data->expected_string): ("" == "/usr/bin")
- (substitute* "tests/lib/mc_realpath.c"
- (("/usr/bin") "/")
- (("usr/bin") "/"))
- #t)))))
(home-page "https://www.midnight-commander.org")
(properties
`((release-monitoring-url .
"https://ftp.osuosl.org/pub/midnightcommander/")))
- branch master updated (d0776ff44c -> 2d4ee4677e), guix-commits, 2023/08/14
- 01/13: gnu: mc: Update to 4.8.30., guix-commits, 2023/08/14
- 05/13: gnu: mc: Shrink closure., guix-commits, 2023/08/14
- 07/13: gnu: noweb: Update to 2.13., guix-commits, 2023/08/14
- 08/13: gnu: corsix-th: Update to 0.67., guix-commits, 2023/08/14
- 10/13: gnu: lagrange: Update to 1.16.7., guix-commits, 2023/08/14
- 13/13: gnu: entangle: Update package style., guix-commits, 2023/08/14
- 04/13: gnu: mc: Fix cross-(mis)compilation & substitutions., guix-commits, 2023/08/14
- 09/13: gnu: corsix-th: Use G-expressions., guix-commits, 2023/08/14
- 02/13: gnu: mc: Use G-expressions.,
guix-commits <=
- 11/13: doc: Imply that ~/.nix-profile is not a typo., guix-commits, 2023/08/14
- 12/13: gnu: entangle: Fix build., guix-commits, 2023/08/14
- 06/13: gnu: noweb: Use G-expressions., guix-commits, 2023/08/14
- 03/13: gnu: mc: Remove obsolete substitution., guix-commits, 2023/08/14