diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-02 00:13:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 00:13:09 +0000 |
| commit | c17e6d2b5c184e65f10cd6d976ca0035e897d0f9 (patch) | |
| tree | 8ce5b56b45a7a9d48957333acf4728aadbdf63e3 /pkgs/data/misc | |
| parent | 988741ea024c63d108c920bb011baa3598603fd8 (diff) | |
| parent | 5aeb601daec87e5cefb01b68266282d5072aed34 (diff) | |
| download | nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar.gz nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar.bz2 nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar.lz nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar.xz nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.tar.zst nixlib-c17e6d2b5c184e65f10cd6d976ca0035e897d0f9.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/dbip-country-lite/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 73c8d4414505..60d5e332c216 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -1,16 +1,15 @@ { lib , stdenvNoCC , fetchurl -, dbip-country-lite }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-07"; + version = "2023-08"; src = fetchurl { - url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz"; - hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA="; + url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ="; }; dontUnpack = true; @@ -24,7 +23,7 @@ stdenvNoCC.mkDerivation rec { runHook postBuild ''; - passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb"; + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb"; meta = with lib; { description = "The free IP to Country Lite database by DB-IP"; @@ -33,4 +32,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ nickcao ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 79b8a10d7d0d..8864f3923f91 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230725085751"; + version = "20230730120627"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-4D975ASoDoXjEi0kkwsUIIT6nwOE3ggBzNUVp0ojsbQ="; + hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { |