[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/142: gnu: avahi: Make all arguments unconditional.
From: |
guix-commits |
Subject: |
13/142: gnu: avahi: Make all arguments unconditional. |
Date: |
Mon, 10 Jan 2022 13:07:13 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 756188a8da7e3cf4a784dab4eab05799eb2f2dd5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 15:07:20 2021 -0500
gnu: avahi: Make all arguments unconditional.
* gnu/packages/avahi.scm (avahi)[origin]: Fix indentation
and remove trailing #t.
[arguments]: Re-integrate conditional arguments.
---
gnu/packages/avahi.scm | 63 ++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 7dcaa17a76..65d3ede131 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -43,22 +43,21 @@
(version "0.8")
(home-page "https://avahi.org")
(source (origin
- (method url-fetch)
- (uri (string-append home-page "/download/avahi-"
- version ".tar.gz"))
- (sha256
- (base32
- "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6"))
- (patches (search-patches "avahi-localstatedir.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Fix version constraint in the avahi-libevent pkg-config
file.
- ;; This can be removed for Avahi versions > 0.8.
- (substitute* "avahi-libevent.pc.in"
- (("libevent-2\\.1\\.5")
- "libevent >= 2.1.5"))
- #t))))
+ (method url-fetch)
+ (uri (string-append home-page "/download/avahi-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6"))
+ (patches (search-patches "avahi-localstatedir.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Fix version constraint in the avahi-libevent pkg-config
file.
+ ;; This can be removed for Avahi versions > 0.8.
+ (substitute* "avahi-libevent.pc.in"
+ (("libevent-2\\.1\\.5")
+ "libevent >= 2.1.5"))))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-distro=none"
@@ -75,26 +74,20 @@
,@(if (%current-target-system)
'("ac_cv_prog_have_pkg_config=yes")
'()))
- ;; TODO(core-updates): Make this unconditional.
- ,@(if (%current-target-system)
- `(#:modules ((srfi srfi-26)
- (guix build utils)
- (guix build gnu-build-system))
- #:phases
- ,#~(modify-phases %standard-phases
- (add-after 'patch-shebangs 'patch-more-shebangs
- (lambda* (#:key inputs #:allow-other-keys)
- (define path
- `(,(dirname (search-input-file inputs "bin/sh"))))
- (for-each
- (cut patch-shebang <> path)
- (find-files (string-append #$output
"/etc/avahi")))))))
- '())))
+ #:modules ((srfi srfi-26)
+ (guix build utils)
+ (guix build gnu-build-system))
+ #:phases
+ ,#~(modify-phases %standard-phases
+ (add-after 'patch-shebangs 'patch-more-shebangs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define path
+ `(,(dirname (search-input-file inputs "bin/sh"))))
+ (for-each
+ (cut patch-shebang <> path)
+ (find-files (string-append #$output "/etc/avahi"))))))))
(inputs
- ;; TODO(core-updates): Make this input unconditional.
- `(,@(if (%current-target-system)
- `(("bash-minimal" ,bash-minimal))
- '())
+ `(("bash-minimal" ,bash-minimal)
("dbus" ,dbus)
("expat" ,expat)
("gdbm" ,gdbm)
- 16/142: gnu: binutils: Absorb binutils-next., (continued)
- 16/142: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 31/142: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 19/142: gnu: gobject-introspection: Unconditionally use flex and bison., guix-commits, 2022/01/10
- 14/142: gnu: autoconf-2.69: Repatriate unpatch-shebangs phase from 2.71., guix-commits, 2022/01/10
- 20/142: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 23/142: gnu: heimdal: Unify phases, addressing TODO., guix-commits, 2022/01/10
- 36/142: gnu: libpcap: Update to 2.62., guix-commits, 2022/01/10
- 57/142: gnu: python-typed-ast: Update to 1.5.1., guix-commits, 2022/01/10
- 61/142: gnu: python-typing: Update to 3.10.0.0., guix-commits, 2022/01/10
- 28/142: gnu: help2man: Update to 1.48.5., guix-commits, 2022/01/10
- 13/142: gnu: avahi: Make all arguments unconditional.,
guix-commits <=
- 12/142: gnu: python-3.9: Update to 3.9.9., guix-commits, 2022/01/10
- 21/142: gnu: llvm-12: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 18/142: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/142: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10
- 32/142: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10
- 33/142: gnu: util-linux: Update to 2.37.2., guix-commits, 2022/01/10
- 37/142: gnu: shadow: Update to 4.9., guix-commits, 2022/01/10
- 39/142: gnu: rust-1.39: Update mrustc to commit c70665., guix-commits, 2022/01/10
- 42/142: gnu: python-gnupg: Update to 0.4.8., guix-commits, 2022/01/10
- 80/142: gnu: python-cachecontrol: Update to 0.12.10., guix-commits, 2022/01/10