Merge master into staging-next

nixos/doc/manual/release-notes/rl-2405.section.md

@@ -822,3 +822,4 @@ Module System:
 ### Internal {#sec-release-24.05-lib-internal}
 - `lib` now has [Readme for contributing](https://github.com/NixOS/nixpkgs/tree/master/lib#readme).
 - Some function's documentation is now written using the [accepted doc comment syntax](https://github.com/NixOS/rfcs/pull/145).
+- `odoo` has been updated from `16.0.20231024` to `17.0.20240507`.

nixos/modules/services/admin/docuum.nix

@@ -2,7 +2,7 @@
 
 let
  cfg = config.services.docuum;
- inherit (lib) mkIf mkEnableOption mkOption getExe types;
+ inherit (lib) mkIf mkEnableOption mkOption getExe types optionals concatMap;
 in
 {
  options.services.docuum = {
@@ -14,6 +14,27 @@ in
  default = "10 GB";
  example = "50%";
  };
+
+ minAge = mkOption {
+ description = "Sets the minimum age of images to be considered for deletion.";
+ type = types.nullOr types.str;
+ default = null;
+ example = "1d";
+ };
+
+ keep = mkOption {
+ description = "Prevents deletion of images for which repository:tag matches the specified regex.";
+ type = types.listOf types.str;
+ default = [];
+ example = [ "^my-image" ];
+ };
+
+ deletionChunkSize = mkOption {
+ description = "Removes specified quantity of images at a time.";
+ type = types.int;
+ default = 1;
+ example = 10;
+ };
  };
 
  config = mkIf cfg.enable {
@@ -35,10 +56,13 @@ in
  DynamicUser = true;
  StateDirectory = "docuum";
  SupplementaryGroups = [ "docker" ];
- ExecStart = utils.escapeSystemdExecArgs [
+ ExecStart = utils.escapeSystemdExecArgs ([
  (getExe pkgs.docuum)
  "--threshold" cfg.threshold
- ];
+ "--deletion-chunk-size" cfg.deletionChunkSize
+ ] ++ (concatMap (keep: [ "--keep" keep ]) cfg.keep)
+ ++ (optionals (cfg.minAge != null) [ "--min-age" cfg.minAge ])
+ );
  };
  };
  };

nixos/tests/all-tests.nix

@@ -414,6 +414,7 @@ in {
  pyload = handleTest ./pyload.nix {};
  oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
  odoo = handleTest ./odoo.nix {};
+ odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
  odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; };
  # 9pnet_virtio used to mount /nix partition doesn't support
  # hibernation. This test happens to work on x86_64-linux but

nixos/tests/odoo.nix

@@ -14,6 +14,18 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : {
  package = package;
  domain = "localhost";
  };
+
+ # odoo does not automatically initialize its database,
+ # even if passing what _should_ be the equivalent of these options:
+ # settings = {
+ # options = {
+ # database = "odoo";
+ # init = "base";
+ # };
+ # };
+ systemd.services.odoo.preStart = ''
+ HOME=$STATE_DIRECTORY ${package}/bin/odoo -d odoo -i base --stop-after-init --without-demo all
+ '';
  };
  };
 

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
  pname = "lightdm-slick-greeter";
- version = "2.0.4";
+ version = "2.0.5";
 
  src = fetchFromGitHub {
  owner = "linuxmint";
  repo = "slick-greeter";
  rev = version;
- sha256 = "sha256-1UOODak5YkoMLdIkN1rBIrlr3Zjj5SS2yx90vmF1prA=";
+ sha256 = "sha256-Q37CprukHvDRBcuPbfusKg2DY+JCwmjVX1+KnfSH2iw=";
  };
 
  nativeBuildInputs = [

pkgs/applications/file-managers/clifm/default.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
  pname = "clifm";
- version = "1.18";
+ version = "1.19";
 
  src = fetchFromGitHub {
  owner = "leo-arch";
  repo = pname;
  rev = "v${version}";
- hash = "sha256-tgCGZCLCWcF7ktXqDHjoUkeVqxg6QVOkZb7pbk3nA+U=";
+ hash = "sha256-QNxEvFZ5e4jQV2Tv2/D9KPRDoCoQlrqStFnbKVgcXxg=";
  };
 
  buildInputs = [