[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
87/96: gnu: samba: Make the python-cryptography input conditional.
From: |
guix-commits |
Subject: |
87/96: gnu: samba: Make the python-cryptography input conditional. |
Date: |
Wed, 19 Apr 2023 21:41:17 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 2d33e6d6e88110594d9b212a4c9ddc576fa238ed
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Apr 18 10:41:28 2023 -0400
gnu: samba: Make the python-cryptography input conditional.
* gnu/packages/samba.scm (samba/pinned) [arguments]: Conditionally enable
self tests
in configure phase.
[native-inputs]: Conditionally add python-cryptography.
Reported-by: John Kehayias <john.kehayias@protonmail.com>
---
gnu/packages/samba.scm | 42 +++++++++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 8c004a1aac..8b3e96e9c2 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
@@ -210,7 +210,11 @@ external dependencies.")
(lambda* (#:key inputs #:allow-other-keys)
(let* ((libdir (string-append #$output "/lib")))
(invoke "./configure"
- "--enable-selftest"
+ #$@(if (member (%current-system)
+ (package-transitive-supported-systems
+ python-cryptography))
+ '("--enable-selftest")
+ '())
"--enable-fhs"
(string-append "--prefix=" #$output)
"--sysconfdir=/etc"
@@ -255,19 +259,27 @@ external dependencies.")
;; In Requires or Requires.private of pkg-config files.
(list ldb talloc tevent))
(native-inputs
- (list perl-parse-yapp
- pkg-config
- python-cryptography ;for krb5 tests
- python-dnspython
- python-iso8601
- python-markdown
- rpcsvc-proto ;for 'rpcgen'
- python-pyasn1 ;for krb5 tests
- ;; For generating man pages.
- docbook-xml-4.2
- docbook-xsl
- libxslt
- libxml2)) ;for XML_CATALOG_FILES
+ (append
+ (list perl-parse-yapp
+ pkg-config)
+ ;; The python-cryptography dependency is needed for the krb5 tests.
+ ;; Since python-cryptography requires Rust, add it conditionally
+ ;; depending on such support.
+ (if (member (%current-system)
+ (package-transitive-supported-systems
+ python-cryptography))
+ (list python-cryptography)
+ '())
+ (list python-dnspython
+ python-iso8601
+ python-markdown
+ rpcsvc-proto ;for 'rpcgen'
+ python-pyasn1 ;for krb5 tests
+ ;; For generating man pages.
+ docbook-xml-4.2
+ docbook-xsl
+ libxslt
+ libxml2))) ;for XML_CATALOG_FILES
(home-page "https://www.samba.org/")
(synopsis
"The standard Windows interoperability suite of programs for GNU and
Unix")
- 76/96: gnu: repo2docker: Add missing inputs., (continued)
- 76/96: gnu: repo2docker: Add missing inputs., guix-commits, 2023/04/19
- 83/96: gnu: r-beachmat: Update to 2.14.2., guix-commits, 2023/04/19
- 85/96: tests: Re-add debug output to a package tests., guix-commits, 2023/04/19
- 86/96: tests: Fix texlive->guix-package test., guix-commits, 2023/04/19
- 88/96: gnu: samba: Update to 4.18.1 [security fixes]., guix-commits, 2023/04/19
- 91/96: gnu: ultrastar-deluxe: Build with ffmpeg-5., guix-commits, 2023/04/19
- 77/96: gnu: openmw-scenegraph: Fix build., guix-commits, 2023/04/19
- 68/96: gnu: emacs-cape: Update to 0.15., guix-commits, 2023/04/19
- 73/96: gnu: emacs-osm: Do not mix home-page and origin., guix-commits, 2023/04/19
- 81/96: gnu: r-ebimage: Update to 4.40.1., guix-commits, 2023/04/19
- 87/96: gnu: samba: Make the python-cryptography input conditional.,
guix-commits <=
- 90/96: gnu: guix: Update to 1.4.0-5.286cdf0., guix-commits, 2023/04/19
- 93/96: gnu: calcmysky: Update to 0.3.0., guix-commits, 2023/04/19
- 94/96: gnu: stellarium: Update to 23.1 [fixes CVE-2023-28371]., guix-commits, 2023/04/19
- 96/96: Revert "gnu: libsoup: Depend on Samba only on supported systems.", guix-commits, 2023/04/19