nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mc: Update to 4.8.20. 

* gnu/packages/mc.scm (mc): Update to 4.8.20.
[arguments]: Rename ‘fix-absolutism’ to (hopefully) more accurate
‘patch-FHS-file-names’.  Patch more.  Fix new VFS test.
This commit is contained in:
Tobias Geerinckx-Rice 2018-01-16 14:36:05 +01:00
parent 10db64e1b0
commit 889b4af7d8
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/mc.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -36,7 +37,7 @@
(define-public mc (define-public mc
(package (package
(name "mc") (name "mc")
(version "4.8.16") (version "4.8.20")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -44,7 +45,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"083h5gwc0nny9b557way5dsmj71g2bzkiai4bn30y5nkjwqbxg5v")))) "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl))) ("perl" ,perl)))
@ -59,14 +60,24 @@
'("--with-screen=ncurses" "--enable-aspell") '("--with-screen=ncurses" "--enable-aspell")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'fix-absolutism (add-after 'patch-source-shebangs 'patch-FHS-file-names
(lambda _ (lambda _
;; Modify files that contain absolute file names. ;; Patch files to refer to executables in the store.
(substitute* "misc/mcedit.menu.in" (substitute* "misc/mcedit.menu.in"
(("#! /bin/sh") (string-append "#!" (which "sh"))) (("#! /bin/sh") (string-append "#!" (which "sh")))
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash")))
(substitute* "misc/ext.d/misc.sh.in" (substitute* "misc/ext.d/misc.sh.in"
(("/bin/cat") "cat")) (("/bin/cat") "cat"))
(substitute* "tests/src/vfs/extfs/helpers-list/Makefile.in"
(("/bin/sh") (which "sh")))
#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>>")))
#t))))) #t)))))
(home-page "https://www.midnight-commander.org") (home-page "https://www.midnight-commander.org")
(synopsis "Graphical file manager") (synopsis "Graphical file manager")