chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[25.05] fix geph compilation issue and update to v0.2.82 (#438248)

Browse Source
This commit is contained in:
Sandro
2025-09-12 15:26:03 +02:00
committed by GitHub
parent b41479bdb9 0927abaf60
commit 9c027eac83
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/by-name/ge/geph/build-fix.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/binaries/geph5-broker/src/routes.rs b/binaries/geph5-broker/src/routes.rs
index 5d8c244..daebc1b 100644
--- a/binaries/geph5-broker/src/routes.rs
+++ b/binaries/geph5-broker/src/routes.rs
@@ -82,8 +82,8 @@ pub async fn bridge_to_leaf_route(
)
});
- if let Ok(version) = semver::Version::parse(version) &&
- VersionReq::parse(">=0.2.72").unwrap().matches(&version) &&
+ if let Ok(version) = semver::Version::parse(version) {
+ if VersionReq::parse(">=0.2.72").unwrap().matches(&version) &&
bridge.pool.contains("ovh_de") && // only have one group do this
(
asn == 197207 || // hamrah-e avval
@@ -94,7 +94,7 @@ pub async fn bridge_to_leaf_route(
return anyhow::Ok(RouteDescriptor::Delay {
milliseconds: delay_ms,
lower: RouteDescriptor::Race(vec![RouteDescriptor::Delay{milliseconds: 10000, lower: meeklike_route!().await?.into()}, tls_route!().await?.into(), sosistab3_route!().await?.into()]).into(),
- })
+ })}
}
if asn == 9808 || asn == 56044 || asn == 56047 || asn == 58807 || asn == 56048 || asn == 56040 || asn == 56047 {

8
pkgs/by-name/ge/geph/package.nix
View File

@@ -24,16 +24,18 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "geph5";
version = "0.2.77";
version = "0.2.82";
src = fetchFromGitHub {
owner = "geph-official";
repo = "geph5";
rev = "geph5-client-v${finalAttrs.version}";
hash = "sha256-xm2eSCLIPYydR8iwMlZyc/M6bFrUZRqL5yZUXuYdk/k=";
hash = "sha256-z4f6XoMSjMmq+Uf8A/6M+aJs6oDJGdMffVflwc0Q2so=";
};
cargoHash = "sha256-DNk4BQoY8m3OmglXMZzGstl9aC+LhZq9EN0OLW7sBrw=";
cargoHash = "sha256-PhLNS6DdCisQ8sOWm1V72UJpLZX4gVNkt1779mmMB1c=";
patches = [ ./build-fix.patch ];
postPatch = ''
substituteInPlace binaries/geph5-client/src/vpn/*.sh \