commit e16a0988bc18be3997f5c475f373a8ac127d3fa0 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-1709.xml

···

       101
       101
        
           <para>

     

       102
       102
        
             The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.

     

       103
       103
        
           </para>

     

       104
       104
       +
           <para>

     

       105
       105
       +
             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.

     

       106
       106
       +
           </para>

     

       104
       107
        
         </listitem>

     

       105
       108
        
         <listitem>

     

       106
       109
        
           <para>

+30 -10

nixos/modules/services/networking/radicale.nix

···

       1
       1
       -
       {config, lib, pkgs, ...}:

     

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     
···

       8
       8
        
       

     

       9
       9
        
         confFile = pkgs.writeText "radicale.conf" cfg.config;

     

       10
       10
        
       

     

       11
       11
       +
         # This enables us to default to version 2 while still not breaking configurations of people with version 1

     

       12
       12
       +
         defaultPackage = if versionAtLeast "17.09" config.system.stateVersion then {

     

       13
       13
       +
           pkg = pkgs.radicale2;

     

       14
       14
       +
           text = "pkgs.radicale2";

     

       15
       15
       +
         } else {

     

       16
       16
       +
           pkg = pkgs.radicale1;

     

       17
       17
       +
           text = "pkgs.radicale1";

     

       18
       18
       +
         };

     

       11
       19
        
       in

     

       12
       20
        
       

     

       13
       21
        
       {

     

       14
       22
        
       

     

       15
       23
        
         options = {

     

       16
       16
       -
       

     

       17
       24
        
           services.radicale.enable = mkOption {

     

       18
       25
        
             type = types.bool;

     

       19
       26
        
             default = false;

     

       20
       27
        
             description = ''

     

       21
       21
       -
                 Enable Radicale CalDAV and CardDAV server

     

       28
       28
       +
                 Enable Radicale CalDAV and CardDAV server.

     

       29
       29
       +
             '';

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
           services.radicale.package = mkOption {

     

       33
       33
       +
             type = types.package;

     

       34
       34
       +
             default = defaultPackage.pkg;

     

       35
       35
       +
             defaultText = defaultPackage.text;

     

       36
       36
       +
             description = ''

     

       37
       37
       +
               Radicale package to use. This defaults to version 1.x if

     

       38
       38
       +
               <literal>system.stateVersion &lt; 17.09</literal> and version 2.x

     

       39
       39
       +
               otherwise.

     

       22
       40
        
             '';

     

       23
       41
        
           };

     

       24
       42
        
       

     
···

       27
       45
        
             default = "";

     

       28
       46
        
             description = ''

     

       29
       47
        
               Radicale configuration, this will set the service

     

       30
       30
       -
               configuration file

     

       48
       48
       +
               configuration file.

     

       31
       49
        
             '';

     

       32
       32
       -
             };

     

       50
       50
       +
           };

     

       33
       51
        
         };

     

       34
       52
        
       

     

       35
       53
        
         config = mkIf cfg.enable {

     

       36
       36
       -
           environment.systemPackages = [ pkgs.radicale ];

     

       54
       54
       +
           environment.systemPackages = [ cfg.package ];

     

       37
       55
        
       

     

       38
       56
        
           users.extraUsers = singleton

     

       39
       57
        
             { name = "radicale";

     
···

       52
       70
        
             description = "A Simple Calendar and Contact Server";

     

       53
       71
        
             after = [ "network.target" ];

     

       54
       72
        
             wantedBy = [ "multi-user.target" ];

     

       55
       55
       -
             script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f";

     

       56
       56
       -
             serviceConfig.User = "radicale";

     

       57
       57
       -
             serviceConfig.Group = "radicale";

     

       73
       73
       +
             serviceConfig = {

     

       74
       74
       +
               ExecStart = "${cfg.package}/bin/radicale -C ${confFile} -f";

     

       75
       75
       +
               User = "radicale";

     

       76
       76
       +
               Group = "radicale";

     

       77
       77
       +
             };

     

       58
       78
        
           };

     

       59
       79
        
         };

     

       60
       80
        
       

     

       61
       61
       -
         meta.maintainers = with lib.maintainers; [ aneeshusa ];

     

       81
       81
       +
         meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];

     

       62
       82
        
       }

nixos/release.nix

···

       297
       297
        
         tests.pumpio = callTest tests/pump.io.nix {};

     

       298
       298
        
         # tests.quagga = callTest tests/quagga.nix {};

     

       299
       299
        
         tests.quake3 = callTest tests/quake3.nix {};

     

       300
       300
       +
         tests.radicale = callTest tests/radicale.nix {};

     

       300
       301
        
         tests.runInMachine = callTest tests/run-in-machine.nix {};

     

       301
       302
        
         tests.samba = callTest tests/samba.nix {};

     

       302
       303
        
         tests.sddm = callSubTests tests/sddm.nix {};

+21 -62

nixos/tests/radicale.nix

···

       1
       1
        
       let

     

       2
       2
       -
         port = 5232;

     

       3
       3
       -
         radicaleOverlay = self: super: {

     

       4
       4
       -
           radicale = super.radicale.overrideAttrs (oldAttrs: {

     

       5
       5
       -
             propagatedBuildInputs = with self.pythonPackages;

     

       6
       6
       -
               (oldAttrs.propagatedBuildInputs or []) ++ [

     

       7
       7
       -
                 passlib

     

       8
       8
       -
               ];

     

       9
       9
       -
           });

     

       10
       10
       -
         };

     

       11
       11
       -
         common = { config, pkgs, ...}: {

     

       2
       2
       +
         user = "someuser";

     

       3
       3
       +
         password = "some_password";

     

       4
       4
       +
         port = builtins.toString 5232;

     

       5
       5
       +
       in

     

       6
       6
       +
         import ./make-test.nix ({ pkgs, lib, ... }: {

     

       7
       7
       +
         name = "radicale";

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];

     

       9
       9
       +
       

     

       10
       10
       +
         machine = {

     

       12
       11
        
           services.radicale = {

     

       13
       12
        
             enable = true;

     

       14
       14
       -
             config = let home = config.users.extraUsers.radicale.home; in ''

     

       15
       15
       -
               [server]

     

       16
       16
       -
               hosts = 127.0.0.1:${builtins.toString port}

     

       17
       17
       -
               daemon = False

     

       18
       18
       -
               [encoding]

     

       19
       19
       -
               [well-known]

     

       13
       13
       +
             config = ''

     

       20
       14
        
               [auth]

     

       21
       15
        
               type = htpasswd

     

       22
       16
        
               htpasswd_filename = /etc/radicale/htpasswd

     

       23
       17
        
               htpasswd_encryption = bcrypt

     

       24
       24
       -
               [git]

     

       25
       25
       -
               [rights]

     

       18
       18
       +
       

     

       26
       19
        
               [storage]

     

       27
       27
       -
               type = filesystem

     

       28
       28
       -
               filesystem_folder = ${home}/collections

     

       20
       20
       +
               filesystem_folder = /tmp/collections

     

       21
       21
       +
       

     

       29
       22
        
               [logging]

     

       30
       30
       -
               [headers]

     

       23
       23
       +
               debug = True

     

       31
       24
        
             '';

     

       32
       25
        
           };

     

       33
       26
        
           # WARNING: DON'T DO THIS IN PRODUCTION!

     

       34
       27
        
           # This puts secrets (albeit hashed) directly into the Nix store for ease of testing.

     

       35
       35
       -
           environment.etc."radicale/htpasswd".source = with pkgs; let

     

       36
       36
       -
             py = python.withPackages(ps: with ps; [ passlib ]);

     

       37
       37
       -
           in runCommand "htpasswd" {} ''

     

       38
       38
       -
               ${py}/bin/python -c "

     

       39
       39
       -
       from passlib.apache import HtpasswdFile

     

       40
       40
       -
       ht = HtpasswdFile(

     

       41
       41
       -
           '$out',

     

       42
       42
       -
           new=True,

     

       43
       43
       -
           default_scheme='bcrypt'

     

       44
       44
       -
       )

     

       45
       45
       -
       ht.set_password('someuser', 'really_secret_password')

     

       46
       46
       -
       ht.save()

     

       47
       47
       -
       "

     

       28
       28
       +
           environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''

     

       29
       29
       +
             ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}

     

       48
       30
        
           '';

     

       49
       31
        
         };

     

       50
       50
       -
       

     

       51
       51
       -
       in import ./make-test.nix ({ lib, ... }: {

     

       52
       52
       -
         name = "radicale";

     

       53
       53
       -
         meta.maintainers = with lib.maintainers; [ aneeshusa ];

     

       54
       54
       -
       

     

       55
       55
       -
         # Test radicale with bcrypt-based htpasswd authentication

     

       56
       56
       -
         nodes = {

     

       57
       57
       -
           py2 = { config, pkgs, ... }@args: (common args) // {

     

       58
       58
       -
             nixpkgs.overlays = [

     

       59
       59
       -
               radicaleOverlay

     

       60
       60
       -
             ];

     

       61
       61
       -
           };

     

       62
       62
       -
           py3 = { config, pkgs, ... }@args: (common args) // {

     

       63
       63
       -
             nixpkgs.overlays = [

     

       64
       64
       -
               (self: super: {

     

       65
       65
       -
                 python = self.python3;

     

       66
       66
       -
                 pythonPackages = self.python3.pkgs;

     

       67
       67
       -
               })

     

       68
       68
       -
               radicaleOverlay

     

       69
       69
       -
             ];

     

       70
       70
       -
           };

     

       71
       71
       -
         };

     

       72
       72
       -
       

     

       32
       32
       +
         

     

       33
       33
       +
         # This tests whether the web interface is accessible to an authenticated user

     

       73
       34
        
         testScript = ''

     

       74
       74
       -
           for my $machine ($py2, $py3) {

     

       75
       75
       -
             $machine->waitForUnit('radicale.service');

     

       76
       76
       -
             $machine->waitForOpenPort(${builtins.toString port});

     

       77
       77
       -
             $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');

     

       78
       78
       -
           }

     

       35
       35
       +
           $machine->waitForUnit('radicale.service');

     

       36
       36
       +
           $machine->waitForOpenPort(${port});

     

       37
       37
       +
           $machine->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/');

     

       79
       38
        
         '';

     

       80
       39
        
       })

+34

pkgs/servers/radicale/1.x.nix

···

       1
       1
       +
       { stdenv, fetchurl, pythonPackages }:

     

       2
       2
       +
       

     

       3
       3
       +
       pythonPackages.buildPythonApplication rec {

     

       4
       4
       +
         name = "radicale-${version}";

     

       5
       5
       +
         version = "1.1.6";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [

     

       13
       13
       +
           pythonPackages.flup

     

       14
       14
       +
           pythonPackages.ldap

     

       15
       15
       +
           pythonPackages.sqlalchemy

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         doCheck = !pythonPackages.isPy3k;

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           homepage = http://www.radicale.org/;

     

       22
       22
       +
           description = "CalDAV CardDAV server";

     

       23
       23
       +
           longDescription = ''

     

       24
       24
       +
             The Radicale Project is a complete CalDAV (calendar) and CardDAV

     

       25
       25
       +
             (contact) server solution. Calendars and address books are available for

     

       26
       26
       +
             both local and remote access, possibly limited through authentication

     

       27
       27
       +
             policies. They can be viewed and edited by calendar and contact clients

     

       28
       28
       +
             on mobile phones or computers.

     

       29
       29
       +
           '';

     

       30
       30
       +
           license = licenses.gpl3Plus;

     

       31
       31
       +
           platforms = platforms.all;

     

       32
       32
       +
           maintainers = with maintainers; [ edwtjo pSub aneeshusa ];

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+19 -13

pkgs/servers/radicale/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pythonPackages }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, python3Packages }:

     

       2
       2
        
       

     

       3
       3
       -
       pythonPackages.buildPythonApplication rec {

     

       3
       3
       +
       let

     

       4
       4
       +
         version = "2.1.2";

     

       5
       5
       +
         sha256 = "0gmbnvm17j0ilcnci1k2jh0vkbz5g8xlk9lgia5mlx790048hlm8";

     

       6
       6
       +
       in

     

       7
       7
       +
       

     

       8
       8
       +
       python3Packages.buildPythonApplication {

     

       4
       9
        
         name = "radicale-${version}";

     

       5
       5
       -
         version = "1.1.4";

     

       10
       10
       +
         inherit version;

     

       6
       11
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss";

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "Kozea";

     

       14
       14
       +
           repo = "Radicale";

     

       15
       15
       +
           rev = version;

     

       16
       16
       +
           inherit sha256;

     

       10
       17
        
         };

     

       11
       18
        
       

     

       12
       12
       -
         propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [

     

       13
       13
       -
           pythonPackages.flup

     

       14
       14
       -
           pythonPackages.ldap

     

       15
       15
       -
           pythonPackages.sqlalchemy

     

       19
       19
       +
         doCheck = false;

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = with python3Packages; [

     

       22
       22
       +
           vobject

     

       23
       23
       +
           passlib

     

       16
       24
        
         ];

     

       17
       17
       -
       

     

       18
       18
       -
         doCheck = !pythonPackages.isPy3k;

     

       19
       25
        
       

     

       20
       26
        
         meta = with stdenv.lib; {

     

       21
       27
        
           homepage = http://www.radicale.org/;

     
···

       29
       35
        
           '';

     

       30
       36
        
           license = licenses.gpl3Plus;

     

       31
       37
        
           platforms = platforms.all;

     

       32
       32
       -
           maintainers = with maintainers; [ edwtjo pSub aneeshusa ];

     

       38
       38
       +
           maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ];

     

       33
       39
        
         };

     

       34
       40
        
       }

+4 -1

pkgs/top-level/all-packages.nix

···

       11468
       11468
        
           inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;

     

       11469
       11469
        
         };

     

       11470
       11470
        
       

     

       11471
       11471
       -
         radicale = callPackage ../servers/radicale { };

     

       11471
       11471
       +
         radicale1 = callPackage ../servers/radicale/1.x.nix { };

     

       11472
       11472
       +
         radicale2 = callPackage ../servers/radicale/default.nix { };

     

       11473
       11473
       +
       

     

       11474
       11474
       +
         radicale = radicale2;

     

       11472
       11475
        
       

     

       11473
       11476
        
         rake = callPackage ../development/tools/build-managers/rake { };

     

       11474
       11477