diff --git a/pkgs/by-name/cu/curl-impersonate/deps.nix b/pkgs/by-name/cu/curl-impersonate/deps.nix index 3cf8d218c719..d5bed7a49b20 100644 --- a/pkgs/by-name/cu/curl-impersonate/deps.nix +++ b/pkgs/by-name/cu/curl-impersonate/deps.nix @@ -7,9 +7,9 @@ hash = "sha256-KTfK3eAHqjpSoXwhrJFT6gVHAPN5JtHZZgK/B+iIyEc="; }; - "brotli-1.1.0.tar.gz" = fetchurl { - url = "https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz"; - hash = "sha256-5yCmyilCi4A/StFlNxdx9TmPq6OX7fZ3iDehhZnqE/8="; + "brotli-1.2.0.tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v1.2.0.tar.gz"; + hash = "sha256-gWyW6Ojxk7QBUdrX6P83sSIdAZ28ucNc0/rb/mR33+w="; }; "boringssl-673e61fc215b178a90c0e67858bbf162c8158993.zip" = fetchurl { @@ -31,4 +31,24 @@ url = "https://github.com/ngtcp2/nghttp3/releases/download/v1.9.0/nghttp3-1.9.0.tar.bz2"; hash = "sha256-TTCmjxfnKhOStghdr6qfxzLaHX0m7sVUuyFnCDMvzxo="; }; + + "zlib-1.3.1.tar.gz" = fetchurl { + url = "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"; + hash = "sha256-mpOyt9/ax3zrpaVYpYDnRmfdb+3kWFuR7vtg8Dty3yM="; + }; + + "zstd-1.5.6.tar.gz" = fetchurl { + url = "https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz"; + hash = "sha256-jCngbPQqrMHq/EB3ri7Gxvy5amJhV+BZPV6Co0/UA8E="; + }; + + "libunistring-1.1.tar.gz" = fetchurl { + url = "https://ftp.gnu.org/gnu/libunistring/libunistring-1.1.tar.gz"; + hash = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o="; + }; + + "libidn2-2.3.7.tar.gz" = fetchurl { + url = "https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz"; + hash = "sha256-TCGnkbYQuVGbnQ4SuAl78vNZsS+N2SZHYRqSnmv9fWQ="; + }; } diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix index 7928c7a717a9..f7b6ea5718ed 100644 --- a/pkgs/by-name/cu/curl-impersonate/package.nix +++ b/pkgs/by-name/cu/curl-impersonate/package.nix @@ -26,7 +26,7 @@ }: stdenv.mkDerivation rec { pname = "curl-impersonate"; - version = "1.2.0"; + version = "1.4.2"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "lexiforest"; repo = "curl-impersonate"; tag = "v${version}"; - hash = "sha256-tAQdTRGAOD2rpLZvoLQ2YL0wrohXEcmChMZBvYjsMhE="; + hash = "sha256-c24KaYc0cH6b+92kg02mMtTp7ZVu36LeDpW5xjxuzk4="; }; # Disable blanket -Werror to fix build on `gcc-13` related to minor @@ -157,6 +157,7 @@ stdenv.mkDerivation rec { let libext = stdenv.hostPlatform.extensions.sharedLibrary; in + # sh '' # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure if grep -F nssckbi $out/lib/libcurl-impersonate${libext} &>/dev/null; then @@ -165,6 +166,9 @@ stdenv.mkDerivation rec { patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate${libext} ''} fi + + # installPhase already installs curl headers in $dev, better to override those + rm -rf "$dev/include/curl" ''; disallowedReferences = [ go ]; @@ -197,7 +201,7 @@ stdenv.mkDerivation rec { meta = { changelog = "https://github.com/lexiforest/curl-impersonate/releases/tag/${src.tag}"; - description = "Special build of curl that can impersonate Chrome & Firefox"; + description = "Special build of curl that can impersonate Chrome, Edge, Safari and Firefox"; homepage = "https://github.com/lexiforest/curl-impersonate"; license = with lib.licenses; [ curl diff --git a/pkgs/by-name/cu/curl-impersonate/update.sh b/pkgs/by-name/cu/curl-impersonate/update.sh index 0c0b9b2021b1..fa3ecce6a4f3 100755 --- a/pkgs/by-name/cu/curl-impersonate/update.sh +++ b/pkgs/by-name/cu/curl-impersonate/update.sh @@ -99,6 +99,26 @@ cat >"$(dirname "$pkgpath")"/deps.nix <