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

Ease radicale upgrade #29521

Merged
merged 3 commits into from Sep 18, 2017
Merged

Ease radicale upgrade #29521

merged 3 commits into from Sep 18, 2017

Conversation

aneeshusa
Copy link
Contributor

Motivation for this change

I got the chance to try out #27826 (thanks @infinisil!) and have a few changes to make the Radicale migration smoother:

  • Support an extraArgs option to allow specifying --export-storage and --verify-storage
  • Update Radicale 2 to the latest version, gaining support for --verify-storage along the way
  • Test the migration functionality via NixOS test, also documenting an example migration

Radicale changelog is at https://github.com/Kozea/Radicale/blob/master/NEWS.md.

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 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Radicale 2.1.5 is the first to support the `--verify-storage` option.
@@ -107,7 +107,7 @@ rmdir /var/lib/ipfs/.ipfs
The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
</para>
<para>
Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher.
Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions; see the <literal>radicale</literal> NixOS test for an example migration.
Copy link
Member

Choose a reason for hiding this comment

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

Maybe add a link to the NixOS test for convenience? https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks! 👍

This also provides an example of how to migrate.
@fpletz fpletz merged commit 406c7a0 into NixOS:master Sep 18, 2017
@infinisil infinisil mentioned this pull request Sep 24, 2017
8 tasks
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

2 participants