Skip to content

doc: Fix the function locations always pointing to master#226057

Merged
infinisil merged 1 commit intoNixOS:masterfrom
tweag:fix-function-location-revision
Apr 14, 2023
Merged

doc: Fix the function locations always pointing to master#226057
infinisil merged 1 commit intoNixOS:masterfrom
tweag:fix-function-location-revision

Conversation

@infinisil
Copy link
Copy Markdown
Member

@infinisil infinisil commented Apr 13, 2023

Instead of revisions as they should. This is (most-likely) caused by a simple typo, because Hydra is where the revision should come from, but it doesn't set .revision as the attribute, but rather .rev! This comes from https://github.com/NixOS/hydra/blob/082495e34e094cae1eb49dbfc5648938e23c6355/src/script/hydra-eval-jobset#L300-L301

Fixes #223404

I can't actually verify this, but everything points to this being the problem, we'll have to check whether this worked when Hydra completes the next manual build.

This work is sponsored by Antithesis

Instead of revisions as they should. This is (most-likely) caused by a
simple typo, because Hydra is where the revision should come from, but
it doesn't set `.revision` as the attribute, but rather `.rev`!
@infinisil infinisil requested a review from asymmetric April 13, 2023 18:37
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Apr 13, 2023
@ofborg ofborg 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. labels Apr 13, 2023
@infinisil infinisil requested review from ncfavier and pennae April 14, 2023 14:40
Copy link
Copy Markdown
Member

@ncfavier ncfavier left a comment

Choose a reason for hiding this comment

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

because Hydra is where the revision should come from

Actually, the manual is built directly from the flake (nixpkgs#htmlDocs.nixpkgsManual): check out https://github.com/NixOS/nixos-homepage/blob/master/flake.nix#L137 (the inputs are updated hourly). But Nix indeed sets rev, not revision, so this fixes it.

Ideally we should probably point to the stable branch instead of the specific revision, which #203994 does, but I've lost all motivation to work on that.

@infinisil
Copy link
Copy Markdown
Member Author

Ah nice, thanks for the info! I also subscribed to that PR, though I don't have any time to look at it now.

I'll merge this PR

@infinisil infinisil merged commit 83c76b9 into NixOS:master Apr 14, 2023
@infinisil infinisil deleted the fix-function-location-revision branch April 14, 2023 15:17
@infinisil
Copy link
Copy Markdown
Member Author

Can confirm, this fixed #223404 :)

@asymmetric
Copy link
Copy Markdown
Contributor

@infinisil how did you confirm this fixes it? I can still see a link to master in the stable nixpkgs manual.

Is this fixed for unstable only, for now?

@github-actions
Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-22.11:

@ncfavier
Copy link
Copy Markdown
Member

Should be fixed next time nixos-22.11 updates.

@infinisil
Copy link
Copy Markdown
Member Author

@asymmetric Yes it's only fixed in unstable, check out https://nixos.org/manual/nixpkgs/unstable/#sec-functions-library-asserts

@nixos-discourse
Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2023-04-20-documentation-team-meeting-notes-42/27470/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: documentation This PR adds or changes documentation 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.

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Links to nixpkgs functions' source is wrong

4 participants