From 639291b5d3bb64d5af407f7ce348c661ee58c452 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 10 Mar 2026 08:56:49 +0000 Subject: [PATCH] shopify-cli: 3.86.1 -> 3.91.1 Diff: https://github.com/shopify/cli/compare/3.86.1...3.91.1 Changelog: https://github.com/Shopify/cli/releases/tag/3.91.1 --- pkgs/by-name/sh/shopify-cli/package.nix | 161 ++++++++++++------------ 1 file changed, 79 insertions(+), 82 deletions(-) diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 3add5f99c62d..28a6b33a7ac2 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -6,94 +6,91 @@ pnpmConfigHook, pnpm, faketty, - nodejs, nodejs_22, versionCheckHook, makeBinaryWrapper, nix-update-script, }: -stdenv.mkDerivation ( - finalAttrs: - let - pnpmForBuild = pnpm.override { nodejs = nodejs_22; }; - in - { - pname = "shopify"; - version = "3.86.1"; +let + nodejs = nodejs_22; + pnpm' = pnpm.override { inherit nodejs; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "shopify"; + version = "3.91.1"; - src = fetchFromGitHub { - owner = "shopify"; - repo = "cli"; - tag = finalAttrs.version; - hash = "sha256-wEddzW5/+qdtNTxdUs7YEA5vk6/KjrVOgWvIeo0o2ww="; - }; + src = fetchFromGitHub { + owner = "shopify"; + repo = "cli"; + tag = finalAttrs.version; + hash = "sha256-cOq4LpTMr59ev04PIu0GYAAK0N0n2SrYCnz8sHfcXrs="; + }; - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-JhyZpkrp78FECH6UKYYuhWF2w/mYW1BQG5FIsWh5GRE="; - }; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-5rghSHGigsw193OJLiVegjNs1qDj+sCq1KJ1J8oPnrA="; + }; - nativeBuildInputs = [ - faketty - nodejs - pnpmConfigHook - pnpmForBuild - makeBinaryWrapper + nativeBuildInputs = [ + faketty + nodejs + pnpmConfigHook + pnpm' + makeBinaryWrapper + ]; + + # workaround for https://github.com/nrwl/nx/issues/22445 + buildPhase = '' + runHook preBuild + + faketty pnpm run bundle-for-release --disableRemoteCache=true --nxBail=true --outputStyle=static + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/@shopify/cli/{dist,bin} + mkdir -p $out/bin + pushd packages/cli + rm -rf dist/*.map + mv dist/* $out/lib/node_modules/@shopify/cli/dist + mv bin/run.js $out/lib/node_modules/@shopify/cli/bin/run.js + mv package.json oclif.manifest.json $out/lib/node_modules/@shopify/cli + popd + # Install runtime dependencies + rm -rf node_modules + pnpm config set nodeLinker hoisted + # Avoid pnpm trying to replace directories with files (ENOTDIR) by + # preferring non-symlinked executables and removing --force which can + # exacerbate move/rename races during install. + pnpm config set preferSymlinkedExecutables false + pnpm install --offline --prod --ignore-scripts --frozen-lockfile + mv node_modules $out/lib/node_modules/@shopify/cli/node_modules + + makeWrapper ${lib.getExe nodejs} $out/bin/shopify \ + --add-flags "$out/lib/node_modules/@shopify/cli/bin/run.js" + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + platforms = lib.platforms.unix; + mainProgram = "shopify"; + description = "CLI which helps you build against the Shopify platform faster"; + homepage = "https://github.com/Shopify/cli"; + changelog = "https://github.com/Shopify/cli/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + fd + onny ]; - - # workaround for https://github.com/nrwl/nx/issues/22445 - buildPhase = '' - runHook preBuild - - faketty pnpm run bundle-for-release --disableRemoteCache=true --nxBail=true --outputStyle=static - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/node_modules/@shopify/cli/{dist,bin} - mkdir -p $out/bin - pushd packages/cli - rm -rf dist/*.map - mv dist/* $out/lib/node_modules/@shopify/cli/dist - mv bin/run.js $out/lib/node_modules/@shopify/cli/bin/run.js - mv package.json oclif.manifest.json $out/lib/node_modules/@shopify/cli - popd - # Install runtime dependencies - rm -rf node_modules - pnpm config set nodeLinker hoisted - # Avoid pnpm trying to replace directories with files (ENOTDIR) by - # preferring non-symlinked executables and removing --force which can - # exacerbate move/rename races during install. - pnpm config set preferSymlinkedExecutables false - pnpm install --offline --prod --ignore-scripts --frozen-lockfile - mv node_modules $out/lib/node_modules/@shopify/cli/node_modules - - makeWrapper ${lib.getExe nodejs} $out/bin/shopify \ - --add-flags "$out/lib/node_modules/@shopify/cli/bin/run.js" - - runHook postInstall - ''; - - nativeInstallCheckInputs = [ versionCheckHook ]; - doInstallCheck = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - platforms = lib.platforms.unix; - mainProgram = "shopify"; - description = "CLI which helps you build against the Shopify platform faster"; - homepage = "https://github.com/Shopify/cli"; - changelog = "https://github.com/Shopify/cli/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - fd - onny - ]; - }; - } -) + }; +})