commit 93a64793df33b1b6a0d6a876ac1c1692b6f44133 · pyrox.dev/nixpkgs

+33 -32

pkgs/by-name/cu/curl-impersonate/chrome/default.nix

···

       13
       13
        
         python3,

     

       14
       14
        
         ninja,

     

       15
       15
        
         perl,

     

       16
       16
       +
         pkg-config,

     

       16
       17
        
         autoconf,

     

       17
       18
        
         automake,

     

       18
       19
        
         libtool,

     
···

       24
       25
        
       }:

     

       25
       26
        
       stdenv.mkDerivation rec {

     

       26
       27
        
         pname = "curl-impersonate-chrome";

     

       27
       27
       -
         version = "0.8.0";

     

       28
       28
       +
         version = "1.2.0";

     

       28
       29
        
       

     

       29
       30
        
         outputs = [

     

       30
       31
        
           "out"

     
···

       32
       33
        
         ];

     

       33
       34
        
       

     

       34
       35
        
         src = fetchFromGitHub {

     

       35
       35
       -
           owner = "yifeikong";

     

       36
       36
       +
           owner = "lexiforest";

     

       36
       37
        
           repo = "curl-impersonate";

     

       37
       38
        
           rev = "v${version}";

     

       38
       38
       -
           hash = "sha256-m6zeQUL+yBh3ixS+crbJWHX5TLa61A/3oqMz5UVELso=";

     

       39
       39
       +
           hash = "sha256-tAQdTRGAOD2rpLZvoLQ2YL0wrohXEcmChMZBvYjsMhE=";

     

       39
       40
        
         };

     

       40
       40
       -
       

     

       41
       41
       -
         patches = [ ./disable-building-docs.patch ];

     

       42
       41
        
       

     

       43
       42
        
         # Disable blanket -Werror to fix build on `gcc-13` related to minor

     

       44
       43
        
         # warnings on `boringssl`.

     
···

       62
       61
        
             python3.pythonOnBuildForHost.pkgs.gyp

     

       63
       62
        
             ninja

     

       64
       63
        
             perl

     

       64
       64
       +
             pkg-config

     

       65
       65
        
             autoconf

     

       66
       66
        
             automake

     

       67
       67
        
             libtool

     
···

       82
       82
        
           "--with-ca-path=${cacert}/etc/ssl/certs"

     

       83
       83
        
         ];

     

       84
       84
        
       

     

       85
       85
       -
         buildFlags = [ "chrome-build" ];

     

       86
       86
       -
         checkTarget = "chrome-checkbuild";

     

       87
       87
       -
         installTargets = [ "chrome-install" ];

     

       85
       85
       +
         buildFlags = [ "build" ];

     

       86
       86
       +
         checkTarget = "checkbuild";

     

       87
       87
       +
         installTargets = [ "install" ];

     

       88
       88
        
       

     

       89
       89
        
         doCheck = true;

     

       90
       90
        
       

     
···

       117
       117
        
             popd

     

       118
       118
        
           '';

     

       119
       119
        
       

     

       120
       120
       +
         postPatch = ''

     

       121
       121
       +
           substituteInPlace Makefile.in \

     

       122
       122
       +
             --replace-fail "-lc++" "-lstdc++"

     

       123
       123
       +
         '';

     

       124
       124
       +
       

     

       120
       125
        
         preConfigure = ''

     

       121
       126
        
           export GOCACHE=$TMPDIR/go-cache

     

       122
       127
        
           export GOPATH=$TMPDIR/go

     
···

       129
       134
        
       

     

       130
       135
        
         postInstall = ''

     

       131
       136
        
           # Remove vestigial *-config script

     

       132
       132
       -
           rm $out/bin/curl-impersonate-chrome-config

     

       137
       137
       +
           rm $out/bin/curl-impersonate-config

     

       133
       138
        
       

     

       134
       139
        
           # Patch all shebangs of installed scripts

     

       135
       140
        
           patchShebangs $out/bin

     
···

       138
       143
        
           make -C curl-*/include install

     

       139
       144
        
         ''

     

       140
       145
        
         + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       141
       141
       -
           # Build and install completions for each curl binary

     

       146
       146
       +
           # Patch completion names

     

       147
       147
       +
           substituteInPlace curl-*/scripts/Makefile \

     

       148
       148
       +
             --replace-fail "_curl" "_curl-impersonate" \

     

       149
       149
       +
             --replace-fail "curl.fish" "curl-impersonate.fish"

     

       142
       150
        
       

     

       143
       143
       -
           # Patch in correct binary name and alias it to all scripts

     

       144
       144
       -
           perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell zsh >$TMPDIR/curl-impersonate-chrome.zsh

     

       145
       145
       -
           substituteInPlace $TMPDIR/curl-impersonate-chrome.zsh \

     

       146
       146
       -
             --replace-fail \

     

       147
       147
       -
               '#compdef curl' \

     

       148
       148
       -
               "#compdef curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-chrome')"

     

       149
       149
       -
       

     

       150
       150
       -
           perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-chrome --shell fish >$TMPDIR/curl-impersonate-chrome.fish

     

       151
       151
       -
           substituteInPlace $TMPDIR/curl-impersonate-chrome.fish \

     

       152
       152
       -
             --replace-fail \

     

       153
       153
       -
               '--command curl' \

     

       154
       154
       -
               "--command curl-impersonate-chrome$(find $out/bin -name 'curl_*' -printf ' --command %f')"

     

       155
       155
       -
       

     

       156
       156
       -
           # Install zsh and fish completions

     

       157
       157
       -
           installShellCompletion $TMPDIR/curl-impersonate-chrome.{zsh,fish}

     

       151
       151
       +
           # Install completions

     

       152
       152
       +
           make -C curl-*/scripts install

     

       158
       153
        
         '';

     

       159
       154
        
       

     

       160
       155
        
         preFixup =

     
···

       163
       158
        
           in

     

       164
       159
        
           ''

     

       165
       160
        
             # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure

     

       166
       166
       -
             if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then

     

       161
       161
       +
             if grep -F nssckbi $out/lib/libcurl-impersonate${libext} &>/dev/null; then

     

       167
       162
        
               ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext}

     

       168
       163
        
               ${lib.optionalString stdenv.hostPlatform.isElf ''

     

       169
       169
       -
                 patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext}

     

       164
       164
       +
                 patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate${libext}

     

       170
       165
        
               ''}

     

       171
       166
        
             fi

     

       172
       167
        
           '';

     
···

       178
       173
        
       

     

       179
       174
        
           updateScript = ./update.sh;

     

       180
       175
        
       

     

       176
       176
       +
           # Find the correct boringssl source file

     

       177
       177
       +
           boringssl-source = builtins.head (

     

       178
       178
       +
             lib.mapAttrsToList (_: file: file) (

     

       179
       179
       +
               lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps

     

       180
       180
       +
             )

     

       181
       181
       +
           );

     

       181
       182
        
           boringssl-go-modules =

     

       182
       183
        
             (buildGoModule {

     

       183
       183
       -
               inherit (passthru.deps."boringssl.zip") name;

     

       184
       184
       +
               inherit (passthru.boringssl-source) name;

     

       184
       185
        
       

     

       185
       185
       -
               src = passthru.deps."boringssl.zip";

     

       186
       186
       -
               vendorHash = "sha256-oKlwh+Oup3lVgqgq42vY3iLg62VboF9N565yK2W0XxI=";

     

       186
       186
       +
               src = passthru.boringssl-source;

     

       187
       187
       +
               vendorHash = "sha256-HepiJhj7OsV7iQHlM2yi5BITyAM04QqWRX28Rj7sRKk=";

     

       187
       188
        
       

     

       188
       189
        
               nativeBuildInputs = [ unzip ];

     

       189
       190
        
       

     
···

       193
       194
        
       

     

       194
       195
        
         meta = {

     

       195
       196
        
           description = "Special build of curl that can impersonate Chrome & Firefox";

     

       196
       196
       -
           homepage = "https://github.com/yifeikong/curl-impersonate";

     

       197
       197
       +
           homepage = "https://github.com/lexiforest/curl-impersonate";

     

       197
       198
        
           license = with lib.licenses; [

     

       198
       199
        
             curl

     

       199
       200
        
             mit

     

       200
       201
        
           ];

     

       201
       202
        
           maintainers = with lib.maintainers; [ ggg ];

     

       202
       203
        
           platforms = lib.platforms.unix;

     

       203
       203
       -
           mainProgram = "curl-impersonate-chrome";

     

       204
       204
       +
           mainProgram = "curl-impersonate";

     

       204
       205
        
         };

     

       205
       206
        
       }

+16 -6

pkgs/by-name/cu/curl-impersonate/chrome/deps.nix

···

       2
       2
        
       { fetchurl }:

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         "curl-8_7_1.tar.gz" = fetchurl {

     

       6
       6
       -
           url = "https://github.com/curl/curl/archive/curl-8_7_1.tar.gz";

     

       7
       7
       -
           hash = "sha256-DkbIVvUXYCw0e7X+W3MXT47nmLyH8alyNclXYfdfzCg=";

     

       5
       5
       +
         "curl-8_15_0.tar.gz" = fetchurl {

     

       6
       6
       +
           url = "https://github.com/curl/curl/archive/curl-8_15_0.tar.gz";

     

       7
       7
       +
           hash = "sha256-KTfK3eAHqjpSoXwhrJFT6gVHAPN5JtHZZgK/B+iIyEc=";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         "brotli-1.1.0.tar.gz" = fetchurl {

     
···

       12
       12
        
           hash = "sha256-5yCmyilCi4A/StFlNxdx9TmPq6OX7fZ3iDehhZnqE/8=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         "boringssl.zip" = fetchurl {

     

       16
       16
       -
           url = "https://github.com/google/boringssl/archive/d24a38200fef19150eef00cad35b138936c08767.zip";

     

       17
       17
       -
           hash = "sha256-tzAAwL70VAyUEOZZ86ql+RgXsw4DZhkvW5l0d1eVVHU=";

     

       15
       15
       +
         "boringssl-673e61fc215b178a90c0e67858bbf162c8158993.zip" = fetchurl {

     

       16
       16
       +
           url = "https://github.com/google/boringssl/archive/673e61fc215b178a90c0e67858bbf162c8158993.zip";

     

       17
       17
       +
           hash = "sha256-7bfWHo3j95EHAXJyPuQfvFUPtVCAzbGHu0oF5g4FmiI=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         "nghttp2-1.63.0.tar.bz2" = fetchurl {

     

       21
       21
        
           url = "https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.bz2";

     

       22
       22
        
           hash = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         "ngtcp2-1.11.0.tar.bz2" = fetchurl {

     

       26
       26
       +
           url = "https://github.com/ngtcp2/ngtcp2/releases/download/v1.11.0/ngtcp2-1.11.0.tar.bz2";

     

       27
       27
       +
           hash = "sha256-122s6G/Docj84codTLsf3pu6k81fKGEdVbypukPjF7w=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         "nghttp3-1.9.0.tar.bz2" = fetchurl {

     

       31
       31
       +
           url = "https://github.com/ngtcp2/nghttp3/releases/download/v1.9.0/nghttp3-1.9.0.tar.bz2";

     

       32
       32
       +
           hash = "sha256-TTCmjxfnKhOStghdr6qfxzLaHX0m7sVUuyFnCDMvzxo=";

     

       23
       33
        
         };

     

       24
       34
        
       }

-20

pkgs/by-name/cu/curl-impersonate/chrome/disable-building-docs.patch

···

       1
       1
       -
       From 5366ca35b3d20ef962ccf54399cc44f523d803be Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: GGG <gggkiller2@gmail.com>

     

       3
       3
       -
       Date: Mon, 5 Aug 2024 04:19:29 -0300

     

       4
       4
       -
       Subject: [PATCH] Disable building docs

     

       5
       5
       -
       ---

     

       6
       6
       -
        Makefile.in | 1 +

     

       7
       7
       -
        1 file changed, 1 insertion(+)

     

       8
       8
       -
       

     

       9
       9
       -
       diff --git a/Makefile.in b/Makefile.in

     

       10
       10
       -
       index 41d7324..b1f5ec6 100644

     

       11
       11
       -
       --- a/Makefile.in

     

       12
       12
       -
       +++ b/Makefile.in

     

       13
       13
       -
       @@ -249,6 +249,7 @@ $(CURL_VERSION)/.chrome: $(chrome_libs)	$(CURL_VERSION).tar.gz $(CURL_VERSION)/.

     

       14
       14
       -
        	# (for cross compilation), then pass it on to curl.

     

       15
       15
       -
        	{ \

     

       16
       16
       -
        	  config_flags="--prefix=@prefix@"; \

     

       17
       17
       -
       +	  config_flags="$$config_flags --disable-manual"; \

     

       18
       18
       -
        	  config_flags="$$config_flags --with-nghttp2=$(nghttp2_install_dir)"; \

     

       19
       19
       -
        	  config_flags="$$config_flags --with-brotli=$(brotli_install_dir)"; \

     

       20
       20
       -
        	  config_flags="$$config_flags --with-openssl=$(boringssl_install_dir)"; \

+31 -7

pkgs/by-name/cu/curl-impersonate/chrome/update.sh

···

       33
       33
        
       }

     

       34
       34
        
       

     

       35
       35
        
       getvar() {

     

       36
       36
       -
           echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace

     

       36
       36
       +
           echo "$2" | grep -F "$1 " | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       39
       39
       +
       evalvar() {

     

       40
       40
       +
           local out="$(getvar "$1" "$2")"

     

       41
       41
       +
       

     

       42
       42
       +
           # Replace $(VAR) within variables with other variables

     

       43
       43
       +
           while [[ "$out" =~ (\$\(([A-Za-z_][A-Za-z0-9_]*)\)) ]]; do

     

       44
       44
       +
               local match="${BASH_REMATCH[1]}"

     

       45
       45
       +
               local var="${BASH_REMATCH[2]}"

     

       46
       46
       +
               local value="$(getvar "$var" "$2")"

     

       47
       47
       +
               out="${out//$match/$value}"

     

       48
       48
       +
           done

     

       49
       49
       +
       

     

       50
       50
       +
           echo $out

     

       37
       51
        
       }

     

       38
       52
        
       

     

       39
       53
        
       attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate-chrome}"

     

       40
       40
       -
       version="$(curl -sSL "https://api.github.com/repos/yifeikong/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')"

     

       54
       54
       +
       version="$(curl -sSL "https://api.github.com/repos/lexiforest/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')"

     

       41
       55
        
       

     

       42
       56
        
       pkgpath="$(findpath "$attr")"

     

       43
       57
        
       

     
···

       48
       62
        
           exit 0

     

       49
       63
        
       fi

     

       50
       64
        
       

     

       51
       51
       -
       vars="$(curl -sSL "https://github.com/yifeikong/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')"

     

       65
       65
       +
       vars="$(curl -sSL "https://github.com/lexiforest/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')"

     

       52
       66
        
       

     

       53
       67
        
       # TODO: Fix hash for curl.

     

       54
       68
        
       cat >"$(dirname "$pkgpath")"/deps.nix <<EOF

     
···

       66
       80
        
           hash = "$(narhash "https://github.com/google/brotli/archive/refs/tags/v$(getvar BROTLI_VERSION "$vars").tar.gz")";

     

       67
       81
        
         };

     

       68
       82
        
       

     

       69
       69
       -
         "boringssl.zip" = fetchurl {

     

       83
       83
       +
         "boringssl-$(getvar BORING_SSL_COMMIT "$vars").zip" = fetchurl {

     

       70
       84
        
           url = "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip";

     

       71
       85
        
           hash = "$(narhash "https://github.com/google/boringssl/archive/$(getvar BORING_SSL_COMMIT "$vars").zip")";

     

       72
       86
        
         };

     

       73
       87
        
       

     

       74
       74
       -
         "$(getvar NGHTTP2_VERSION "$vars").tar.bz2" = fetchurl {

     

       75
       75
       -
           url = "$(getvar NGHTTP2_URL "$vars")";

     

       76
       76
       -
           hash = "$(narhash "$(getvar NGHTTP2_URL "$vars")")";

     

       88
       88
       +
         "nghttp2-$(getvar NGHTTP2_VERSION "$vars").tar.bz2" = fetchurl {

     

       89
       89
       +
           url = "$(evalvar NGHTTP2_URL "$vars")";

     

       90
       90
       +
           hash = "$(narhash "$(evalvar NGHTTP2_URL "$vars")")";

     

       91
       91
       +
         };

     

       92
       92
       +
       

     

       93
       93
       +
         "ngtcp2-$(getvar NGTCP2_VERSION "$vars").tar.bz2" = fetchurl {

     

       94
       94
       +
           url = "$(evalvar NGTCP2_URL "$vars")";

     

       95
       95
       +
           hash = "$(narhash "$(evalvar NGTCP2_URL "$vars")")";

     

       96
       96
       +
         };

     

       97
       97
       +
       

     

       98
       98
       +
         "nghttp3-$(getvar NGHTTP3_VERSION "$vars").tar.bz2" = fetchurl {

     

       99
       99
       +
           url = "$(evalvar NGHTTP3_URL "$vars")";

     

       100
       100
       +
           hash = "$(narhash "$(evalvar NGHTTP3_URL "$vars")")";

     

       77
       101
        
         };

     

       78
       102
        
       }

     

       79
       103
        
       EOF