From 397550afe5414630713807ea756026707e7bc12d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Jan 2014 20:23:34 +0100
Subject: geoip: update from 1.4.6 to 1.6.0

---
 pkgs/development/libraries/geoip/default.nix         | 7 +++----
 pkgs/development/libraries/geoip/src-for-default.nix | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 869820254164..94c0505bc6fa 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     zlib
@@ -14,8 +14,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-  goSrcDir = "cd GeoIP-*/";
-      
+
   meta = {
     description = "Geolocation API";
     maintainers = [
diff --git a/pkgs/development/libraries/geoip/src-for-default.nix b/pkgs/development/libraries/geoip/src-for-default.nix
index cb9a5e758fc8..1fc4b9b8755a 100644
--- a/pkgs/development/libraries/geoip/src-for-default.nix
+++ b/pkgs/development/libraries/geoip/src-for-default.nix
@@ -1,8 +1,8 @@
 rec {
   advertisedUrl="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
   version = "1.4.6";
-  url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
-  hash = "1i4ixj6ha62qqzsn23qg428cv1zjj2ip7kmas62xgivvgm02kd0n";
-  name = "geoip-1.4.6";
+  url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.6.0.tar.gz";
+  hash = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
+  name = "geoip-1.6.0";
   
 }
-- 
cgit 1.4.1