From 876c65c424b8059eb0a7e37d14aae2ea9cab5574 Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Sun, 7 Jul 2024 20:58:34 -0500 Subject: [PATCH] nodePackages.wrangler: remove --- .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 132 ------------------ pkgs/development/node-packages/overrides.nix | 59 -------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 194 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6b884b8109bf..54a972262d84 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -259,7 +259,6 @@ , "webpack-dev-server" , "copy-webpack-plugin" , "webtorrent-cli" -, "wrangler" , "wring" , "@yaegassy/coc-nginx" , "yalc" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d54cc8f11c93..c0ccec3ffee4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -57393,15 +57393,6 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20240610.1" = { - name = "workerd"; - packageName = "workerd"; - version = "1.20240610.1"; - src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20240610.1.tgz"; - sha512 = "Rtut5GrsODQMh6YU43b9WZ980Wd05Ov1/ds88pT/SoetmXFBvkBzdRfiHiATv+azmGX8KveE0i/Eqzk/yI01ug=="; - }; - }; "workerpool-6.2.1" = { name = "workerpool"; packageName = "workerpool"; @@ -92403,129 +92394,6 @@ in bypassCache = true; reconstructLock = true; }; - wrangler = nodeEnv.buildNodePackage { - name = "wrangler"; - packageName = "wrangler"; - version = "3.60.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.60.3.tgz"; - sha512 = "a6zn/KFnYaYp3nxJR/aP0TeaBvJDkrrfI89KoxUtx28H7zpya/5/VLu3CxQ3PRspEojJGF0s6f3/pddRy3F+BQ=="; - }; - dependencies = [ - sources."@cloudflare/kv-asset-handler-0.3.2" - sources."@cloudflare/workers-types-4.20240605.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@esbuild-plugins/node-globals-polyfill-0.2.3" - sources."@esbuild-plugins/node-modules-polyfill-0.2.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" - sources."@fastify/busboy-2.1.1" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@types/node-20.14.2" - sources."@types/node-forge-1.3.11" - sources."acorn-8.12.0" - sources."acorn-walk-8.3.3" - sources."anymatch-3.1.3" - sources."as-table-1.0.55" - sources."binary-extensions-2.3.0" - sources."blake3-wasm-2.1.5" - sources."braces-3.0.3" - sources."bufferutil-4.0.8" - sources."capnp-ts-0.7.0" - sources."chokidar-3.6.0" - sources."consola-3.2.3" - sources."cookie-0.5.0" - sources."data-uri-to-buffer-2.0.2" - sources."debug-4.3.5" - sources."defu-6.1.4" - sources."esbuild-0.17.19" - sources."escape-string-regexp-4.0.0" - sources."estree-walker-0.6.1" - sources."exit-hook-2.2.1" - sources."fill-range-7.1.1" - sources."fsevents-2.3.3" - sources."function-bind-1.1.2" - sources."get-source-2.0.12" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."magic-string-0.25.9" - sources."mime-3.0.0" - sources."miniflare-3.20240610.0" - sources."ms-2.1.2" - sources."mustache-4.2.0" - sources."nanoid-3.3.7" - sources."node-fetch-native-1.6.4" - sources."node-forge-1.3.1" - sources."node-gyp-build-4.8.1" - sources."normalize-path-3.0.0" - sources."path-parse-1.0.7" - sources."path-to-regexp-6.2.2" - sources."pathe-1.1.2" - sources."picomatch-2.3.1" - sources."printable-characters-1.0.42" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."resolve.exports-2.0.2" - sources."rollup-plugin-inject-3.0.2" - sources."rollup-plugin-node-polyfills-0.2.1" - sources."rollup-pluginutils-2.8.2" - sources."selfsigned-2.4.1" - sources."source-map-0.6.1" - sources."sourcemap-codec-1.4.8" - sources."stacktracey-2.1.8" - sources."stoppable-1.1.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."to-regex-range-5.0.1" - sources."tslib-2.6.3" - sources."ufo-1.5.3" - sources."undici-5.28.4" - sources."undici-types-5.26.5" - sources."unenv-1.10.0-1717606461.a117952" - sources."utf-8-validate-6.0.4" - sources."workerd-1.20240610.1" - sources."ws-8.17.0" - sources."xxhash-wasm-1.0.2" - sources."youch-3.3.3" - sources."zod-3.23.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command-line interface for all things Cloudflare Workers"; - homepage = "https://github.com/cloudflare/workers-sdk#readme"; - license = "MIT OR Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wring = nodeEnv.buildNodePackage { name = "wring"; packageName = "wring"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 9514265cbae8..d84adb870adb 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -428,63 +428,4 @@ final: prev: { webtorrent-cli = prev.webtorrent-cli.override { buildInputs = [ final.node-gyp-build ]; }; - - wrangler = prev.wrangler.override (oldAttrs: - let - workerdVersion = (lib.findFirst (dep: dep.name == "workerd") null oldAttrs.dependencies).version; - linuxWorkerd = { - name = "_at_cloudflare_slash_workerd-linux-64"; - packageName = "@cloudflare/workerd-linux-64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-${workerdVersion}.tgz"; - sha512 = "sha512-E8mj+HPBryKwaJAiNsYzXtVjKCL0KvUBZbtxJxlWM4mLSQhT+uwGT3nydb/hFY59rZnQgZslw0oqEWht5TEYiQ=="; - }; - }; - linuxWorkerdArm = { - name = "_at_cloudflare_slash_workerd-linux-arm64"; - packageName = "@cloudflare/workerd-linux-arm64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-${workerdVersion}.tgz"; - sha512 = "sha512-/Fr1W671t2triNCDCBWdStxngnbUfZunZ/2e4kaMLzJDJLYDtYdmvOUCBDzUD4ssqmIMbn9RCQQ0U+CLEoqBqw=="; - }; - }; - darwinWorkerd = { - name = "_at_cloudflare_slash_workerd-darwin-64"; - packageName = "@cloudflare/workerd-darwin-64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-${workerdVersion}.tgz"; - sha512 = "sha512-ATaXjefbTsrv4mpn4Fdua114RRDXcX5Ky+Mv+f4JTUllgalmqC4CYMN4jxRz9IpJU/fNMN8IEfvUyuJBAcl9Iw=="; - }; - }; - darwinWorkerdArm = { - name = "_at_cloudflare_slash_workerd-darwin-arm64"; - packageName = "@cloudflare/workerd-darwin-arm64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-${workerdVersion}.tgz"; - sha512 = "sha512-wnbsZI4CS0QPCd+wnBHQ40C28A/2Qo4ESi1YhE2735G3UNcc876MWksZhsubd+XH0XPIra6eNFqyw6wRMpQOXA=="; - }; - }; - - in - { - meta = oldAttrs.meta // { broken = before "16.13"; }; - buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; - preFixup = '' - # patch elf is trying to patch binary for sunos - rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 - ''; - dependencies = oldAttrs.dependencies - ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) linuxWorkerd - ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) linuxWorkerdArm - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) darwinWorkerd - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwinWorkerdArm; - }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f72f3fa8987..ad58247599eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7578,8 +7578,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (nodePackages) wrangler; - wrangler_1 = callPackage ../development/tools/wrangler_1 { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; };