From 9da1dd6c905af6dbdc46c3d580975b47b6fd98c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Feb 2012 18:03:12 +0000
Subject: * dnsmasq updated to 2.59.

svn path=/nixpkgs/trunk/; revision=32334
---
 pkgs/tools/networking/dnsmasq/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 0390c847acb8..89c15b91a1af 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.57";
+  name = "dnsmasq-2.59";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "1bpq1wsc7cs1nqs7abhn96nxmdncdf7c58987f9kdmi246wcgq62";
+    sha256 = "02s1y5320aiqhcrgzc7c2zs292vidijc156k5w7apzzsk5hfdhdx";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f584dfcd26c0..655a5c942407 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -583,9 +583,7 @@ let
     stdenv = overrideInStdenv stdenv [gnumake381];
   };
 
-  dnsmasq = callPackage ../tools/networking/dnsmasq {
-    # TODO i18n can be installed as well, implement it?
-  };
+  dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
   dnstop = callPackage ../tools/networking/dnstop { };
 
-- 
cgit 1.4.1