Unverified Commit 76fb7938 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

sing-geoip, sing-geosite: stop packaging .db files (#495720)

parents 009a695b 0467b9b3

pkgs/by-name/si/sing-geoip/main.go

+4 −26
Original line number Diff line number Diff line
@@ -8,29 +8,7 @@ func main() { 
	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)

	}

pkgs/by-name/si/sing-geoip/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/si/sing-geosite/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -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

  '';