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.

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

fish: avoid nontermination in fhs like setups #107258

Merged
merged 1 commit into from Feb 17, 2021
Merged

fish: avoid nontermination in fhs like setups #107258

merged 1 commit into from Feb 17, 2021
+5 −1

Conversation

xaverdh
Copy link
Contributor

@xaverdh xaverdh commented Dec 20, 2020 •
edited

Motivation for this change

fix #59357
fix #34656

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@xaverdh xaverdh requested a review from cole-h December 20, 2020 13:46
@xaverdh xaverdh mentioned this pull request Dec 20, 2020
Closed
cole-h
cole-h approved these changes Dec 21, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Sorry for the delay, diff LGTM.

@xaverdh
Copy link
Contributor Author

xaverdh commented Feb 17, 2021

cc @SuperSandro2000 (needs merger)

@cole-h cole-h merged commit cf3e8a7 into NixOS:master Feb 17, 2021
@xaverdh xaverdh deleted the fish-fhs-fix-nontermination branch February 18, 2021 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fish shell segfaults trying to run script in a NixOS docker FISH segfault inside buildFHSUserEnv
2 participants
@xaverdh @cole-h