diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-09-26 22:14:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 22:14:42 +0200 |
| commit | 40200355137385cb071dde433e193a34371a22ca (patch) | |
| tree | 3f52662c596d9bf7f5d34be76e6d57215abfa47a /nixos | |
| parent | 2af70511974a79814e88c35d0172be5d502ec0c3 (diff) | |
| parent | 9d2a8314978f14168497f990a7442fe9242381e2 (diff) | |
| download | nixlib-40200355137385cb071dde433e193a34371a22ca.tar nixlib-40200355137385cb071dde433e193a34371a22ca.tar.gz nixlib-40200355137385cb071dde433e193a34371a22ca.tar.bz2 nixlib-40200355137385cb071dde433e193a34371a22ca.tar.lz nixlib-40200355137385cb071dde433e193a34371a22ca.tar.xz nixlib-40200355137385cb071dde433e193a34371a22ca.tar.zst nixlib-40200355137385cb071dde433e193a34371a22ca.zip | |
Merge pull request #18935 from rycee/pullout/radicale
radicale: break into own package
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1703.xml | 8 | ||||
| -rw-r--r-- | nixos/modules/services/networking/radicale.nix | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 2eda8a56b202..9bc42edb49bc 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -35,6 +35,14 @@ following incompatible changes:</para> Now you need to use versioned attributes, like <literal>gnome3</literal>. </para> </listitem> + + <listitem> + <para> + The attribute name of the Radicale daemon has been changed from + <literal>pythonPackages.radicale</literal> to + <literal>radicale</literal>. + </para> + </listitem> </itemizedlist> diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index d5e2e3041b49..e52c90227d3d 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -33,7 +33,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.pythonPackages.radicale ]; + environment.systemPackages = [ pkgs.radicale ]; users.extraUsers = singleton { name = "radicale"; @@ -52,7 +52,7 @@ in description = "A Simple Calendar and Contact Server"; after = [ "network-interfaces.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f"; + script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f"; serviceConfig.User = "radicale"; serviceConfig.Group = "radicale"; }; |