diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-22 18:01:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-22 18:01:34 +0000 |
| commit | 3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266 (patch) | |
| tree | a8a0dd22846cd6db27d3e0aaf04943e149c86fac /pkgs/data | |
| parent | 10aabaf09726f91d6dedf8583e4b64added60559 (diff) | |
| parent | 7e2d89350d960f6bff9188cd3d3cca6ed7b0b1b2 (diff) | |
| download | nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar.gz nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar.bz2 nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar.lz nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar.xz nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.tar.zst nixpkgs-3d9ca9d8e3e1590e5b5813a67285bbd1f50b0266.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/sing-geosite/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-geoip/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/data/misc/sing-geosite/default.nix index 55ba01c6155..900e5ef86c8 100644 --- a/pkgs/data/misc/sing-geosite/default.nix +++ b/pkgs/data/misc/sing-geosite/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , substituteAll , v2ray-domain-list-community @@ -11,7 +11,7 @@ let geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; }; in -buildGoModule rec { +buildGo120Module { pname = "sing-geosite"; inherit (v2ray-domain-list-community) version; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 5dbaa6c9c93..fb9064a437d 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -8,18 +8,18 @@ }: let - generator = pkgsBuildBuild.buildGoModule { + generator = pkgsBuildBuild.buildGo120Module { pname = "v2ray-geoip"; - version = "unstable-2023-03-27"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9321a7f5e301a957228eba44845144b4555b6658"; - hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs="; + rev = "3182dda7b38c900f28505b91a44b09ec486e6f36"; + hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM="; }; - vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc="; + vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc="; meta = with lib; { description = "GeoIP for V2Ray"; |