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

[24.11] pyfa: 2.60.2 -> 2.61.3 #385471

Merged
merged 3 commits into from
Mar 22, 2025
Merged

Conversation

siphc
Copy link

@siphc siphc commented Feb 27, 2025

Original PRs in main: #356622 #364987

My lack of foundational git knowledge is showing, hence the need for a new PR. Hope it didn't bombard everyone's inboxes.
Added commit ca3f599 to the branch, so hopefully the eval will pass.

cc: @ToasterUwU @Daholli @paschoal (do I not have permissions to add reviewers?)

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.

(cherry picked from commit ca3f599)
(cherry picked from commit f05b34d)
(cherry picked from commit 6dd568b)
(cherry picked from commit 86f46d7)
(cherry picked from commit 242faa0)
@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Feb 27, 2025
@siphc siphc marked this pull request as ready for review February 27, 2025 04:54
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Feb 27, 2025
@nix-owners nix-owners bot requested review from Daholli and ToasterUwU February 27, 2025 05:02
@Daholli
Copy link
Contributor

Daholli commented Feb 27, 2025

From what I can tell this looks good, but I have no experience with backports

@ToasterUwU
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 385471


x86_64-linux

✅ 1 package built:
  • pyfa

@ToasterUwU
Copy link
Member

I think this is ready to merge, unless a backport needs something else that i dont know about.

Comment on lines +59 to +67
cat > setup.py <<EOF
from setuptools import setup
setup(
name = "${pname}",
version = "${version}",
scripts = ["pyfa.py"],
packages = setuptools.find_packages(),
)
EOF
Copy link
Contributor

Choose a reason for hiding this comment

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

Non-blocking: You could use writeText here.

cat > setup.py <<EOF
from setuptools import setup
setup(
name = "${pname}",
Copy link
Contributor

Choose a reason for hiding this comment

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

Non-blocking: If you inline pname here, you can remove the rec keyword. (rec can lead to confusing errors so IIRC we try to avoid it, although I don't see this documented anywhere...)

Copy link
Author

Choose a reason for hiding this comment

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

It's showing me an error in another file when trying to build the package. I think pname is used somewhere else?

Copy link
Author

Choose a reason for hiding this comment

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

if that is the case, reading the Nix documentation leads me to believe that there's no way around rec.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think while I generally agree we should do best practice a backport PR is probably not the best time to fix those issues. I think finalAttrs is currently not supported for python packages otherwise we would have gone with that

Copy link
Member

@ToasterUwU ToasterUwU Feb 28, 2025

Choose a reason for hiding this comment

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

I agree, backport PRs are not the place to change this kind of stuff.

Backports are purely meant for porting changes made on unstable back to stable and similar actions.

On top of that, the creator of this PR didnt make this package, doesnt maintain it, said themselves that they arent well versed with git, so lets just not do this here and now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh sorry, I didn't realize this was a Nixpkgs backport, I thought it was a pyfa backport. Nevermind!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 28, 2025
@ToasterUwU ToasterUwU added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Mar 6, 2025
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person and removed 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people labels Mar 8, 2025
@ToasterUwU ToasterUwU added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Mar 9, 2025
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person and removed 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people labels Mar 9, 2025
@ToasterUwU
Copy link
Member

gotta love wegank just refusing to see the actual 3 approvals this has...

There also is a new pyfa version, but i wanna wait for this to be merged first

@siphc
Copy link
Author

siphc commented Mar 18, 2025

There also is a new pyfa version, but i wanna wait for this to be merged first

@ToasterUwU feel free to update it upstream, I can backport it again when I have the time, it's good practice. :)

@Scrumplex Scrumplex merged commit 41e1fb5 into NixOS:release-24.11 Mar 22, 2025
57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants