From 04a6c3b4567e14c29dfde43c4b1a6fc213478e09 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 20 Oct 2024 16:01:55 +0800
Subject: [PATCH] dbip-country-lite: move to by-name

---
 .../db/dbip-country-lite/package.nix}            | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{data/misc/dbip-country-lite/default.nix => by-name/db/dbip-country-lite/package.nix} (80%)

diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
similarity index 80%
rename from pkgs/data/misc/dbip-country-lite/default.nix
rename to pkgs/by-name/db/dbip-country-lite/package.nix
index cda4a19d26c8..74f9ce977067 100644
--- a/pkgs/data/misc/dbip-country-lite/default.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -1,8 +1,8 @@
-{ lib
-, stdenvNoCC
-, fetchurl
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
 }:
-
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
   version = "2024-10";
@@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb";
 
-  meta = with lib; {
+  meta = {
     description = "Free IP to Country Lite database by DB-IP";
     homepage = "https://db-ip.com/db/download/ip-to-country-lite";
-    license = licenses.cc-by-40;
-    maintainers = with maintainers; [ nickcao ];
-    platforms = platforms.all;
+    license = lib.licenses.cc-by-40;
+    maintainers = with lib.maintainers; [ nickcao ];
+    platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68d3c47aac5e..691d4554a222 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -528,8 +528,6 @@ with pkgs;
 
   databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
 
-  dbip-country-lite = callPackage ../data/misc/dbip-country-lite { };
-
   dcgm = callPackage ../os-specific/linux/dcgm { };
 
   deck = callPackage ../by-name/de/deck/package.nix {