From ec0c7f2799dd2afc2e0a3e03acd6d3bbc2ac3b44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Aug 2023 11:07:17 +0000 Subject: [PATCH 1/2] dolibarr: 16.0.5 -> 17.0.3 --- pkgs/servers/web-apps/dolibarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index 9c94ad3bd545..4e2070d91ebd 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "16.0.5"; + version = "17.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw="; + sha256 = "sha256-RpmeBoFY2TyYTpHLG2Kx5FezUHzwukj1+SfZhQOqxqU="; }; dontBuild = true; From 7207b25099d0a199d438dde143c67de4074a586a Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 26 Aug 2023 13:44:19 +0200 Subject: [PATCH 2/2] nixos/tests/dolibarr: use -X GET instead -X POST to test for redirection Previously, we were POST-ing the homepage to test for redirection, this is wrong. We are supposed to GET-ing it. This is fixed. --- nixos/tests/dolibarr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/dolibarr.nix b/nixos/tests/dolibarr.nix index 2f012a0c67da..4fdee9e9698f 100644 --- a/nixos/tests/dolibarr.nix +++ b/nixos/tests/dolibarr.nix @@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Now, we have installed the machine, let's verify we still have the right configuration. assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php") # We do not want any redirect now as we have installed the machine. - machine.succeed('curl -f -X POST http://localhost') + machine.succeed('curl -f -X GET http://localhost') # Test authentication to the webservice. parser = TokenParser() parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))