diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-06-17 13:51:05 +0200 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-06-17 14:38:32 +0200 |
| commit | ff690faf66d8f37ee6b679fcb7cf37e369624ee3 (patch) | |
| tree | 3d6ab4ebded5a48f349ca5701643699e178481b4 /gnu/packages/ssh.scm | |
| parent | 52f2980fa3feaf6e59b9e5144391faf8feb52a87 (diff) | |
gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.
* gnu/packages/hurd.scm (hurd-target?): Remove.
(hurd-system?): Move to...
* guix/utils.scm (system-hurd?): ...here.
* gnu/packages/*: Update all users, removing (gnu packages hurd) include where
now unused.
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 71926c6795..b973efc291 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Manuel Graf <graf@init.at> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> @@ -49,7 +49,6 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages guile) - #:use-module (gnu packages hurd) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages logging) @@ -213,7 +212,7 @@ a server that supports the SSH-2 protocol.") (native-inputs (list groff pkg-config)) (inputs `(("libedit" ,libedit) ("openssl" ,openssl) - ,@(if (hurd-target?) + ,@(if (target-hurd?) '() `(("pam" ,linux-pam) ("libfido2" ,libfido2))) ;fails to build on GNU/Hurd @@ -239,7 +238,7 @@ a server that supports the SSH-2 protocol.") "--with-libedit" ;; Enable PAM support in sshd. - ,,@(if (hurd-target?) + ,,@(if (target-hurd?) '() '("--with-pam" |