From 63b148f70fa1292a4983fcc787792f7ff517b9f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 23:12:04 +0100 Subject: gnu: endlessh: Update to 1.1. * gnu/packages/ssh.scm (endlessh): Update to 1.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/ssh.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d203bb1455..8acc7ce2ed 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -769,23 +769,24 @@ of existing remote shell facilities such as SSH.") (define-public endlessh (package (name "endlessh") - (version "1.0") + (version "1.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/skeeto/endlessh/releases/" - "download/" version "/endlessh-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/skeeto/endlessh.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0hhsr65hzrcb7ylskmxyr92svzndhks8hqzn8hvg7f7j89rkvq5k")))) + (base32 "0ziwr8j1frsp3dajr8h5glkm1dn5cci404kazz5w1jfrp0736x68")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") - #:tests? #f ; no test target + #:tests? #f ; no test target #:phases (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (delete 'configure)))) ; no configure script (home-page "https://github.com/skeeto/endlessh") (synopsis "SSH tarpit that slowly sends an endless banner") (description -- cgit v1.2.3 From 21f5de6d32a7d0e75ec2df69dc753a75a15657cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Feb 2020 23:13:54 +0100 Subject: gnu: openssh: Don't use NAME in source URI. * gnu/packages/ssh.scm (openssh)[source]: Hard-code NAME. --- gnu/packages/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 8acc7ce2ed..7ea871e581 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -133,7 +133,7 @@ a server that supports the SSH-2 protocol.") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" - name "-" version ".tar.gz")) + "openssh-" version ".tar.gz")) (sha256 (base32 "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x")))) -- cgit v1.2.3 From 6db6bcf71570e7d667ea5918c67016d0d3076650 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 00:39:41 +0100 Subject: gnu: openssh: Update to 8.2p1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (openssh): Update to 8.2p1. [arguments]: Adjust ‘patch-tests’ phase. --- gnu/packages/ssh.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7ea871e581..eae2f98b53 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -129,14 +129,14 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "8.0p1") + (version "8.2p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) (sha256 (base32 - "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x")))) + "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) @@ -145,7 +145,7 @@ a server that supports the SSH-2 protocol.") ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) - ("xauth" ,xauth))) ;for 'ssh -X' and 'ssh -Y' + ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" ;; Otherwise, the test scripts try to use a nonexistent directory and @@ -156,12 +156,12 @@ a server that supports the SSH-2 protocol.") ;; Default value of 'PATH' used by sshd. "--with-default-path=/run/current-system/profile/bin" - ;; configure needs to find krb5-config + ;; configure needs to find krb5-config. ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin") - ;; libedit needed for sftp completion + ;; libedit is needed for sftp completion. "--with-libedit" ;; Enable PAM support in sshd. @@ -178,14 +178,18 @@ a server that supports the SSH-2 protocol.") #t))) (add-before 'check 'patch-tests (lambda _ - ;; remove 't-exec' regress target which requires user 'sshd' - (substitute* "regress/Makefile" - (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post) + (substitute* "regress/test-exec.sh" + (("/bin/sh") (which "sh"))) + + ;; Remove 't-exec' regress target which requires user 'sshd'. + (substitute* (list "Makefile" + "regress/Makefile") + (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))) #t)) (replace 'install (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) - ;; install without host keys and system configuration files + ;; Install without host keys and system configuration files. (apply invoke "make" "install-nosysconf" make-flags) (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From 668740cc055b59a6d343fb256881c3632e050459 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:25:23 +0100 Subject: gnu: guile-ssh: Update to 0.12.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.12.0, [source]: remove snippet that were integrated upstream, [arguments]: Add a fix-guile-path phase to fix tests. (guile3.0-ssh)[arguments]: Remove as this is fixed upstream. --- gnu/packages/ssh.scm | 63 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index eae2f98b53..4b1e02be16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.3") + (version "0.12.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -237,31 +238,12 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; libssh >= 0.8.0 no longer provides libssh_threads: see - ;; . - (substitute* "libguile-ssh/Makefile.am" - (("-lssh_threads") "")) - - ;; This test would wrongfully pick DSS keys when running on - ;; libssh >= 0.8.0, which fails: - ;; . - (substitute* "tests/server.scm" - (("= %libssh-minor-version 7") - ">= %libssh-minor-version 7")) - - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*$") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(;; It makes no sense to build libguile-ssh.a. + `(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -280,6 +262,15 @@ Additionally, various channel-specific options can be negotiated.") (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile"))) + #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -322,32 +313,6 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") - (arguments - (substitute-keyword-arguments (package-arguments guile-ssh) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'bootstrap 'delete-old-guile-m4 - (lambda _ - ;; The old 'guile.m4' that's shipped would fail to recognize - ;; Guile 2.9 as "3.0". - (delete-file "m4/guile.m4") - #t)) - (add-before 'build 'adjust-for-guile3 - (lambda _ - ;; Adjust for things that are deprecated in 2.2 and removed in - ;; 3.0. - (substitute* "tests/common.scm" - (("define-module \\(tests common\\)") - "define-module (tests common) - #:use-module (ice-9 threads)\n")) - (substitute* "modules/ssh/tunnel.scm" - (("define-module \\(ssh tunnel\\)") - "define-module (ssh tunnel) - #:use-module (ice-9 threads)")) - (substitute* "modules/srfi/srfi-64.upstream.scm" - (("_IOLBF") - "'line")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From 10cdf1408047f16e02d097c4cd23c8efcddb5814 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. * gnu/packages/ssh.scm (guile-ssh)[native-inputs]: Add guile. --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4b1e02be16..90714a4a92 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -291,7 +291,8 @@ Additionally, various channel-specific options can be negotiated.") ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 3db8833b4616f84cc8643fb983621e65de0acecd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 14:41:37 +0100 Subject: Revert "gnu: guile-ssh: Update to 0.12.0." This reverts commit 668740cc055b59a6d343fb256881c3632e050459. This causes the following error when running guix pull: ./guix/store.scm:1224:15: Throw to key `srfi-34' with args `(#)'. guix pull: error: You found a bug: the program '/gnu/store/0nbcv4jkhf73qlvc6dsy05iamj6l662c-compute-guix-derivation' --- gnu/packages/ssh.scm | 63 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 90714a4a92..ac9c2f7711 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,7 +12,6 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits -;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -228,7 +227,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.12.0") + (version "0.11.3") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -238,12 +237,31 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) - (modules '((guix build utils))))) + "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; libssh >= 0.8.0 no longer provides libssh_threads: see + ;; . + (substitute* "libguile-ssh/Makefile.am" + (("-lssh_threads") "")) + + ;; This test would wrongfully pick DSS keys when running on + ;; libssh >= 0.8.0, which fails: + ;; . + (substitute* "tests/server.scm" + (("= %libssh-minor-version 7") + ">= %libssh-minor-version 7")) + + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*$") + "GUILE_PKG([3.0 2.2 2.0])\n")) + #t)))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(;; It makes no sense to build libguile-ssh.a. + '(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -262,15 +280,6 @@ Additionally, various channel-specific options can be negotiated.") (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) - ,@(if (%current-target-system) - '() - '((add-before 'check 'fix-guile-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((guile (assoc-ref inputs "guile"))) - (substitute* "tests/common.scm" - (("/usr/bin/guile") - (string-append guile "/bin/guile"))) - #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -314,6 +323,32 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") + (arguments + (substitute-keyword-arguments (package-arguments guile-ssh) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'bootstrap 'delete-old-guile-m4 + (lambda _ + ;; The old 'guile.m4' that's shipped would fail to recognize + ;; Guile 2.9 as "3.0". + (delete-file "m4/guile.m4") + #t)) + (add-before 'build 'adjust-for-guile3 + (lambda _ + ;; Adjust for things that are deprecated in 2.2 and removed in + ;; 3.0. + (substitute* "tests/common.scm" + (("define-module \\(tests common\\)") + "define-module (tests common) + #:use-module (ice-9 threads)\n")) + (substitute* "modules/ssh/tunnel.scm" + (("define-module \\(ssh tunnel\\)") + "define-module (ssh tunnel) + #:use-module (ice-9 threads)")) + (substitute* "modules/srfi/srfi-64.upstream.scm" + (("_IOLBF") + "'line")) + #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From fde46843ecf568da13ba96c19de80c591bb6a05c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 14:45:59 +0100 Subject: Revert "gnu: guile-ssh: Fix cross-compilation." This reverts commit 10cdf1408047f16e02d097c4cd23c8efcddb5814. ./guix/store.scm:1224:15: Throw to key `srfi-34' with args `(#)'. guix pull: error: You found a bug: the program '/gnu/store/0nbcv4jkhf73qlvc6dsy05iamj6l662c-compute-guix-derivation' --- gnu/packages/ssh.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ac9c2f7711..eae2f98b53 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -300,8 +300,7 @@ Additionally, various channel-specific options can be negotiated.") ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which) - ("guile" ,guile-2.2))) + ("which" ,which))) (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From 38655d7b88ae9d82208e5750480c9b91dd9dda8b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:25:23 +0100 Subject: gnu: guile-ssh: Update to 0.12.0. * gnu/packages/ssh.scm (guile-ssh): Update to 0.12.0, [source]: remove snippet that were integrated upstream, [arguments]: Add a fix-guile-path phase to fix tests. (guile3.0-ssh)[arguments]: Remove as this is fixed upstream. --- gnu/packages/ssh.scm | 63 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index eae2f98b53..4b1e02be16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.3") + (version "0.12.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -237,31 +238,12 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03bv3hwp2s8f0bqgfjaan9jx4dyab0abv27n2zn2g0izlidv0vl6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; libssh >= 0.8.0 no longer provides libssh_threads: see - ;; . - (substitute* "libguile-ssh/Makefile.am" - (("-lssh_threads") "")) - - ;; This test would wrongfully pick DSS keys when running on - ;; libssh >= 0.8.0, which fails: - ;; . - (substitute* "tests/server.scm" - (("= %libssh-minor-version 7") - ">= %libssh-minor-version 7")) - - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*$") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "054hd9rzfhb48gc1hw3rphhp0cnnd4bs5qmidy5ygsyvy9ravlad")) + (modules '((guix build utils))))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(;; It makes no sense to build libguile-ssh.a. + `(;; It makes no sense to build libguile-ssh.a. #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases @@ -280,6 +262,15 @@ Additionally, various channel-specific options can be negotiated.") (("\"libguile-ssh\"") (string-append "\"" lib "/libguile-ssh\""))) #t))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile"))) + #t))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -322,32 +313,6 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") - (arguments - (substitute-keyword-arguments (package-arguments guile-ssh) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'bootstrap 'delete-old-guile-m4 - (lambda _ - ;; The old 'guile.m4' that's shipped would fail to recognize - ;; Guile 2.9 as "3.0". - (delete-file "m4/guile.m4") - #t)) - (add-before 'build 'adjust-for-guile3 - (lambda _ - ;; Adjust for things that are deprecated in 2.2 and removed in - ;; 3.0. - (substitute* "tests/common.scm" - (("define-module \\(tests common\\)") - "define-module (tests common) - #:use-module (ice-9 threads)\n")) - (substitute* "modules/ssh/tunnel.scm" - (("define-module \\(ssh tunnel\\)") - "define-module (ssh tunnel) - #:use-module (ice-9 threads)")) - (substitute* "modules/srfi/srfi-64.upstream.scm" - (("_IOLBF") - "'line")) - #t)))))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From a0d19554cb4c7809d34fd05578bb85c92ce1bf4d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 18 Feb 2020 11:44:16 +0100 Subject: gnu: guile-ssh: Fix cross-compilation. * gnu/packages/ssh.scm (guile-ssh)[native-inputs]: Add guile. --- gnu/packages/ssh.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4b1e02be16..72b7c745f9 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -291,7 +291,8 @@ Additionally, various channel-specific options can be negotiated.") ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("which" ,which))) + ("which" ,which) + ("guile" ,guile-2.2))) ;needed when cross-compiling. (inputs `(("guile" ,guile-2.2) ("libssh" ,libssh) ("libgcrypt" ,libgcrypt))) @@ -306,6 +307,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile2.0-ssh") + (native-inputs + `(("guile" ,guile-2.0) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) @@ -313,6 +317,9 @@ libssh library.") (package (inherit guile-ssh) (name "guile3.0-ssh") + (native-inputs + `(("guile" ,guile-next) ;needed when cross-compiling. + ,@(alist-delete "guile" (package-native-inputs guile-ssh)))) (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -- cgit v1.2.3 From ef30ddb2c28cd3304b7f78d8782369b5807676f2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 19 Feb 2020 11:13:15 +0100 Subject: gnu: Add Kerberos support to libssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (libssh)[inputs]: Depend on mit-krb5 Signed-off-by: Ludovic Courtès --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 72b7c745f9..fdb3450e01 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -90,7 +90,8 @@ ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) (inputs `(("zlib" ,zlib) - ("libgcrypt" ,libgcrypt))) + ("libgcrypt" ,libgcrypt) + ("mit-krb5" ,mit-krb5))) (synopsis "SSH client library") (description "libssh is a C library implementing the SSHv2 and SSHv1 protocol for client -- cgit v1.2.3