From 470efda5ce82a286687fa619ddd0a0c81257eb27 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 19 Oct 2024 21:13:23 +0800 Subject: [PATCH] clash-geoip: drop --- pkgs/data/misc/clash-geoip/default.nix | 32 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/data/misc/clash-geoip/default.nix diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix deleted file mode 100644 index 885d952c3230..000000000000 --- a/pkgs/data/misc/clash-geoip/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, nix-update-script }: - -stdenvNoCC.mkDerivation rec { - pname = "clash-geoip"; - version = "20240912"; - - src = fetchurl { - url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-3Cxq5vA53g7+LUgvSneuq7UBjdKppvcVy3fh/cOwDI8="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/etc/clash - install -Dm 0644 $src -D $out/etc/clash/Country.mmdb - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GeoLite2 data created by MaxMind"; - homepage = "https://github.com/Dreamacro/maxmind-geoip"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fad47d137f0f..6f586dd99c3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -280,6 +280,7 @@ mapAliases { crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..127639772726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4303,8 +4303,6 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash-geoip = callPackage ../data/misc/clash-geoip { }; - clevercsv = with python3Packages; toPythonApplication clevercsv; cli53 = callPackage ../tools/admin/cli53 { };