[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: avahi: Default to nss-mdns 0.10.
From: |
Ludovic Courtès |
Subject: |
01/01: services: avahi: Default to nss-mdns 0.10. |
Date: |
Fri, 9 Feb 2018 09:17:47 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit a68fdfea96370c8a4b95af1fcd6e2fd7eb72da29
Author: Ludovic Courtès <address@hidden>
Date: Fri Feb 9 15:16:09 2018 +0100
services: avahi: Default to nss-mdns 0.10.
This works around <https://bugs.gnu.org/30396>.
Reported by George myglc2 Clemmer <address@hidden>.
* gnu/packages/avahi.scm (nss-mdns-0.10): New variable.
* gnu/services/avahi.scm (avahi-service-type): Use it.
---
gnu/packages/avahi.scm | 27 ++++++++++++++++++++++++++-
gnu/services/avahi.scm | 6 ++++--
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index f4d17c5..001afa8 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Mark H Weaver <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
@@ -100,3 +100,28 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.")
most often used in home and other small networks without a local name server,
to resolve host names in the @samp{.local} top-level domain.")
(license lgpl2.1+)))
+
+(define-public nss-mdns-0.10
+ ;; Kept here to work around in bug in 0.11: <https://bugs.gnu.org/30396> and
+ ;; <https://github.com/lathiat/nss-mdns/issues/26>.
+ (package
+ (inherit nss-mdns)
+ (version "0.10")
+ (source (origin
+ (method url-fetch)
+ (uri (list
+ (string-append
+ "mirror://debian/pool/main/n/nss-mdns/nss-mdns_"
+ version ".orig.tar.gz")
+
"http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-0.10.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-0.10.tar.gz"
+
+ ;; This used to be the canonical URL but it vanished.
+ ;; See <http://bugs.gnu.org/18704>.
+ ;; (string-append
+ ;;
"http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-"
+ ;; version ".tar.gz")
+ ))
+ (sha256
+ (base32
+ "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"))
+ (file-name (string-append "nss-mdns-" version ".tar.gz"))))))
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index d69c89f..b4f89c4 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -131,8 +131,10 @@ service switch (NSS) with support for @code{.local} host
name resolution.")
(const %avahi-accounts))
(service-extension activation-service-type
(const %avahi-activation))
+
+ ;; Use 0.10 due to <https://bugs.gnu.org/30396>.
(service-extension nscd-service-type
- (const (list nss-mdns)))
+ (const (list nss-mdns-0.10)))
;; Provide 'avahi-browse', 'avahi-resolve', etc. in
;; the system profile.