about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2023-08-27 14:10:04 +0200
committerGitHub <noreply@github.com>2023-08-27 14:10:04 +0200
commitc3ed95307ef485a6d64bcdd9d47a092ea95cf817 (patch)
tree4bd362424434549ce984b31b4ef36ecee3f30c90 /nixos
parent4525ce10b5ce3b95c0f07481e950ee5c229499fb (diff)
parent4eee509d25d5af666f05986a349ae8639c0adfcc (diff)
downloadnixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar.gz
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar.bz2
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar.lz
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar.xz
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.tar.zst
nixlib-c3ed95307ef485a6d64bcdd9d47a092ea95cf817.zip
Merge pull request #251413 from karolinschlegel/init-odoo-v15
odoo15: init at 15.0-20230720
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/odoo.nix3
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1087dedac364..c6565bd8afc1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -349,6 +349,7 @@ in {
   invidious = handleTest ./invidious.nix {};
   oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
   odoo = handleTest ./odoo.nix {};
+  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
   # not on other platforms.
diff --git a/nixos/tests/odoo.nix b/nixos/tests/odoo.nix
index 7c2cf31370f9..00ae4a2137d1 100644
--- a/nixos/tests/odoo.nix
+++ b/nixos/tests/odoo.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : {
   name = "odoo";
   meta.maintainers = with lib.maintainers; [ mkg20001 ];
 
@@ -11,6 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
 
       services.odoo = {
         enable = true;
+        package = package;
         domain = "localhost";
       };
     };