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.

Sign up for GitHub

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

Jump to bottom

python3Packages.zodb: fix compatibility with transaction 3.0 #78443

Merged
merged 1 commit into from Jan 24, 2020
Merged

python3Packages.zodb: fix compatibility with transaction 3.0 #78443

merged 1 commit into from Jan 24, 2020

Conversation

delroth
Copy link
Contributor

@delroth delroth commented Jan 24, 2020

Motivation for this change

zodb build broke with the python3Packages.transaction upgrade that
happened in f054f49. This cherry-picks a patch from upstream for compatibility.

@FRidh fyi

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from cillianderoiste January 24, 2020 21:53
@delroth
python3Packages.zodb: fix compatibility with transaction 3.0
a2f580c 
zodb build broke with the python3Packages.transaction upgrade that
happened in f054f49.
@delroth
Copy link
Contributor Author

delroth commented Jan 24, 2020

@GrahamcOfBorg build python3Packages.zodb vulnix

jonringer
jonringer approved these changes Jan 24, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM

failure related to python38Packages.zconfig

[2 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/xnr3j3i25gfil41kk7s0z5va7rzn5991-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/78443
1 package failed to build:
python38Packages.zodb

2 package built:
python37Packages.zodb vulnix

@jonringer jonringer merged commit 4acf0be into NixOS:master Jan 24, 2020
@delroth delroth deleted the zodb-transaction branch January 24, 2020 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@delroth @jonringer