From 0fb80f349d1fa683e6016edb541f7204aee2120f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 May 2021 17:45:32 +0200 Subject: gnu: guile-ssh: Fix test failure due to Guile 3.0.7's 'read-error'. Reported by Marius Bakke. * gnu/packages/patches/guile-ssh-read-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (guile-ssh)[source]: Use it. (guile2.0-ssh)[source]: New field. (guile2.2-ssh)[source]: New field. --- gnu/packages/ssh.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 820c67f28a..7723390c16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner @@ -317,7 +317,8 @@ Additionally, various channel-specific options can be negotiated.") (sha256 (base32 "1xpxkvgj7wgcl450djkcrmrf957mcy2f36hfs5g6kpla1gax2d1g")) - (patches (search-patches "guile-ssh-fix-test-suite.patch")))) + (patches (search-patches "guile-ssh-fix-test-suite.patch" + "guile-ssh-read-error.patch")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments @@ -383,6 +384,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile2.0-ssh") + (source (origin + (inherit (package-source guile-ssh)) + (patches (search-patches "guile-ssh-fix-test-suite.patch")))) (native-inputs `(("guile" ,guile-2.0) ;needed when cross-compiling. ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) @@ -393,6 +397,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile2.2-ssh") + (source (origin + (inherit (package-source guile-ssh)) + (patches (search-patches "guile-ssh-fix-test-suite.patch")))) (native-inputs `(("guile" ,guile-2.2) ;needed when cross-compiling. ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) -- cgit 1.4.1