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

python311Packages.abjad: fix build #311252

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Conversation

davisrichard437
Copy link
Contributor

Description of changes

Two changes:

  1. The abjad build was broken with a ModuleNotFoundError, so I added the relative module to dependencies.
  2. The --replace option was deprecated, so I replaced it with --replace-fail for robustness.

Note: I seem to be unable to run nixpkgs_review; the nix-env -qaP command (with some extra flags) required for the script seems to fail and I'm not sure why.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 13, 2024
Copy link
Member

@jtbx jtbx left a comment

Choose a reason for hiding this comment

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

Note: I seem to be unable to run nixpkgs_review; the nix-env -qaP command (with some extra flags) required for the script seems to fail and I'm not sure why.

It might have been killed by the OOM killer, I fixed it by allocating a few gigs of swap space. nixpkgs-review does seem to take up quite a lot of memory.

LGTM :)

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 13, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 22, 2024
@davisrichard437
Copy link
Contributor Author

Hello all, not sure what the process is for this, but how do I go about pinging people for review? I realize now this has been open for more than a month and I'd like to get it merged if possible

@jtbx
Copy link
Member

jtbx commented Jun 27, 2024

Normally you would ask on the NixOS discourse, on a thread such as PRs ready for review. That will usually bring your PR to attention.

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/4154

@jtbx
Copy link
Member

jtbx commented Jun 28, 2024

Hey I just realised your branch has conflicts with the master branch, meaning it can't be merged into it cleanly. Rebase against nixpkgs master and solve the conflicts from there. Force-push to your PR branch and you should be good to go.

@davisrichard437
Copy link
Contributor Author

Done I think!

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 28, 2024
@davisrichard437 davisrichard437 requested a review from jtbx July 1, 2024 18:18
Comment on lines 1 to 10
{
lib,
buildPythonPackage,
fetchPypi,
ply,
roman,
uqbar,
pythonOlder,
pytestCheckHook,
lilypond,
{ lib
, buildPythonPackage
, fetchPypi
, ply
, roman
, uqbar
, pythonOlder
, pytestCheckHook
, lilypond
, typing-extensions
Copy link
Member

Choose a reason for hiding this comment

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

Can you please remove this reformatting, it's unnecessary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Even if it's specified that way in the code conventions section of the contributing page?

Copy link
Member

Choose a reason for hiding this comment

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

Oh I didn't notice that bit, if you want to keep it please put the change in another commit. Also please change the PR title to something like abjad: fix build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All done!

Copy link
Member

Choose a reason for hiding this comment

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

Could you please revert this change?
We have adopted nixfmt-rfc-style formatting for python modules. #313628

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@natsukium reverted!

@davisrichard437 davisrichard437 changed the title Abjad abjad: fix build Jul 3, 2024
Copy link
Member

@jtbx jtbx left a comment

Choose a reason for hiding this comment

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

Awesome thanks for all that. 👍

@natsukium
Copy link
Member

Since this package is a python library, please write the commit messages and PR title starting with python311Packages.abjad.

@davisrichard437
Copy link
Contributor Author

Done!

@davisrichard437 davisrichard437 requested a review from natsukium July 4, 2024 14:06
Build failed with ModuleNotFoundError, fixing.
--replace now deprecated, changing to --replace-fail.
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@natsukium natsukium changed the title abjad: fix build python311Packages.abjad: fix build Jul 12, 2024
@natsukium natsukium merged commit 78b24c4 into NixOS:master Jul 12, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants