diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fe61bc8fce..3e77548127 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1799,26 +1799,46 @@ projects, from individuals to large-scale enterprise operations.") (define-public rcs (package (name "rcs") - (version "5.9.4") + (version "5.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/rcs/rcs-" version ".tar.xz")) (sha256 (base32 - "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86")) - (patches (search-patches "rcs-5.9.4-noreturn.patch")))) + "1if5pa4iip2p70gljm54nggfdnsfjxa4cqz8fpj07lvsijary39s")) + ;(patches (search-patches "rcs-5.9.4-noreturn.patch")) + )) (build-system gnu-build-system) (native-inputs `(("ed" ,ed))) + (inputs `(("time" ,(@ (gnu packages time) time)))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-t810 - ;; See https://savannah.gnu.org/bugs/index.php?52288 - ;; Back-porting the fix is non-trivial, so disable for now. + (add-before 'check 'test-t632-debugging (lambda _ - (substitute* "tests/Makefile" - ((" t810 \\\\\n") "")) - #t))))) + (substitute* "tests/t632" + (("timeout --foreground 0\\.42s") + ;"timeout --foreground 50s") ;a + ;"timeout 50s") ;b + ;"LANG=C timeout --foreground 50s") ;c + ;"LANG=C timeout") ;d + "") + ;(("timeout") (which "timeout")) + ) + (invoke "grep" "timeout" "tests/t632") + #t)) + (replace 'check + (lambda _ + (with-directory-excursion "tests" + (system* "time" "make" "check" "KEEPD=1" "VERBOSE=1" "TESTS=t632") + (invoke "cat" "t632.d/signal-handling-out-and-err") + (display (which "tty")) + (newline) + (system* (which "tty")) + (system* "ls" "-la" (which "tty")) + #f + ))) + ))) (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") (description