diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index c49f03cc8342..ddb4e0ddfc22 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,26 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security, CoreServices }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, +}: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "shadowsocks"; - repo = pname; - hash = "sha256-bvYp25EPKtkuZzplVYK4Cwd0mm4UuyN1LMiDAkgMIAc="; + repo = "shadowsocks-rust"; + tag = "v${version}"; + hash = "sha256-rufOrNwUp8h0LoBKPyDV63WAYTLJbctWrq5Ghj6ODB4="; }; - cargoHash = "sha256-zmyce0Dt9ai4pNQi+b37KrCDqdjT9tQ8k2yHLDWDTXY="; + useFetchCargoVendor = true; + + cargoHash = "sha256-hdHCpER4qs8W6rMmwys2KhaGDiTWcnntAL3ZeTBgt84="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; buildFeatures = [ "trust-dns" - "local-http-native-tls" "local-tunnel" "local-socks4" "local-redir" @@ -47,11 +54,11 @@ rustPlatform.buildRustPackage rec { # timeouts in sandbox doCheck = false; - meta = with lib; { + meta = { description = "Rust port of Shadowsocks"; homepage = "https://github.com/shadowsocks/shadowsocks-rust"; changelog = "https://github.com/shadowsocks/shadowsocks-rust/raw/v${version}/debian/changelog"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa4973835d87..aa6cdc64dc4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4973,9 +4973,7 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; + shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { }; shellify = haskellPackages.shellify.bin;