cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #206876 from r-ryantm/auto-update/shadowsocks-rust

Browse source 
shadowsocks-rust: 1.14.3 -> 1.15.1
This commit is contained in:
Mario Rodas 2023-01-03 09:36:25 -05:00 committed by GitHub
commit bb6bb541a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/tools/networking/shadowsocks-rust/default.nix
View file

@ -1,24 +1,22 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, libiconv }: { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security, CoreServices }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust"; pname = "shadowsocks-rust";
version = "1.14.3"; version = "1.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "shadowsocks"; owner = "shadowsocks";
repo = pname; repo = pname;
sha256 = "sha256-tRiziyCw1Qpm22RtZHeKt4VFReJidFHsPxPSjxIA3hA="; hash = "sha256-CvAOvtC5U2njQuUjFxjnGeqhuxrCw4XI6goo1TxIhIU=";
}; };
cargoSha256 = "sha256-snnzNb1yJ8L5pMvNNEIf5hZOpFV6DKOWGtGP1T3YTWg="; cargoHash = "sha256-ctZlYo82M7GKVvrEkw/7+aH9R0MeEsyv3IKl9k4SbiA=";
RUSTC_BOOTSTRAP = 1; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security CoreServices ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
cargoBuildFlags = [ cargoBuildFlags = [
"--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun" "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun"
@ -36,8 +34,9 @@ rustPlatform.buildRustPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = "A Rust port of Shadowsocks";
homepage = "https://github.com/shadowsocks/shadowsocks-rust"; homepage = "https://github.com/shadowsocks/shadowsocks-rust";
description = "A Rust port of shadowsocks"; changelog = "https://github.com/shadowsocks/shadowsocks-rust/raw/v${version}/debian/changelog";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.marsam ]; maintainers = [ maintainers.marsam ];
}; };

2
pkgs/top-level/all-packages.nix
View file

@ -11596,7 +11596,7 @@ with pkgs;
shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { };
shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) Security CoreServices;
}; };
shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { };