Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 75667c2916d4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab9968440863
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 10, 2019

  1. 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.
    Ma27 committed Nov 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    Copy the full SHA
    d75c296 View commit details

Commits on Nov 15, 2019

  1. Merge pull request #73169 from Ma27/bump-roundcube

    roundcube: 1.3.10 -> 1.4.0
    globin authored Nov 15, 2019
    Copy the full SHA
    ab99684 View commit details
2 changes: 1 addition & 1 deletion nixos/tests/roundcube.nix
Original file line number Diff line number Diff line change
@@ -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'")
'';
})
Original file line number Diff line number Diff line change
@@ -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';

4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];