-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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
python: decorator: fix Python 2 build #80435
python: decorator: fix Python 2 build #80435
Conversation
c3743eb
to
f699467
Compare
... hm, that won't work, not that the original attempt did work either, |
Can you format your commit message like |
f699467
to
827e356
Compare
827e356
to
70dc8f3
Compare
Okay, applied a patch from unreleased 4.4.2. I think 4.4.2 is going to be released very soon, so it may make more sense to wait for its release instead of updating the package twice. |
I made a PR for the fix in micheles/decorator#79, where I also asked for a new release. I think we should wait a bit for that See also #75554 |
70dc8f3
to
52fa957
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
diff LGTM
[09:18:56] jon@jon-desktop /home/jon/projects/nixpkgs ((52fa957f827...))
$ nix build -f . pythonPackages.decorator python3Packages.decorator python38Packages.decorator
[2 built, 20 copied (138.5 MiB), 24.4 MiB DL]
wait a second, this is targeting staging. Also, the builds are passing on 20.03
|
The build was flaky, sometimes it passed, sometimes it didn't. |
that's fair, I didn't get a cache hit on the python2 version |
52fa957
to
52c3fb3
Compare
I also think we should go the way as @infinisil suggested #80435 (comment). |
I'm also okay with waiting for a new patch version |
I don't think the error is python 2 specific, it's just that it just happened to occur for the python 2 build this time |
Also we thought this might not need to go to staging, as it's only 500 rebuilds, and python ones at that, which are pretty cheap |
52c3fb3
to
52fa957
Compare
52fa957
to
36128d7
Compare
Changed the base branch to master. This is a big rebuild, but if you are fine with master, then why not :). |
@GrahamcOfBorg build python2Packages.decorator python3Packages.decorator python38Packages.decorator |
python2 build is fixed, diff LGTM |
Motivation for this change
ZHF: #80379
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)