rainloop: 1.13.0 -> 1.14.0 #80910
Merged
rainloop: 1.13.0 -> 1.14.0 #80910
+17
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
dasJ
requested changes
Mar 2, 2020
pkgs/servers/rainloop/default.nix
Outdated
| installPhase = '' | ||
| mkdir $out | ||
| cp -r rainloop/* $out | ||
| rm -rf $out/data | ||
| ln -s ${dataPath} $out/data | ||
| echo -n "$includeScript" > $out/include.php |
There was a problem hiding this comment.
Probably better to pkgs.writeText the include script and copy it here. This way, we don't have to think about shell escaping.
There was a problem hiding this comment.
@dasJ, I changed the derivation according to your advice. I used cp to copy the file. ln -s was also an option but not sure if it was best practice.
- update version - change mechanism to set the data folder outside the nix store
dasJ
approved these changes
Mar 6, 2020
|
What is missing for this to be merged ? |
|
My merge permissions 👀 |
|
cc @Ma27 can you merge this? :) |
|
briefly tested locally, LGTM 👍 |
|
Thanks 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Update rainloop to latest available version, and also fix a problem on NixOS where the application would not work by simply creating a symlink for the
<derivation>/datafolder, as rainloop will complain the data directory is not writable.The better way to set a data folder outside the rainloop folder is by creating a short
include.phpthat is used as an override to data location (reference: https://github.com/RainLoop/rainloop-webmail/blob/master/_include.php).The new location for the
datafolder will have to be created separately (e.g. through a module in NixOS or otherwise) with write access to the user under which the PHP scripts are executed.Note that on NixOS, setting the rainloop data path under
/etcwill also cause errors, hence the change of the default to/var/lib/rainloopThings done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)