From d1939610a6d999597e76f8554b664dc140ed1da2 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Mon, 25 Mar 2024 09:12:13 -0700 Subject: [PATCH] Revert "Upgrade to the latest version of openvpn3" This reverts commit 6a1adb0aa39aee9ccda46de659897e6b813181b0. Unfortunately, openvpn3 v21 has some bugs with DNS search domains, see https://github.com/OpenVPN/openvpn3-linux/issues/208#issuecomment-1807097626 for details. --- flake.nix | 5 ----- shared/polybar-openvpn3/default.nix | 12 +++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index c34cac33..62afdcdb 100644 --- a/flake.nix +++ b/flake.nix @@ -198,11 +198,6 @@ url = "https://github.com/jfly/nixpkgs/commit/653dd896a6cb28f2bc206dc8566348e649bea7d4.patch"; hash = "sha256-/NJqA1zYJ+uYMQ3tV9zyUG6n4LqeIjcyvvfSr07BVps="; }) - (unpatched.fetchpatch { - name = "openvpn3: 20 -> 21"; - url = "https://github.com/NixOS/nixpkgs/pull/295058.patch"; - hash = "sha256-P7HMaybI8AdK/41JzucSUq7i3rg1Q+jOvt0ScmilNWo="; - }) ]; }; }; diff --git a/shared/polybar-openvpn3/default.nix b/shared/polybar-openvpn3/default.nix index c7a19f89..6c57e139 100644 --- a/shared/polybar-openvpn3/default.nix +++ b/shared/polybar-openvpn3/default.nix @@ -8,5 +8,15 @@ with pkgs.python3Packages; buildPythonApplication { nativeBuildInputs = [ setuptools ]; src = ./.; - propagatedBuildInputs = pkgs.openvpn3.pythonPath ++ [ pkgs.openvpn3 ]; + propagatedBuildInputs = pkgs.openvpn3.pythonPath ++ [ + (pkgs.openvpn3.overrideAttrs (oldAttrs: { + patches = [ + # TODO: remove this when v21 of openvpn3 lands on nixpkgs-unstable. + (pkgs.fetchpatch { + url = "https://github.com/OpenVPN/openvpn3-linux/commit/ba6fe37e7e28d1e633b56052383da3072f03c11e.patch"; + sha256 = "sha256-MBXDEfeyg0VQGp9GYcpTZyLB0h6LX1qlaqZSDhOAJgQ="; + }) + ]; + })) + ]; }