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

vdirsyncer: Convert to a python module #87865

Merged
merged 4 commits into from May 17, 2020
Merged

Conversation

@doronbehar
Copy link
Contributor

doronbehar commented May 15, 2020

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 added 3 commits Apr 25, 2020
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.
@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?

@FRidh
FRidh approved these changes May 15, 2020
@doronbehar
Copy link
Contributor Author

doronbehar commented May 15, 2020

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
17 checks passed
17 checks passed
vdirsyncer, vdirsyncer.passthru.tests on x86_64-darwin Timed out, unknown build status
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="14f015a"; rev="14f015a15cef6a5cbe7c5b568073a6fafc9eaedc"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
vdirsyncer, vdirsyncer.passthru.tests on aarch64-linux Success
Details
vdirsyncer, vdirsyncer.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.