Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f85aff5a2215
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16061ff61d59
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2020

  1. v2ray: 4.21.3 -> 4.22.0

    @servalcatty
    servalcatty committed Jan 1, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    servalcatty
    GPG key ID: 4A2AAAA382F8294C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ceeb0ad View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76764 from servalcatty/v2ray 

    v2ray: 4.21.3 -> 4.22.0
    @mmahut
    mmahut authored Jan 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    16061ff View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/tools/networking/v2ray/default.nix
12 changes: 6 additions & 6 deletions pkgs/tools/networking/v2ray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,29 +3,29 @@
, ... } @ args:

callPackage ./generic.nix (rec {
version = "4.21.3";
version = "4.22.0";

src = fetchFromGitHub {
owner = "v2ray";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "0z45nrjnalrvpprq7g4zrjbrdkc3d3lhs4ci8hb8m69f92asiwbs";
sha256 = "1gr4s96ii4dx5bcwpb82rn250pcnncxwzx147p9dbwbyiy0i9nz7";
};

assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "20190516.1";
geoipSha256 = "14h4rq7rlcl1397pwpylfgwpk3fiscpzqb04c4wd5lxkfvk5f02r";
geoipRev = "202001010102";
geoipSha256 = "16i73c3852f7zmya0q3856cc4gvhqhpln9s98qvr2dr1mpp72c1w";
in fetchurl {
url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
};

# MIT licensed
"geosite.dat" = let
geositeRev = "20191121.1";
geositeSha256 = "0ijmvy43pvm69w38djf114j8swni7wfq5ry9wdpv9dj0rzb59m74";
geositeRev = "20191226.1";
geositeSha256 = "0b4ji5kj5jpkwri3libxm9yl49dcy91vkl7h1rkhrrhbl17s3qiy";
in fetchurl {
url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;