python310Packages.geoip: Normalize attribute, pname, dirname

6 files changed, 13 insertions, 9 deletions

diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix
index a4b78e250d5c2..016ff2aa5e00d 100644
--- a/pkgs/applications/networking/p2p/tremc/default.nix
+++ b/pkgs/applications/networking/p2p/tremc/default.nix
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
     ipy
     pyperclip
   ] ++
-  lib.optional useGeoIP GeoIP;
+  lib.optional useGeoIP geoip;
 
   dontBuild = true;
   doCheck = false;
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/geoip/default.nix
index 95423a858d06e..0db8cb1e4a98d 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/geoip/default.nix
@@ -1,17 +1,18 @@
 {lib, buildPythonPackage, fetchPypi
-, geoip, nose}:
+, libgeoip, nose}:
 
 buildPythonPackage rec {
-  pname = "GeoIP";
+  pname = "geoip";
   version = "1.3.2";
 
   nativeCheckInputs = [ nose ];
   propagatedBuildInputs = [
-    geoip
+    libgeoip
   ];
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "GeoIP";
+    inherit version;
     sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458";
   };
 
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index e412b9a870276..6a4a098856b87 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,7 @@
 , buildPythonPackage
 , cryptography
 , fetchPypi
-, GeoIP
+, geoip
 , idna
 , incremental
 , lsof
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     pytestCheckHook
     mock
     lsof
-    GeoIP
+    geoip
   ];
 
   doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix
index bab81c2069e8b..3c70713bedbc3 100644
--- a/pkgs/tools/networking/dnstwist/default.nix
+++ b/pkgs/tools/networking/dnstwist/default.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     dnspython
-    GeoIP
+    geoip
     ppdeep
     requests
     tld
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a6c20a4da99ca..3fa645de155b8 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -100,6 +100,7 @@ mapAliases ({
   garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
   garminconnect-ha = garminconnect; # added 2022-02-05
   gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15
+  GeoIP = geoip; # added 2023-02-19
   gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   GitPython = gitpython; # added 2022-10-28
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 985ac8554332b..7771d78fdc6b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3773,7 +3773,9 @@ self: super: with self; {
 
   geoip2 = callPackage ../development/python-modules/geoip2 { };
 
-  GeoIP = callPackage ../development/python-modules/GeoIP { };
+  geoip = callPackage ../development/python-modules/geoip {
+    libgeoip = pkgs.geoip;
+  };
 
   geojson = callPackage ../development/python-modules/geojson { };