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

add mutable shortlinks #830

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

fricklerhandwerk
Copy link
Collaborator

@fricklerhandwerk fricklerhandwerk commented Dec 6, 2023

closes #843

this allows mapping cleanly from the existing mutable links on nixos.org

Copy link
Contributor

@asymmetric asymmetric left a comment

Choose a reason for hiding this comment

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

  • This needs a niv update, otherwise the build fails with:
Build finished. The HTML pages are in build/html.
installing
sed: can't read /nix/store/yabz0xx6iyd3h5ba6mv30g7gsjgyqhff-source/doc/manual/_redirects: No such file or directory
error: boost::bad_format_string: format-string is ill-formed

I'd be happy to pick this up if you're too busy atm.

default.nix Outdated Show resolved Hide resolved
@asymmetric
Copy link
Contributor

Also, sorry for leaving a ❌ review on a draft, realized after the fact it could've just been a comment 😅

@fricklerhandwerk
Copy link
Collaborator Author

As mentioned in the top post, I let it rot waiting for an up-to-date Hydra build to happen. Otherwise we have to build Nix locally. If all versions are in the cache, I can update the pin.

@asymmetric
Copy link
Contributor

@fricklerhandwerk I ran it locally and it took a few secs, so yes pretty sure they are.

default.nix Outdated Show resolved Hide resolved
default.nix Outdated Show resolved Hide resolved
source/reference/nix-manual.md Outdated Show resolved Hide resolved
@fricklerhandwerk
Copy link
Collaborator Author

Would be great if you can finish it, but otherwise I'll pick it up once I get back to it.

this allows mapping cleanly from the existing mutable links on nixos.org
@fricklerhandwerk fricklerhandwerk added the site Improvements to the site infrastructure or content presentation label Jan 15, 2024
@fricklerhandwerk fricklerhandwerk marked this pull request as ready for review January 15, 2024 13:33
@fricklerhandwerk fricklerhandwerk requested a review from a team as a code owner January 15, 2024 13:33
Copy link
Member

@DanielSidhion DanielSidhion left a comment

Choose a reason for hiding this comment

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

LGTM

@infinisil
Copy link
Member

It still looks like Nix 2.13 needs to be built locally:

these 2 derivations will be built:
  /nix/store/kbfqff6b2ssqxvmg4hjkrmswg34x8nmy-nix-2.13.7.drv
  /nix/store/lgmy85cgivhxfl8f18yya6k794nvg1in-nix-dev.drv
these 2 paths will be fetched (3.16 MiB download, 65.83 MiB unpacked):
  /nix/store/qlzczyamb1dl0xprqlf57589w38nximq-nix-2.18.1-doc
  /nix/store/21krqgvbinpkh9rb41yx16ybkdcyajnh-nix-2.19.3-doc

@fricklerhandwerk
Copy link
Collaborator Author

I can reproduce with mkdir tmpstore; nix-build --store $PWD/tmpstore, but don't understand how that's possible.

https://hydra.nixos.org/eval/1803459 shows that the Hydra build succeeded, but it produces different store paths than the local evaluation:

/nix/store/w6dc6i4bi02f3xqpqknd6hppp99mxxm9-nix-2.13.7-debug
/nix/store/ki5j23x8ncimj2sx4bd8y9nr7a956xni-nix-2.13.7-dev
/nix/store/2pcpjixx8ar0wjrf4n3jp0m19vij8jk0-nix-2.13.7-doc
/nix/store/9jdq5q39kv2980z7gq3a7nmfk96wbvhp-nix-2.13.7

@infinisil
Copy link
Member

infinisil commented Feb 2, 2024

@fricklerhandwerk I think I figured it out, and it's very cursed! Clearing the Nix cache makes it work for me:

mv ~/.cache/{nix,nix-broken}

And if that also works for you please comment in NixOS/nix#9905

Here's the details:

And here's the kicker, and this is a bit of speculation: You can't check that it works with --store because flake-compat does this on master, which triggers this issue: NixOS/nix#9852

Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

However, those curses are completely unrelated to this PR here, so this PR is looking good.

@fricklerhandwerk
Copy link
Collaborator Author

Wow, thanks a lot for digging into it. I had already slated to nix-diff my way in, but that would have been hopeless apparently. Holy $CURSE this is messed up.

@infinisil infinisil merged commit ab49acd into NixOS:master Feb 5, 2024
5 checks passed
@fricklerhandwerk fricklerhandwerk deleted the nix-manual-shortlinks branch February 6, 2024 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
site Improvements to the site infrastructure or content presentation
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Put a page at /manual/nix
4 participants