From 595063ffa7f3df9942bb45c116cfefcbf600783f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Sep 2015 03:12:53 +0200 Subject: [PATCH] ip2location: move to tools/networking --- .../networking}/ip2location/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/{development/libraries => tools/networking}/ip2location/default.nix (50%) diff --git a/pkgs/development/libraries/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix similarity index 50% rename from pkgs/development/libraries/ip2location/default.nix rename to pkgs/tools/networking/ip2location/default.nix index 81280a81ce0..0f365a1caa2 100644 --- a/pkgs/development/libraries/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "7.0.0"; in # meta.homepage might change after a major update +let version = "7.0.0"; in stdenv.mkDerivation { name = "ip2location-${version}"; @@ -15,14 +15,14 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; - description = "Library to look up locations of host names and IP addresses"; + description = "Look up locations of host names and IP addresses"; longDescription = '' - A command-line tool and C library to find the country, region, city, - coordinates, zip code, time zone, ISP, domain name, connection type, - area code, weather, MCC, MNC, mobile brand name, elevation and usage - type of any IP address or host name in the IP2Location databases. + A command-line tool to find the country, region, city,coordinates, + zip code, time zone, ISP, domain name, connection type, area code, + weather, MCC, MNC, mobile brand name, elevation and usage type of + any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/developers/c-7; + homepage = http://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cb56037541..42da60cbdaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1937,6 +1937,8 @@ let iodine = callPackage ../tools/networking/iodine { }; + ip2location = callPackage ../tools/networking/ip2location { }; + ipad_charge = callPackage ../tools/misc/ipad_charge { }; iperf2 = callPackage ../tools/networking/iperf/2.nix { }; @@ -6686,8 +6688,6 @@ let intltool = callPackage ../development/tools/misc/intltool { }; - ip2location = callPackage ../development/libraries/ip2location { }; - irrlicht = callPackage ../development/libraries/irrlicht { }; irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };