Merge pull request #115268 from marsam/update-shadowsocks
shadowsocks-rust: 1.9.1 -> 1.9.2
This commit is contained in:
commit
ae9caef020
@ -1,21 +1,21 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
|
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "shadowsocks-rust";
|
pname = "shadowsocks-rust";
|
||||||
version = "1.9.1";
|
version = "1.9.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
owner = "shadowsocks";
|
owner = "shadowsocks";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc";
|
sha256 = "1mqxfw21ilcy0gc2jrn5f385y3g9inabp9fjc39m5ydljja4g5b9";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls";
|
cargoSha256 = "1ja2hcsa2wa0zmblz4ps35jcx1y29j469lf4i9a7sw0kgh3xp1ha";
|
||||||
|
|
||||||
RUSTC_BOOTSTRAP = 1;
|
RUSTC_BOOTSTRAP = 1;
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
|
||||||
|
|
||||||
checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ];
|
checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ];
|
||||||
|
|
||||||
@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec {
|
|||||||
description = "A Rust port of shadowsocks";
|
description = "A Rust port of shadowsocks";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.marsam ];
|
maintainers = [ maintainers.marsam ];
|
||||||
|
broken = stdenv.isAarch64; # crypto2 crate doesn't build on aarch64
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user