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

treewide: update mainProgram docs #247130

Merged
merged 2 commits into from
Aug 4, 2023
Merged

treewide: update mainProgram docs #247130

merged 2 commits into from
Aug 4, 2023

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Aug 4, 2023

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

lib/meta.nix Outdated
@@ -132,8 +132,7 @@ rec {
{ shortName = licstr; }
);

/* Get the path to the main program of a derivation with either
meta.mainProgram or pname or name
/* Get the path to the main program of a derivation meta.mainProgram
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think the doc should include deprecated behaviour?

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/* Get the path to the main program of a derivation meta.mainProgram
/* Get the path to the main program of a package based on meta.mainProgram
  • added "based on"
  • derivation -> package, because the builder is also a main program

Derivations are just how we build packages, and the attrset returned by mkDerivation is a representation of the package in context.

Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Suggestion and lgtm

lib/meta.nix Outdated
@@ -132,8 +132,7 @@ rec {
{ shortName = licstr; }
);

/* Get the path to the main program of a derivation with either
meta.mainProgram or pname or name
/* Get the path to the main program of a derivation meta.mainProgram
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/* Get the path to the main program of a derivation meta.mainProgram
/* Get the path to the main program of a package based on meta.mainProgram
  • added "based on"
  • derivation -> package, because the builder is also a main program

Derivations are just how we build packages, and the attrset returned by mkDerivation is a representation of the package in context.

```
nix-repl> lib.getExe (pass.withExtensions(_: []))
"/nix/store/rvc4ambjr8jsvm5n757icfl3j7gv1jxh-pass-env/bin/pass"
```

Type: getExe :: derivation -> string
Type: getExe :: package -> string
Copy link
Member Author

Choose a reason for hiding this comment

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

@roberth changed the type too

@Artturin Artturin merged commit f504a53 into NixOS:master Aug 4, 2023
18 checks passed
@Artturin Artturin deleted the upddoc branch August 4, 2023 19:49
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.

None yet

3 participants