diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index cd40062aca349..f2a7f12fa5672 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -55,6 +55,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `services.pingvin-share` has been removed as the `pingvin-share.backend` package was broken and the project was archived upstream. +- `geph` package's built-in GUI `geph5-client-gui` has been [removed](https://github.com/geph-official/geph5/commit/f2221fb8386312daf2cef05483ebb353ff48bdb4) by the upstream. All users who wish to continue using the GUI should install the `gephgui-wry`, which is consistent with the official release version. + ## Other Notable Changes {#sec-release-26.05-notable-changes} diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix index a9ed2d243775c..26c45b43dce3f 100644 --- a/pkgs/by-name/ge/geph/package.nix +++ b/pkgs/by-name/ge/geph/package.nix @@ -3,17 +3,11 @@ rustPlatform, fetchFromGitHub, pkg-config, - libxkbcommon, openssl, rust-jemalloc-sys-unprefixed, sqlite, - vulkan-loader, - wayland, iproute2, iptables, - libglvnd, - copyDesktopItems, - makeDesktopItem, nix-update-script, }: let @@ -24,29 +18,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "geph5"; - version = "0.2.86"; + version = "0.2.93"; src = fetchFromGitHub { owner = "geph-official"; repo = "geph5"; rev = "geph5-client-v${finalAttrs.version}"; - hash = "sha256-68b6czefoqLskdqhc9kDIoS8eDCKu56lqvX8Jz47C3k="; + hash = "sha256-ZYcGW6Ssauf5BUs75KBV+4Zub2ZCVN29cWTxeNi87cI="; }; - cargoHash = "sha256-CoYnP83Ci5Jp3Hunm2+xdXBu0mlhADf4jyfLSIXZ0jI="; + cargoHash = "sha256-0Ml8tgWghxhDJzUMMD+YGwy3fyFjKcNjbV8MDJW8rZk="; postPatch = '' substituteInPlace binaries/geph5-client/src/vpn/*.sh \ --replace-fail 'PATH=' 'PATH=${binPath}:' - - # This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230 - cat ${./settings_default.yaml} | base32 -w 0 | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32 ''; - nativeBuildInputs = [ - pkg-config - copyDesktopItems - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl @@ -69,39 +57,13 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=traffcount::tests::test_traffic_count_basic" # Requires network "--skip=dns::tests::resolve_google" + "--skip=tests::test_clib" # Never finish "--skip=tests::test_blind_sign" "--skip=tests::test_generate_secret_key" "--skip=tests::ping_pong" ]; - desktopItems = [ - (makeDesktopItem { - name = "Geph5"; - desktopName = "Geph5"; - icon = "geph5"; - exec = "geph5-client-gui"; - categories = [ "Network" ]; - comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; - }) - ]; - - postInstall = '' - install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png - ''; - - postFixup = '' - # Add required but not explicitly requested libraries - patchelf --add-rpath '${ - lib.makeLibraryPath [ - wayland - libxkbcommon - vulkan-loader - libglvnd - ] - }' "$out/bin/geph5-client-gui" - ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" diff --git a/pkgs/by-name/ge/geph/settings_default.yaml b/pkgs/by-name/ge/geph/settings_default.yaml deleted file mode 100644 index 3121ebccdeb85..0000000000000 --- a/pkgs/by-name/ge/geph/settings_default.yaml +++ /dev/null @@ -1,23 +0,0 @@ -exit_constraint: auto - -broker: - race: - - fronted: - front: https://www.cdn77.com/ - host: 1826209743.rsc.cdn77.org - - fronted: - front: https://www.vuejs.org/ - host: svitania-naidallszei-2.netlify.app - override_dns: - - 75.2.60.5:443 - - fronted: - front: https://www.vuejs.org/ - host: svitania-naidallszei-3.netlify.app - override_dns: - - 75.2.60.5:443 - - aws_lambda: - function_name: geph-lambda-bouncer - region: us-east-1 - obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37 - -spoof_dns: true