From d75c296dc2b4c45f197a66a4a64245d921226d0f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Nov 2019 18:24:57 +0100 Subject: [PATCH] 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. --- nixos/tests/roundcube.nix | 2 +- ...Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch | 2 +- pkgs/servers/roundcube/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 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'") ''; }) diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch index 96710d6162d..27ebd59a48d 100644 --- a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch +++ b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch @@ -18,7 +18,7 @@ index 08e3bb5..b2ad498 100755 */ -define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' ); -+define('INSTALL_PATH', __DIR__ . '/../' ); ++define('INSTALL_PATH', dirname(dirname($argv[0])).'/'); require_once INSTALL_PATH . 'program/include/clisetup.php'; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 93499d87e0b..5953a28a283 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.3.10"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9"; + sha256 = "0b7gc342z0smn7q6cnznj9ncal0515ki4kkq1hlmqmyn0nna5lkb"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];