From 0467b9b3244a8cde5c75467a4d140a8a9b081bcb Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Mon, 2 Mar 2026 14:27:52 +0800 Subject: [PATCH] sing-geoip, sing-geosite: stop packaging .db files --- pkgs/by-name/si/sing-geoip/main.go | 30 ++++-------------------- pkgs/by-name/si/sing-geoip/package.nix | 2 -- pkgs/by-name/si/sing-geosite/package.nix | 1 - 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/si/sing-geoip/main.go b/pkgs/by-name/si/sing-geoip/main.go index 8c2ac246fba4..574af46272c8 100644 --- a/pkgs/by-name/si/sing-geoip/main.go +++ b/pkgs/by-name/si/sing-geoip/main.go @@ -1,36 +1,14 @@ func main() { var err error - input := os.Args[1] - ruleSetOutput := "rule-set" + input := os.Args[1] + ruleSetOutput := "rule-set" - binary, err := os.ReadFile(input) + binary, err := os.ReadFile(input) if err != nil { panic(err) } - metadata, countryMap, err := parse(binary) - if err != nil { - panic(err) - } - allCodes := make([]string, 0, len(countryMap)) - for code := range countryMap { - allCodes = append(allCodes, code) - } - - writer, err := newWriter(metadata, allCodes) - if err != nil { - panic(err) - } - err = write(writer, countryMap, "geoip.db", nil) - if err != nil { - panic(err) - } - - writer, err = newWriter(metadata, []string{"cn"}) - if err != nil { - panic(err) - } - err = write(writer, countryMap, "geoip-cn.db", []string{"cn"}) + _, countryMap, err := parse(binary) if err != nil { panic(err) } diff --git a/pkgs/by-name/si/sing-geoip/package.nix b/pkgs/by-name/si/sing-geoip/package.nix index 10e259820cd2..e40b36976b47 100644 --- a/pkgs/by-name/si/sing-geoip/package.nix +++ b/pkgs/by-name/si/sing-geoip/package.nix @@ -53,8 +53,6 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - install -Dm644 geoip.db $out/share/sing-box/geoip.db - install -Dm644 geoip-cn.db $out/share/sing-box/geoip-cn.db install -Dm644 rule-set/* -t $out/share/sing-box/rule-set runHook postInstall diff --git a/pkgs/by-name/si/sing-geosite/package.nix b/pkgs/by-name/si/sing-geosite/package.nix index 76ba9725644d..19d1f779a42f 100644 --- a/pkgs/by-name/si/sing-geosite/package.nix +++ b/pkgs/by-name/si/sing-geosite/package.nix @@ -41,7 +41,6 @@ buildGoModule (finalAttrs: { installPhase = '' runHook preInstall - install -Dm644 geosite.db $out/share/sing-box/geosite.db install -Dm644 rule-set/* -t $out/share/sing-box/rule-set runHook postInstall '';