diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:33:00 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:33:00 +0100 |
commit | 19464173bafdc42adfc8dd7277c491c40ddef66b (patch) | |
tree | 2842e0f62404e307ef0432f2ccce8b5ce60ab392 /gnu/packages/mc.scm | |
parent | 85ef07c4b278200db7c396f4021146916588f2fb (diff) | |
parent | 81bb55459af85c408977470673e718ed1c0d6a25 (diff) | |
download | guix-patches-19464173bafdc42adfc8dd7277c491c40ddef66b.tar guix-patches-19464173bafdc42adfc8dd7277c491c40ddef66b.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/mc.scm')
-rw-r--r-- | gnu/packages/mc.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index 260ac93342..ecac5412e4 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,15 +37,14 @@ (define-public mc (package (name "mc") - (version "4.8.20") + (version "4.8.22") (source (origin (method url-fetch) (uri (string-append "http://ftp.midnight-commander.org/mc-" version ".tar.xz")) (sha256 - (base32 - "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1")))) + (base32 "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) @@ -89,6 +88,11 @@ (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") (synopsis "Graphical file manager") |