summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-11-10 18:24:57 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2019-11-10 18:41:26 +0100
commitd75c296dc2b4c45f197a66a4a64245d921226d0f (patch)
tree9400dd5126d2f94759521e6035a202c3640bad44 /nixos
parent04d63387a4ddb67b75f3fb853175c1d2322614e4 (diff)
downloadnixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar.gz
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar.bz2
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar.lz
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar.xz
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.tar.zst
nixpkgs-d75c296dc2b4c45f197a66a4a64245d921226d0f.zip
roundcube: 1.3.10 -> 1.4.0
https://roundcube.net/news/2019/11/09/roundcube-1.4.0-released

* `curl` cmd in the test can fail as roundcube returns a http/401 if
  unauthorized (and we're explicitly requesting the login form). By
  checking if the `persistent_login` plugin is loaded, the assertion is
  still valid)

* Use `$argv[0]` to determine install path in the installer script. I'm
  not exactly sure why, but it seems as `__DIR__` now resolves symlinks
  which breaks the installer if roundcube is in a `buildEnv` with
  third-party plugins.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/roundcube.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index 4f2560ce8c2..3206144ce80 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -25,6 +25,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     roundcube.wait_for_unit("postgresql.service")
     roundcube.wait_for_unit("phpfpm-roundcube.service")
     roundcube.wait_for_unit("nginx.service")
-    roundcube.succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'")
+    roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'")
   '';
 })