From 1ff81347ecb7ddb64f50eaa7622ee65847694e9c Mon Sep 17 00:00:00 2001 From: Frerich Raabe Date: Thu, 7 Aug 2014 20:49:34 +0200 Subject: [PATCH 1/3] Enable dnsmasq on OS X It seems to work alright. --- pkgs/tools/networking/dnsmasq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index d8f62913ad5..3074e56105c 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; license = "GPL"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } From dee49fa1b221973693a760d987e103f9d944312d Mon Sep 17 00:00:00 2001 From: Frerich Raabe Date: Thu, 7 Aug 2014 20:51:39 +0200 Subject: [PATCH 2/3] Update dnsmasq to version 2.71 --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 3074e56105c..a29edcc70ad 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.69"; + name = "dnsmasq-2.71"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "1zf4d6kjbsn6gwfwvmch1y84q67na1qhh0gyd50ip1vjsmw2l4i7"; + sha256 = "1i1l2s2bcs6yx05wh1p2rf4bl0jfdgmg77b33gh44r1rdbv6933x"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; From 965237a6eef394d6acf3b0e31f35b27e65ab0b95 Mon Sep 17 00:00:00 2001 From: Frerich Raabe Date: Thu, 7 Aug 2014 21:00:19 +0200 Subject: [PATCH 3/3] Use .tar.xz instead of .tar.gz for dnsmasq To save precious bandwidth. --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index a29edcc70ad..cec4057a284 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "dnsmasq-2.71"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "1i1l2s2bcs6yx05wh1p2rf4bl0jfdgmg77b33gh44r1rdbv6933x"; + url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; + sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";