summary refs log tree commit diff
path: root/pkgs/servers/roundcube
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 /pkgs/servers/roundcube
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 'pkgs/servers/roundcube')
-rw-r--r--pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch2
-rw-r--r--pkgs/servers/roundcube/default.nix4
2 files changed, 3 insertions, 3 deletions
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 ];