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

Add nixos test for radicale #22683

Merged
merged 7 commits into from
Apr 30, 2017

Conversation

aneeshusa
Copy link
Contributor

@aneeshusa aneeshusa commented Feb 11, 2017

Motivation for this change

I attempted to run radicale on Python 3 and ran into some errors along the way. This PR has a few changes in separated commits:

  • a new NixOS test for radicale
  • fixes to enable building radicale on Python 3
  • fixes for bcrypt
  • package update for passlib

cc radicale maintainers @pSub @edwtjo

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@aneeshusa, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh to be a potential reviewer.

@FRidh
Copy link
Member

FRidh commented Feb 11, 2017

cryptography is updated so likely this is a mass rebuild

@aneeshusa
Copy link
Contributor Author

aneeshusa commented Feb 11, 2017

cryptography doesn't need to be updated for radicale so I'll split that into a different PR.

@aneeshusa aneeshusa mentioned this pull request Feb 11, 2017
7 tasks
@FRidh FRidh removed their assignment Feb 11, 2017
pythonPackages.flup
pythonPackages.ldap
pythonPackages.sqlalchemy
];
Copy link
Member

Choose a reason for hiding this comment

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

You probably should keep them for python2 in order not to break existing configs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -8622,7 +8622,7 @@ in {
sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
};

buildInputs = with self; [ nose pybcrypt];
propagatedBuildInputs = with self; [ nose bcrypt ];
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason why you moved it from buildInputs to propagatedBuildInputs ?

Copy link
Member

Choose a reason for hiding this comment

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

bump @aneeshusa

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, bcrypt needs to be propagated for modules that depend on passlib to be able to use the bcrypt backend. I added this to the commit message.

@aneeshusa
Copy link
Contributor Author

Thanks for taking a look, I've addressed review comments and re-tested this. I also added a commit adding myself as a maintainer.

Also propagated bcrypt so that
downstream dependencies are able to use the bcrypt backend.
Includes testing bcrypt authentication.
None of these dependencies is required for radicale to function,
and flup in particular prevents usage with Python 3.
@aneeshusa
Copy link
Contributor Author

I've rebased this on master. I'd like to have this merged before Radicale 2.0 comes out of beta if someone wants to take a look!

@7c6f434c 7c6f434c merged commit 929ae39 into NixOS:master Apr 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants