diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-06 12:51:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-06 12:51:56 +0100 |
commit | 99fb79ae843e9bc29513365e17418d4f1aee4ce0 (patch) | |
tree | 95fe1827d215ad2d101d15590332a8b46c09dc4c /pkgs/tools/networking | |
parent | c7176d55ac8a801a0368014a3c76c4ebbd5eacaa (diff) | |
parent | da04a8e39741bbf336344b75b9842f2a7dc76ac1 (diff) | |
download | nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.gz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.bz2 nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.lz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.xz nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.tar.zst nixpkgs-99fb79ae843e9bc29513365e17418d4f1aee4ce0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/lldpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/shadowsocks-rust/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 8462d907a1f..5d7c648b220 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd"; + sha256 = "1v5fd8vwxracvzvgrsswvhppwyx5c4srj89g1cnvy73w831mpq95"; }; configureFlags = [ diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 9726cde61e5..ed793a50cb8 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.18"; + version = "1.8.23"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; + sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3"; }; - cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; + cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p"; SODIUM_USE_PKG_CONFIG = 1; |