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: drop poetry2nix #263308

Merged
merged 5 commits into from
Oct 28, 2023
Merged

treewide: drop poetry2nix #263308

merged 5 commits into from
Oct 28, 2023

Conversation

K900
Copy link
Contributor

@K900 K900 commented Oct 25, 2023

Description of changes

poetry2nix in-tree was broken in a pretty major way for a while now, and the only remaining consumers in nixpkgs itself were NixOps versions. So, drop NixOps stable (it's on Python 2, which is very dead), rework NixOps unstable to use nixpkgs dependencies, and finally drop poetry2nix itself.

I've taken the liberty to add upstream maintainers as maintainers to the respective NixOps plugins - if you'd like to be excluded, please say so.

TODO

  • collect new maintainer signoffs
  • merge this

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/)
  • 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.

@infinisil
Copy link
Member

How's the in-tree poetry2nix broken? And why can't we just update it to fix it?

@K900
Copy link
Contributor Author

K900 commented Oct 25, 2023

It was broken by the Python bootstrap changes, and we don't really want to update it because the out-of-tree version is generally better, because it has a lot more overrides and adds them a lot faster. We also don't want to encourage new poetry2nix consumers in-tree.

@K900 K900 force-pushed the rip-poetry2nix branch 2 times, most recently from 9c5a48e to a7b6072 Compare October 25, 2023 09:53
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

This is a release manager seal ✔️.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 25, 2023
@K900 K900 marked this pull request as draft October 25, 2023 10:42
@K900
Copy link
Contributor Author

K900 commented Oct 25, 2023

Marking as draft to prevent accidental merges.

@K900
Copy link
Contributor Author

K900 commented Oct 25, 2023

Fixed eval error.

pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved
pkgs/top-level/aliases.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/cluster/nixops/default.nix Outdated Show resolved Hide resolved
ps.nixops-hetzner
ps.nixops-hetznercloud
ps.nixops-libvirtd
ps.nixops-vbox
Copy link
Member

Choose a reason for hiding this comment

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

What's the reasoning behind adding these nine by default rather than all of them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's what the previous version of the expression did.

pkgs/applications/networking/cluster/nixops/unwrapped.nix Outdated Show resolved Hide resolved
@K900 K900 marked this pull request as ready for review October 26, 2023 13:06
@K900
Copy link
Contributor Author

K900 commented Oct 26, 2023

Updated to latest version of nixops with all the fixes, also added updateScript everywhere.

@K900
Copy link
Contributor Author

K900 commented Oct 26, 2023

This should be good to go now, though I'd prefer to get explicit agreement from people added as maintainers before we merge.

@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 26, 2023
K900 added 5 commits October 26, 2023 19:01
It's dead, Jim.
Since the nixops directory is going away.
Mostly nix-init with some manual fixups. withPlugins implementation copied from Poetry.
The in-tree version has been broken for a while, so now is probably a good time to rip off the band-aid.
@K900 K900 requested a review from dotlambda October 26, 2023 16:06
@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Oct 26, 2023
@K900
Copy link
Contributor Author

K900 commented Oct 26, 2023

@Kiwi @lukebfox please respond if you don't want to be added as maintainers for your Nixops plugins' expressions in nixpkgs. (please also respond if you do want to be added)

@lukebfox
Copy link
Member

Thanks for waiting, I'm happy to maintain my plugin's nix-expression here.

@K900
Copy link
Contributor Author

K900 commented Oct 28, 2023

I'm just going to merge this, and if @Kiwi wants to step down, they're welcome to. I'm really worried about this bitrotting.

@K900 K900 merged commit 3406dd9 into NixOS:master Oct 28, 2023
15 checks passed
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/how-can-i-install-nixops/39957/4

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.

9 participants