summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-02-09 15:16:09 +0100
committerLudovic Courtès <ludo@gnu.org>2018-02-09 15:17:41 +0100
commita68fdfea96370c8a4b95af1fcd6e2fd7eb72da29 (patch)
tree681d676b54df9273b5216602ca01974994589515
parent8f8842cc7be41cdf55c240352f03db5f55d7881f (diff)
services: avahi: Default to nss-mdns 0.10.
This works around <https://bugs.gnu.org/30396>. Reported by George myglc2 Clemmer <myglc2@gmail.com>. * gnu/packages/avahi.scm (nss-mdns-0.10): New variable. * gnu/services/avahi.scm (avahi-service-type): Use it.
-rw-r--r--gnu/packages/avahi.scm27
-rw-r--r--gnu/services/avahi.scm6
2 files changed, 30 insertions, 3 deletions
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index f4d17c5c159..001afa8d489 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> 3;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
4;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 4;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; 5;;;
@@ -100,3 +100,28 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.")
100most often used in home and other small networks without a local name server, 100most often used in home and other small networks without a local name server,
101to resolve host names in the @samp{.local} top-level domain.") 101to resolve host names in the @samp{.local} top-level domain.")
102 (license lgpl2.1+))) 102 (license lgpl2.1+)))
103
104(define-public nss-mdns-0.10
105 ;; Kept here to work around in bug in 0.11: <https://bugs.gnu.org/30396> and
106 ;; <https://github.com/lathiat/nss-mdns/issues/26>.
107 (package
108 (inherit nss-mdns)
109 (version "0.10")
110 (source (origin
111 (method url-fetch)
112 (uri (list
113 (string-append
114 "mirror://debian/pool/main/n/nss-mdns/nss-mdns_"
115 version ".orig.tar.gz")
116 "http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-0.10.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-0.10.tar.gz"
117
118 ;; This used to be the canonical URL but it vanished.
119 ;; See <http://bugs.gnu.org/18704>.
120 ;; (string-append
121 ;; "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-"
122 ;; version ".tar.gz")
123 ))
124 (sha256
125 (base32
126 "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"))
127 (file-name (string-append "nss-mdns-" version ".tar.gz"))))))
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index d69c89f7513..b4f89c4abf9 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
3;;; 3;;;
4;;; This file is part of GNU Guix. 4;;; This file is part of GNU Guix.
5;;; 5;;;
@@ -131,8 +131,10 @@ service switch (NSS) with support for @code{.local} host name resolution.")
131 (const %avahi-accounts)) 131 (const %avahi-accounts))
132 (service-extension activation-service-type 132 (service-extension activation-service-type
133 (const %avahi-activation)) 133 (const %avahi-activation))
134
135 ;; Use 0.10 due to <https://bugs.gnu.org/30396>.
134 (service-extension nscd-service-type 136 (service-extension nscd-service-type
135 (const (list nss-mdns))) 137 (const (list nss-mdns-0.10)))
136 138
137 ;; Provide 'avahi-browse', 'avahi-resolve', etc. in 139 ;; Provide 'avahi-browse', 'avahi-resolve', etc. in
138 ;; the system profile. 140 ;; the system profile.