summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-11-15 18:09:43 +0100
committerGitHub <noreply@github.com>2019-11-15 18:09:43 +0100
commitab9968440863b910e0dc675fe16a18bd9ae245b9 (patch)
tree59867c409982909bc8cad6f9db49b7cea214cf12 /pkgs/servers
parent75667c2916d4bd60db2f5a1f1838d67af87a3610 (diff)
parentd75c296dc2b4c45f197a66a4a64245d921226d0f (diff)
downloadnixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar.gz
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar.bz2
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar.lz
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar.xz
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.tar.zst
nixpkgs-ab9968440863b910e0dc675fe16a18bd9ae245b9.zip
Merge pull request #73169 from Ma27/bump-roundcube
roundcube: 1.3.10 -> 1.4.0
Diffstat (limited to 'pkgs/servers')
-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 ];