pyrox.dev
geph: 0.2.61 -> 0.2.72 (#426932)
authored by
+4
-6
pkgs/by-name/ge/geph/package.nix
+4
-6
pkgs/by-name/ge/geph/package.nix
···
23
23
in
24
24
rustPlatform.buildRustPackage (finalAttrs: {
25
25
pname = "geph5";
26
-
version = "0.2.61";
26
+
version = "0.2.72";
27
27
28
28
src = fetchFromGitHub {
29
29
owner = "geph-official";
30
30
repo = "geph5";
31
31
rev = "geph5-client-v${finalAttrs.version}";
32
-
hash = "sha256-qy1E5x5Fn+xwS5st6HkMrJu9nksXQQIyJf97FvNOKO4=";
32
+
hash = "sha256-+/oOQjebkn3iYi5UXFzFoe0ldu+p+nf5uEjGhk5nlNo=";
33
33
};
34
34
35
-
cargoHash = "sha256-r97DsSsqp/KtgqtYQe92nz2qaOBcJF6w9ckfxpk8Cxg=";
36
-
37
-
patches = [ ./test-fix.patch ];
35
+
cargoHash = "sha256-OFSsMa/xErNB+1cvEOnGshJJEcG8ZDf9y/uYVnsVwhU=";
38
36
39
37
postPatch = ''
40
38
substituteInPlace binaries/geph5-client/src/vpn/*.sh \
···
64
62
65
63
checkFlags = [
66
64
# Wrong test
67
-
"--skip=traffcount::tests::test_traffic_cleanup"
68
65
"--skip=traffcount::tests::test_traffic_count_basic"
69
66
# Requires network
70
67
"--skip=dns::tests::resolve_google"
71
68
# Never finish
72
69
"--skip=tests::test_blind_sign"
73
70
"--skip=tests::test_generate_secret_key"
71
+
"--skip=tests::ping_pong"
74
72
];
75
73
76
74
desktopItems = [
-27
pkgs/by-name/ge/geph/test-fix.patch
-27
pkgs/by-name/ge/geph/test-fix.patch
···
1
-
diff --git a/binaries/geph5-client/src/traffcount.rs b/binaries/geph5-client/src/traffcount.rs
2
-
index 5c91a27..61c0b3b 100644
3
-
--- a/binaries/geph5-client/src/traffcount.rs
4
-
+++ b/binaries/geph5-client/src/traffcount.rs
5
-
@@ -28,14 +28,14 @@ impl TraffCount {
6
-
}
7
-
8
-
// /// Create a new traffic counter with custom history length
9
-
- // pub fn with_history(max_seconds: usize) -> Self {
10
-
- // let now = Instant::now();
11
-
- // Self {
12
-
- // bins: VecDeque::with_capacity(max_seconds),
13
-
- // window_start: now,
14
-
- // max_history_seconds: max_seconds,
15
-
- // }
16
-
- // }
17
-
+ pub fn with_history(max_seconds: usize) -> Self {
18
-
+ let now = Instant::now();
19
-
+ Self {
20
-
+ bins: VecDeque::with_capacity(max_seconds),
21
-
+ window_start: now,
22
-
+ max_history_seconds: max_seconds,
23
-
+ }
24
-
+ }
25
-
26
-
/// Increment the traffic count with the given number of bytes
27
-
pub fn incr(&mut self, bytes: f64) {