From 1117ecff61144d41bccb7507ce5af796d4318b3f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 8 Apr 2023 21:34:31 +0200 Subject: [PATCH] feat: updated flaresolverr --- packages/flaresolverr/default.nix | 4 ++-- packages/flaresolverr/flaresolverr.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/flaresolverr/default.nix b/packages/flaresolverr/default.nix index 8d544bb..99ce3f3 100644 --- a/packages/flaresolverr/default.nix +++ b/packages/flaresolverr/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "flaresolverr"; - version = "3.0.2"; + version = "3.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpeJf1CaQ4bsncZz44sH+tFKddYrZf7YdNYL50d9GA4="; + sha256 = "sha256-36ILIyMTzm9pK9aakfZHfsHWy9xHtFez8QGZuIJ04vM="; }; buildInputs = [ pkgs.makeWrapper ]; diff --git a/packages/flaresolverr/flaresolverr.patch b/packages/flaresolverr/flaresolverr.patch index f9ed276..823029f 100644 --- a/packages/flaresolverr/flaresolverr.patch +++ b/packages/flaresolverr/flaresolverr.patch @@ -1,19 +1,21 @@ diff --git a/src/utils.py b/src/utils.py -index ceff7ec..06623bb 100644 +index eee8868..4b0d226 100644 --- a/src/utils.py +++ b/src/utils.py -@@ -69,13 +69,10 @@ def get_webdriver() -> WebDriver: +@@ -80,14 +80,10 @@ def get_webdriver() -> WebDriver: # downloads and patches the chromedriver # if we don't set driver_executable_path it downloads, patches, and deletes the driver each time -- driver = uc.Chrome(options=options, driver_executable_path=driver_exe_path, version_main=version_main, -+ driver = uc.Chrome(options=options, driver_executable_path="CHANGEME", - windows_headless=windows_headless) +- driver = uc.Chrome(options=options, browser_executable_path=browser_executable_path, +- driver_executable_path=driver_exe_path, version_main=version_main, +- windows_headless=windows_headless) ++ driver = uc.Chrome(options=options, driver_executable_path="CHANGEME", windows_headless=windows_headless) # save the patched driver to avoid re-downloads - if driver_exe_path is None: - PATCHED_DRIVER_PATH = os.path.join(driver.patcher.data_path, driver.patcher.exe_name) - shutil.copy(driver.patcher.executable_path, PATCHED_DRIVER_PATH) ++ # selenium vanilla # options = webdriver.ChromeOptions()