[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
122/149: gnu: heimdal: Fix build.
From: |
guix-commits |
Subject: |
122/149: gnu: heimdal: Fix build. |
Date: |
Tue, 26 Oct 2021 23:52:38 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 4d1872e0749fc8dbc45b5257a4d5726f76d79a31
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 15 22:14:22 2021 -0400
gnu: heimdal: Fix build.
* gnu/packages/kerberos.scm (heimdal): Remove trailing #t.
[inputs]: Add mit-krb5. Add bash-minimal inconditionally.
[native-inputs]: Add perl inconditionally.
---
gnu/packages/kerberos.scm | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 2d31598..dc05c71 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
@@ -186,8 +186,7 @@ After installation, the system administrator should
generate keys using
(substitute* "configure"
(("User=.*$") "User=Guix\n")
(("Host=.*$") "Host=GNU")
- (("Date=.*$") "Date=2019\n"))
- #t))))
+ (("Date=.*$") "Date=2019\n"))))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -252,8 +251,7 @@ After installation, the system administrator should
generate keys using
(("/bin/sh") (which "sh"))))
'((substitute* '("appl/afsutil/pagsh.c"
"tools/Makefile.in")
- (("/bin/sh") (which "sh")))
- #t))))
+ (("/bin/sh") (which "sh")))))))
(add-before 'check 'pre-check
(lambda _
;; For 'getxxyyy-test'.
@@ -263,23 +261,18 @@ After installation, the system administrator should
generate keys using
;; FIXME: figure out why 'kdc' tests fail.
(with-output-to-file "tests/db/have-db.in"
(lambda ()
- (format #t "#!~a~%exit 1~%" (which "sh"))))
- #t)))
+ (format #t "#!~a~%exit 1~%" (which "sh")))))))
;; Tests fail when run in parallel.
#:parallel-tests? #f))
(native-inputs `(("e2fsprogs" ,e2fsprogs) ;for 'compile_et'
("texinfo" ,texinfo)
("unzip" ,unzip) ;for tests
- ,@(if (%current-target-system)
- `(("perl" ,perl))
- '())))
+ ("perl" ,perl)))
(inputs `(("readline" ,readline)
- ;; TODO(core-updates): Make this input unconditional.
- ,@(if (%current-target-system)
- `(("bash-minimal" ,bash-minimal))
- '())
+ ("bash-minimal" ,bash-minimal)
("bdb" ,bdb)
("e2fsprogs" ,e2fsprogs) ;for libcom_err
+ ("mit-krb5" ,mit-krb5)
("sqlite" ,sqlite)))
(home-page "http://www.h5l.org/")
(synopsis "Kerberos 5 network authentication")
- 98/149: gnu: Add python-tomli., (continued)
- 98/149: gnu: Add python-tomli., guix-commits, 2021/10/26
- 99/149: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/26
- 102/149: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/26
- 104/149: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/26
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/26
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 121/149: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/26
- 117/149: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/26
- 122/149: gnu: heimdal: Fix build.,
guix-commits <=
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/26
- 138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/26
- 88/149: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/26
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/26