Skip to content

Commit 08a4c76

Browse files
authored
v2ray-geoip.generator: 202501160051 -> 202501190004 (NixOS#375434)
2 parents de6d4da + b97d6cc commit 08a4c76

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

pkgs/by-name/v2/v2ray-geoip/package.nix

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
stdenvNoCC,
44
fetchFromGitHub,
55
pkgsBuildBuild,
6-
jq,
7-
moreutils,
86
dbip-country-lite,
97
}:
108

119
let
1210
generator = pkgsBuildBuild.buildGoModule rec {
1311
pname = "v2ray-geoip";
14-
version = "202501160051";
12+
version = "202501190004";
1513

1614
src = fetchFromGitHub {
1715
owner = "v2fly";
1816
repo = "geoip";
1917
tag = version;
20-
hash = "sha256-WSi7xsjKqQT37lzkOY1WZwvx5RXNKO3aMwnMiMBwMdA=";
18+
hash = "sha256-l5gz3w/80o2UwexzcJ1ALhQMcwqor9m/0RG3WOBeVAc=";
2119
};
2220

2321
vendorHash = "sha256-nvJsifXF6u3eWqd9X0kGZxASEs/LX2dQraZAwgnw060=";
@@ -29,32 +27,20 @@ let
2927
maintainers = with lib.maintainers; [ nickcao ];
3028
};
3129
};
32-
input = {
33-
type = "maxmindMMDB";
34-
action = "add";
35-
args = {
36-
uri = dbip-country-lite.mmdb;
37-
};
38-
};
3930
in
4031

4132
stdenvNoCC.mkDerivation {
4233
inherit (generator) pname src;
4334
inherit (dbip-country-lite) version;
4435

45-
nativeBuildInputs = [
46-
jq
47-
moreutils
48-
];
49-
50-
postPatch = ''
51-
jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json
52-
'';
36+
nativeBuildInputs = [ generator ];
5337

5438
buildPhase = ''
5539
runHook preBuild
5640
57-
${generator}/bin/geoip
41+
mkdir -p db-ip
42+
ln -s ${dbip-country-lite.mmdb} ./db-ip/dbip-country-lite.mmdb
43+
geoip
5844
5945
runHook postBuild
6046
'';

0 commit comments

Comments
 (0)