movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #251412 from karolinschlegel/update-odoo

Browse source
This commit is contained in:
Maciej Krüger 2023-08-26 21:32:48 +02:00 • committed by GitHub
commit ebdd6efe6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -113,6 +113,8 @@
- The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq. - The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq.
- `odoo` now defaults to 16, updated from 15.
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
- `services.keyd` changed API. Now you can create multiple configuration files. - `services.keyd` changed API. Now you can create multiple configuration files.

8
nixos/modules/services/finance/odoo.nix
View file

@ -31,6 +31,12 @@ in
description = lib.mdDoc '' description = lib.mdDoc ''
Odoo configuration settings. For more details see <https://www.odoo.com/documentation/15.0/administration/install/deploy.html> Odoo configuration settings. For more details see <https://www.odoo.com/documentation/15.0/administration/install/deploy.html>
''; '';
example = literalExpression ''
options = {
db_user = "odoo";
db_password="odoo";
};
'';
}; };
domain = mkOption { domain = mkOption {
@ -112,11 +118,11 @@ in
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "odoo" ];
ensureUsers = [{ ensureUsers = [{
name = "odoo"; name = "odoo";
ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; }; ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; };
}]; }];
ensureDatabases = [ "odoo" ];
}; };
}); });
} }

8
pkgs/applications/finance/odoo/default.nix
View file

@ -44,19 +44,19 @@ let
}; };
}; };
odoo_version = "15.0"; odoo_version = "16.0";
odoo_release = "20230317"; odoo_release = "20230722";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "odoo"; pname = "odoo";
version = "${odoo_version}.${odoo_release}"; version = "${odoo_version}.${odoo_release}";
format = "setuptools"; format = "setuptools";
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile # latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile
src = fetchurl { src = fetchurl {
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo hash = "sha256-DV5JBY+2gq5mUfcvN9S5xkd+ufgEBjvyvBY1X7pPFPk="; # odoo
}; };
unpackPhase = '' unpackPhase = ''