Skip to content

wrapFish: use symlinkJoin to make wrapper, able to change original derivation of wrapper #329591

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.

Sign up for GitHub

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

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

wrapFish: use symlinkJoin to make wrapper, able to change original derivation of wrapper #329591

wants to merge 1 commit into from

Conversation

Zh40Le1ZOOB
Copy link

@Zh40Le1ZOOB Zh40Le1ZOOB commented Jul 24, 2024 •
edited
Loading

Description of changes

  • Change the implementation of wrapFish from writeShellApplication to symlinkJoin, the wrapper inherits meta and shellPath from original fish. This fixes build failure when programs.fish.package is a wrapper made by wrapFish.
  • Expected a new argument as fish to wrap, allow to wrap your own fish.

Cc fish maintainers @adamcstephens @cole-h @winterqt.

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 24, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 24, 2024
@Cryolitia
Copy link
Member

Cryolitia commented Jul 24, 2024 •
edited
Loading

format code with nixfmt-rfc-style

This at least should be a stand alone commit, otherwise it's hard to review.

Some reviewers may prefer to do not format existed code, but waiting for a tree-wide clean up.

change function wrapFish to overridable fishWrapper

I would prefer fish and fish-unwrapped

@Zh40Le1ZOOB
Copy link
Author

Zh40Le1ZOOB commented Jul 24, 2024 •
edited
Loading

format code with nixfmt-rfc-style

This at least should be a stand alone commit, otherwise it's hard to review.

Some reviewers may prefer to do not format existed code, but waiting for a tree-wide clean up.

Done.

change function wrapFish to overridable fishWrapper

I would prefer fish and fish-unwrapped

The fish dose not need a wrapper, it's not like other packages that uses wrapper in derivation. The wrapper is only used to specify some environments for fish, so I don't think it's a good idea to rename fish to fish-unwrapped.

Cryolitia
Cryolitia suggested changes Jul 25, 2024
View reviewed changes
Aleksanaa
Aleksanaa reviewed Jul 25, 2024
View reviewed changes
@winterqt
Copy link
Member

winterqt commented Jul 25, 2024 •
edited
Loading

  • change function wrapFish to overridable fishWrapper

What exactly does this achieve? I don't see a motivation for breaking the interface needlessly.

@Zh40Le1ZOOB Zh40Le1ZOOB changed the title nixos/fish: change wrapFish to fishWrapper, add plugins option nixos/fish: let fish defaults to wrapper, add plugins option Jul 29, 2024
@Zh40Le1ZOOB Zh40Le1ZOOB force-pushed the fish branch 5 times, most recently from 6a92629 to 9820548 Compare July 29, 2024 11:08
@Zh40Le1ZOOB Zh40Le1ZOOB marked this pull request as draft July 30, 2024 04:53
@Zh40Le1ZOOB Zh40Le1ZOOB force-pushed the fish branch 2 times, most recently from 6f133cd to ee0f7d9 Compare July 31, 2024 07:20
@Zh40Le1ZOOB Zh40Le1ZOOB marked this pull request as ready for review July 31, 2024 07:28
Cryolitia
Cryolitia reviewed Aug 2, 2024
View reviewed changes
@Zh40Le1ZOOB Zh40Le1ZOOB requested a review from Cryolitia August 3, 2024 06:44
Cryolitia
Cryolitia suggested changes Aug 4, 2024
View reviewed changes
@Zh40Le1ZOOB Zh40Le1ZOOB requested a review from Cryolitia August 6, 2024 06:33
@Zh40Le1ZOOB Zh40Le1ZOOB force-pushed the fish branch 2 times, most recently from b351bde to b9cfbc5 Compare August 21, 2024 06:50
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 17, 2025
@Zh40Le1ZOOB Zh40Le1ZOOB changed the title nixos/fish: let fish defaults to wrapper, add plugins option {wrapFish,nixos/fish}: fix build failure when package using wrapFish Jan 17, 2025
@Zh40Le1ZOOB
Copy link
Author

I just changed my mind, this PR only fixes wrapFish now.

@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 17, 2025
@Zh40Le1ZOOB Zh40Le1ZOOB changed the title {wrapFish,nixos/fish}: fix build failure when package using wrapFish wrapFish: use symlinkJoin to make wrapper Jan 17, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jan 17, 2025
@Zh40Le1ZOOB Zh40Le1ZOOB changed the title wrapFish: use symlinkJoin to make wrapper wrapFish: use symlinkJoin to make wrapper, able to change original derivation of wrapper Jan 17, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 17, 2025
@Zh40Le1ZOOB Zh40Le1ZOOB force-pushed the fish branch 2 times, most recently from f7ca699 to bfe41da Compare January 17, 2025 13:51
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
@nixpkgs-ci nixpkgs-ci bot added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 25, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aleksanaa Aleksanaa Awaiting requested review from Aleksanaa

@Cryolitia Cryolitia Awaiting requested review from Cryolitia

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Zh40Le1ZOOB @Cryolitia @winterqt @Aleksanaa @wegank