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

stp: fix setuptools dependency #327037

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Conversation

numinit
Copy link
Contributor

@numinit numinit commented Jul 14, 2024

Description of changes

Fixing breakage due to setuptools removal in #320924.

Partially resolves #326927.

Update to next stp version will be in a separate PR.

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.11 Release Notes (or backporting 23.11 and 24.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.

@numinit numinit requested a review from McSinyx July 14, 2024 07:00
@numinit numinit added the 0.kind: build failure A package fails to build label Jul 14, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 14, 2024
@numinit numinit force-pushed the stp-fix-setuptools branch 4 times, most recently from 924c942 to 7fdd39a Compare July 15, 2024 07:09
@numinit numinit force-pushed the stp-fix-setuptools branch from 7fdd39a to eba4ac1 Compare July 15, 2024 07:25
@ofborg ofborg bot requested a review from McSinyx July 15, 2024 08:12
Copy link
Member

@McSinyx McSinyx left a comment

Choose a reason for hiding this comment

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

The Python package seems to need stp/stp#455 to work:

>>> import stp
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/nix/store/n09cfnslrhcs2rrxsgj3hssz94k320pf-stp-2.3.3/lib/python3.12/site-packages/stp/__init__.py", line 23, in <module>
    from .stp import Expr, Solver, stp, add, bitvec, bitvecs, check, model
  File "/nix/store/n09cfnslrhcs2rrxsgj3hssz94k320pf-stp-2.3.3/lib/python3.12/site-packages/stp/stp.py", line 45, in <module>
    from library_path import PATHS

@numinit
Copy link
Contributor Author

numinit commented Jul 15, 2024

Thanks. I was going to add a checkPhase/installCheckPhase when I bump the version so we catch things like this.

numinit added 2 commits July 19, 2024 01:56
This is fully removed in Python 3.12 and should be replaced with
sysconfig.get_path('purelib').
@numinit numinit force-pushed the stp-fix-setuptools branch from eba4ac1 to 6be4dbd Compare July 19, 2024 08:57
@numinit numinit requested a review from SuperSandro2000 July 19, 2024 08:57
@numinit
Copy link
Contributor Author

numinit commented Jul 19, 2024

Thanks Sandro, I appreciate the review.

@ofborg ofborg bot requested a review from McSinyx July 19, 2024 09:28
@SuperSandro2000 SuperSandro2000 merged commit 51acb42 into NixOS:master Jul 19, 2024
24 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: build failure A package fails to build 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

klee error: No module named 'distutils'
3 participants