Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eas-cli: fix most functionalities missing and dangling symlink #382261

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

zestsystem
Copy link
Contributor

Resolves #381256 and #382259

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@donovanglover donovanglover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add pre/post hooks and remove the echo statements. Also one commit for each fix is ideal

@eclairevoyant
Copy link
Contributor

(and if you keep the hooks, you don't need to change the phase from postInstall to postFixup)

@zestsystem
Copy link
Contributor Author

@donovanglover Thanks for the feedback, and I applied the changes. In this case replacing yarnInstallHook fixed both issues simultaneously, so I have it as one commit addressing both issues.

jq '. + {version: "${finalAttrs.version}"}' package.json > package.json.tmp
mv package.json.tmp package.json
# yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli.
installPhase = ''
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
installPhase = ''
installPhase = ''
runHook preInstall

installPhase = ''
mkdir -p $out/lib/node_modules/eas-cli-root
yarn install --immutable --immutable-cache --offline --non-interactive --production --frozen-lockfile
cp -r . $out/lib/node_modules/eas-cli-root
'';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'';
runHook preInstall
'';

nodejs
patchelf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the purpose of this line, given that stdenv already provides patchelf

Suggested change
patchelf

and I don't see it used

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/nix/store/h9lc1dpi14z7is86ffhl3ld569138595-audit-tmpdir.sh: line 23: patchelf: command not found
I get this unless I explicitly put patchelf in buildInput. I'm on nix-darwin so maybe thats why?

eas-cli: add preInstall and postInstall hooks

eas-cli: use postFixup instead of postInstall
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: eas-cli
3 participants