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

Jump to bottom

vdirsyncer: Convert to a python module #87865

Merged
merged 4 commits into from May 17, 2020
Merged

vdirsyncer: Convert to a python module #87865

merged 4 commits into from May 17, 2020

Conversation

doronbehar
Copy link
Contributor

@doronbehar doronbehar commented May 15, 2020 •
edited

Motivation for this change

khal, is importing vdirsyncer as a python module in it's checkPhase. However, as of currently, khal is being called with the argument pkgsand then khal is using pkgs.vdirsyncer in it's checkInputs. This is problematic if you want to write an overlay that would (e.g):

  • Use python38 for khal.
  • vdirsyncer is overridden to use Python38.

Without this patch, doing either of the following will make the build of khal fail. It was partially discussed in #85993 but this PR is smaller so hopefully it'll be easier to review it.

Plus that, vdirsyncerStable seems pretty broken, and it was marked as so accordingly.

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.

@doronbehar
vdirsyncer: standardize derivation
484741b 
Use toPythonApplication and use callPackage from python-packages.nix.
Make vdirsyncerStable somewhat functional again, but mark it as broken
for Python 3.6 or higher.
@doronbehar
vdirsyncer: use buildPythonPackage as it's a package now
e9d83e0
@doronbehar
vdirsyncer: move to python-modules/
b353d44
@ofborg ofborg bot requested review from loewenheim and gebner May 15, 2020 06:18
@FRidh
Copy link
Member

FRidh commented May 15, 2020

We typically avoid having multiple versions, especially in python-packages.nix. If the stable one is broken already, maybe remove it?

@doronbehar
Copy link
Contributor Author

If the stable one is broken already, maybe remove it?

Sounds good to me. Shall we rename it as well then? Currently the version we actually use for the unstable, non broken vdirsyncer is here: pimutils/vdirsyncer@master...spk:fix-build-style

I also saw @marsam's commits appear there so maybe they have an opinion.

@FRidh FRidh merged commit b3e7e67 into NixOS:master May 17, 2020
@doronbehar doronbehar deleted the fix-vdirsyncer branch March 2, 2023 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@FRidh FRidh FRidh approved these changes

@loewenheim loewenheim Awaiting requested review from loewenheim

@gebner gebner Awaiting requested review from gebner

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 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
3 participants
@doronbehar @FRidh @jonringer