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

man-pages: restore $out/bin to fix nix-shell -p man-pages #308363

Merged
merged 1 commit into from
May 16, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented May 1, 2024

man 5 manpath says that PATH is a default variable used to populate manpages search path. Without the change the following session does not work:

$ nix-shell -p man-pages
$$ man x25
No manual entry for x25

Reported in #300797 (comment)

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.11 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.

`man 5 manpath` says that `PATH` is a default variable used to populate
manpages search path. Without the change the following session does not
work:

    $ nix-shell -p man-pages
    $$ man x25
    No manual entry for x25

Reported in NixOS#300797 (comment)
@deliciouslytyped
Copy link
Contributor

LGTM (didn't test).
Is there a reason not to add this to the other two manual packages?

@trofi
Copy link
Contributor Author

trofi commented May 7, 2024

LGTM (didn't test).

Should be as easy as running:

$ nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/266f40a5ccf5ce7ab6b211c42cb237c1be2493b2.tar.gz -p man-pages
$$ man x25

Is there a reason not to add this to the other two manual packages?

It's slightly easier to review and fix a regression when it's local to a single package.

I suggest filing fixes for other packages separately. I suspect it's a lot more than just two. Each fix will require at least light testing.

@marsam marsam merged commit b08b644 into NixOS:master May 16, 2024
30 of 32 checks passed
@trofi trofi deleted the man-pages-PATH-fix branch May 16, 2024 14:54
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.

3 participants