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

doc: fix pypy39 removal #371901

Merged
merged 2 commits into from
Jan 8, 2025
Merged

doc: fix pypy39 removal #371901

merged 2 commits into from
Jan 8, 2025

Conversation

FliegendeWurst
Copy link
Member

The proper fix eludes me, but this will work for now ...

nix-instantiate pkgs/top-level/release.nix -A nixpkgs-manual.x86_64-linux works

re: #370527 (comment) (@vcunat)

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 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 labels Jan 7, 2025
@mweinelt
Copy link
Member

mweinelt commented Jan 7, 2025

The correct fix is to pass a pkgs in L41 that does not allow aliases.

@FliegendeWurst
Copy link
Member Author

That line specifically wants aliases, or is the variable name just that misleading?

@mweinelt
Copy link
Member

mweinelt commented Jan 7, 2025

IMO misleading, not sure what it would want with aliases.

@mweinelt mweinelt requested a review from alejandrosame January 7, 2025 20:48
@FliegendeWurst
Copy link
Member Author

Construct this table I guess
image

@7c6f434c
Copy link
Member

7c6f434c commented Jan 7, 2025

Note that the «aliases» it does want are actually declared in the all-packages.nix, and the aliases in aliases.nix are end-user-only aliases. So yes, the name is misleading.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 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 Jan 7, 2025
@FliegendeWurst
Copy link
Member Author

Now "fixed" in a future-proof way.

@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Jan 7, 2025
@vcunat
Copy link
Member

vcunat commented Jan 8, 2025

Looks OK to me at a glance and the manual builds again. Let's not block for long.

@vcunat vcunat merged commit 4bc9c90 into NixOS:master Jan 8, 2025
25 of 29 checks passed
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.

4 participants