commit 35e4b4e3eda4caed0d5fdc78cc69e312e6dfb308 · pyrox.dev/nixpkgs

+6 -6

pkgs/by-name/cl/clash-rs/Cargo.patch

···

       1
       1
        
       --- a/Cargo.lock

     

       2
       2
        
       +++ b/Cargo.lock

     

       3
       3
       -
       @@ -1462,7 +1462,7 @@

     

       3
       3
       +
       @@ -1250,7 +1250,7 @@

     

       4
       4
        
         "sha2",

     

       5
       5
        
         "shadowquic",

     

       6
       6
        
         "shadowsocks",

     
···

       8
       8
        
       + "smoltcp 0.12.0",

     

       9
       9
        
         "socket2 0.6.0",

     

       10
       10
        
         "tempfile",

     

       11
       11
       -
         "thiserror 2.0.15",

     

       12
       12
       -
       @@ -4439,7 +4439,7 @@

     

       11
       11
       +
         "thiserror 2.0.17",

     

       12
       12
       +
       @@ -4096,7 +4096,7 @@

     

       13
       13
        
         "etherparse 0.16.0",

     

       14
       14
        
         "futures",

     

       15
       15
        
         "rand 0.8.5",

     
···

       18
       18
        
         "spin 0.9.8",

     

       19
       19
        
         "tokio",

     

       20
       20
        
         "tokio-util",

     

       21
       21
       -
       @@ -6892,20 +6892,6 @@

     

       21
       21
       +
       @@ -6487,20 +6487,6 @@

     

       22
       22
        
        ]

     

       23
       23
       -
       

     

       23
       23
       +
        

     

       24
       24
        
        [[package]]

     

       25
       25
        
       -name = "smoltcp"

     

       26
       26
        
       -version = "0.12.0"

     
···

       39
       39
        
        name = "socket2"

     

       40
       40
        
        version = "0.4.10"

     

       41
       41
        
        source = "registry+https://github.com/rust-lang/crates.io-index"

     

       42
       42
       -
       @@ -9231,7 +9217,7 @@

     

       42
       42
       +
       @@ -8792,7 +8778,7 @@

     

       43
       43
        
         "netstack-lwip",

     

       44
       44
        
         "netstack-smoltcp",

     

       45
       45
        
         "rand 0.9.2",

+6 -8

pkgs/by-name/cl/clash-rs/package.nix

···

       10
       10
        
       }:

     

       11
       11
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
       12
        
         pname = "clash-rs";

     

       13
       13
       -
         version = "0.9.0";

     

       13
       13
       +
         version = "0.9.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "Watfaq";

     

       17
       17
        
           repo = "clash-rs";

     

       18
       18
        
           tag = "v${finalAttrs.version}";

     

       19
       19
       -
           hash = "sha256-OwoDvcGpuU2x6O3+rBJSXGS2VoeFt/oVgFWUaCUyC8E=";

     

       19
       19
       +
           hash = "sha256-asD7veAYdIF5biCbSXYvAyW/qBra3tvON9TQYCw6nB8=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-HKW6bOkHkBINwA2tgaKHEozKzT4n54roj6W989JUoAQ=";

     

       22
       22
       +
         cargoHash = "sha256-9zCQKxkjiskkBGxfnq2ANpqWobs+UJ5qCsbME2Z7GY4=";

     

       23
       23
        
       

     

       24
       24
        
         cargoPatches = [ ./Cargo.patch ];

     

       25
       25
        
       

     
···

       46
       46
        
         env = {

     

       47
       47
        
           # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip

     

       48
       48
        
           RUSTC_BOOTSTRAP = 1;

     

       49
       49
       +
           RUSTFLAGS = "--cfg tokio_unstable";

     

       50
       50
       +
           NIX_CFLAGS_COMPILE = "-Wno-error";

     

       49
       51
        
         };

     

       50
       52
        
       

     

       51
       51
       -
         buildFeatures = [

     

       52
       52
       -
           "shadowsocks"

     

       53
       53
       -
           "tuic"

     

       54
       54
       -
           "onion"

     

       55
       55
       -
         ];

     

       53
       53
       +
         buildFeatures = [ "plus" ];

     

       56
       54
        
       

     

       57
       55
        
         doCheck = false; # test failed

     

       58
       56

+5 -5

pkgs/by-name/cl/clash-rs/unbounded-shifts.patch

···

       1
       1
        
       --- a/clash-lib/src/lib.rs

     

       2
       2
        
       +++ b/clash-lib/src/lib.rs

     

       3
       3
       -
       @@ -4,7 +4,7 @@

     

       4
       4
       -
        #![feature(let_chains)]

     

       3
       3
       +
       @@ -3,7 +3,7 @@

     

       4
       4
       +
        #![feature(sync_unsafe_cell)]

     

       5
       5
        
        #![feature(lazy_get)]

     

       6
       6
        
        #![feature(duration_millis_float)]

     

       7
       7
        
       -#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))]

     

       8
       8
        
       +#![feature(unbounded_shifts)]

     

       9
       9
       -
       

     

       10
       10
       -
        #[macro_use]

     

       11
       11
       -
        extern crate anyhow;

     

       9
       9
       +
        #![cfg_attr(not(version("1.88.0")), feature(let_chains))]

     

       10
       10
       +
        

     

       11
       11
       +
        use crate::{