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

[Backport release-24.11] format and sort top-level/python-packages.nix #392723

Conversation

katexochen
Copy link
Contributor

@katexochen katexochen commented Mar 24, 2025

manual backport of #391087

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.

Add a 👍 reaction to pull requests you find important.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
@nix-owners nix-owners bot requested a review from natsukium March 24, 2025 14:28
@github-actions github-actions 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 Mar 24, 2025
@wolfgangwalther
Copy link
Contributor

Let's backport the CI job as well.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
(cherry picked from commit 60b30dd)
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
(cherry picked from commit 3b0f56d)
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
@katexochen katexochen force-pushed the backport-391087-to-release-24.11 branch from ec83674 to 6c12376 Compare March 24, 2025 15:01
@github-actions github-actions bot added 6.topic: policy discussion 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Mar 24, 2025
@katexochen
Copy link
Contributor Author

@wolfgangwalther Do we add the git-blame-ignores on release, too?

@wolfgangwalther
Copy link
Contributor

Do we add the git-blame-ignores on release, too?

I'm not sure what the convention here is. It's unlikely to cause conflicts, because those are always added in separate commits and never make sense to backport 1:1. So we could as well add them. But it would probably not give us much if that's not done for other commits like that, too.

@infinisil WDYT?

@wolfgangwalther
Copy link
Contributor

In any case, we can merge now to avoid merge conflicts from creeping in - we can always add the commit hashes later, if we want to.

@wolfgangwalther wolfgangwalther merged commit 0a06890 into NixOS:release-24.11 Mar 24, 2025
25 of 28 checks passed
@katexochen katexochen deleted the backport-391087-to-release-24.11 branch March 24, 2025 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion 6.topic: python 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
None yet
Development

Successfully merging this pull request may close these issues.

3 participants