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

gramma: remove mkYarnPackage usage #342145

Merged
merged 1 commit into from
Oct 20, 2024
Merged

gramma: remove mkYarnPackage usage #342145

merged 1 commit into from
Oct 20, 2024

Conversation

TomaSajt
Copy link
Contributor

Description of changes

Tracking issue: #324246

Unfortunately, yarnInstallHook uses nodejsInstallExecutables which uses makeWrapper to link the .js files to $out/bin whereas mkYarnPackage uses symlinks.
Symlinks work just fine, however makeWrapper messes with the cli tool so that it doesn't recognize that the binary name isn't cli.js.

We could avoid this by just replacing the makeWrapper-ed executable with a symlink to the same place or we could patch the source to always use gramma when displaying the binary name.

I went with the latter, though the other solution is pretty easy too.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@TomaSajt TomaSajt marked this pull request as draft September 15, 2024 21:09
@ofborg ofborg bot requested a review from pyrox0 September 15, 2024 23:41
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Sep 15, 2024
@TomaSajt TomaSajt marked this pull request as ready for review September 19, 2024 17:25
Copy link
Member

@pyrox0 pyrox0 left a comment

Choose a reason for hiding this comment

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

LGTM, like the patch to makeWrapper the executable properly.

@pyrox0 pyrox0 added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Sep 19, 2024
@r-vdp r-vdp merged commit bfae445 into NixOS:master Oct 20, 2024
26 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants