diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-16 16:55:25 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-16 16:55:25 -0500 |
| commit | 889227a0486656069d0f6bc2c7fb02134aa0b356 (patch) | |
| tree | fe85c7bd5e984d731bd09286e9fdc7c5f13c20a6 /pkgs/data | |
| parent | 5394a299c6f94b5b46ddd3cc79e3c37db8dc6339 (diff) | |
| parent | 7acf783486d00b16cb330f00814e656a557a87ee (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/development/python-modules/pdftotext/default.nix
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/s6-man-pages/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-geoip/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/data/documentation/s6-man-pages/default.nix index d38df8cf0373..db4d05a91b04 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/data/documentation/s6-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.0.0.2"; - sha256 = "1ddab4l4wwrg2jdcrdqp1rx8dzbzbdsvx4mzayraxva4q97d1g9r"; + version = "2.11.0.0.5"; + sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6"; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 7187dec537a8..2f3a516de074 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202112090029"; + version = "202112160030"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "97f4acb31d926ae31bb3cdc5c8948d8dcdddca79"; - sha256 = "sha256-kYMp/D7xVpBTu35YXq45bR2XebpVOW57UAc7H/6px/U="; + rev = "4d86284b91a444c2ca989207f8f08a1c8798c95c"; + sha256 = "sha256-pv+oZVMROr7gyGcv60jIP8INt4vBAnUJT0FJNNn+Czc="; }; installPhase = '' |