Unverified Commit c92c027a authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

clash-verge-rev: 2.0.2 -> 2.0.3 (#374541)

parents f9d6c5f3 71d1ee92

pkgs/by-name/cl/clash-verge-rev/0001-enable-format_bytes_speed-for-every-platform.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
diff --git a/src/utils/help.rs b/src/utils/help.rs

index 9b0bc6a7..471b2adc 100644

--- a/src/utils/help.rs

+++ b/src/utils/help.rs

@@ -201,16 +201,6 @@ macro_rules! t {

     };

 }

 

-/// 将字节数转换为可读的流量字符串

-/// 支持 B/s、KB/s、MB/s、GB/s 的自动转换

-///

-/// # Examples

-/// ```

-/// assert_eq!(format_bytes_speed(1000), "1000B/s");

-/// assert_eq!(format_bytes_speed(1024), "1.0KB/s");

-/// assert_eq!(format_bytes_speed(1024 * 1024), "1.0MB/s");

-/// ```

-#[cfg(target_os = "macos")]

 pub fn format_bytes_speed(speed: u64) -> String {

     if speed < 1024 {

         format!("{}B/s", speed)

@@ -222,6 +212,15 @@ pub fn format_bytes_speed(speed: u64) -> String {

         format!("{:.1}GB/s", speed as f64 / 1024.0 / 1024.0 / 1024.0)

     }

 }

+/// 将字节数转换为可读的流量字符串

+/// 支持 B/s、KB/s、MB/s、GB/s 的自动转换

+///

+/// # Examples

+/// ```

+/// assert_eq!(format_bytes_speed(1000), "1000B/s");

+/// assert_eq!(format_bytes_speed(1024), "1.0KB/s");

+/// assert_eq!(format_bytes_speed(1024 * 1024), "1.0MB/s");

+/// ```

 

 #[test]

 fn test_format_bytes_speed() {

-- 

2.47.0

pkgs/by-name/cl/clash-verge-rev/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -14,23 +14,23 @@ 
}:

let

  pname = "clash-verge-rev";

  version = "2.0.2";

  version = "2.0.3";



  src = fetchFromGitHub {

    owner = "clash-verge-rev";

    repo = "clash-verge-rev";

    tag = "v${version}";

    hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w=";

    hash = "sha256-vHXXFHdKETJBlzbf4sU+gZpDz06My9DCx5nWdMpHmyc=";

  };



  src-service = fetchFromGitHub {

    owner = "clash-verge-rev";

    repo = "clash-verge-service";

    rev = "8b676086f2770e213cffea08ef31b54b886f8f11"; # no meaningful tags in this repo. The only way is updating manully every time.

    hash = "sha256-vF26Bp52y2kNHwwtBjy3Of75qJpTriqvul29KmudHww=";

    rev = "7f8ad08c2f716ca50c074ecd37967728e08edf1e"; # no meaningful tags in this repo. The only way is updating manully every time.

    hash = "sha256-kZf5O3n0xmNUN0G4hAWQDN9Oj9K7PtLpv6jnhh1C5Hg=";

  };



  service-cargo-hash = "sha256-pMOCifffUyBkcXC8inZFZeZVHeaOt0LAu2jZUGQ7QdM=";

  service-cargo-hash = "sha256-uo/2QBsZzoTdwRiW0Kr7GGiQCpQH4lW4h5XHqWd5sTU=";



  service = callPackage ./service.nix {

    inherit
@@ -52,8 +52,8 @@ let 
      ;

  };



  npm-hash = "sha256-zsgZhLC+XUzlCUKKGAJV5MlSpWsoLmAgMwKkmAkAX9Q=";

  vendor-hash = "sha256-fk3OdJ1CKNHkeUjquJtJgM7PDyPpQ7tssDnFZHMbQHI=";

  npm-hash = "sha256-vpa8WyOMOH02g2gxibJmav9yWS3QLhaVcFB0e3cZ8ok=";

  vendor-hash = "sha256-JAAhcMfRTlkQQ8lBMLMN+whkGQ/4WHjywompirnc/GI=";



  unwrapped = callPackage ./unwrapped.nix {

    inherit

pkgs/by-name/cl/clash-verge-rev/unwrapped.nix

+18 −14
Original line number Diff line number Diff line
@@ -28,8 +28,12 @@ rustPlatform.buildRustPackage { 
    OPENSSL_NO_VENDOR = 1;

  };



  patches = [

    # https://github.com/clash-verge-rev/clash-verge-rev/pull/2582

    ./0001-enable-format_bytes_speed-for-every-platform.patch

  ];



  postPatch = ''

    ls $cargoDepsCopy

    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \

      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"