Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

roundcube: minor fixes #58804

Merged
merged 2 commits into from Apr 9, 2019
Merged

roundcube: minor fixes #58804

merged 2 commits into from Apr 9, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Apr 2, 2019 •
edited

Motivation for this change
  • The roundcube doesn't evaluate when trying to use a different database
  • Don't resolve symlinks in installer script to ensure that the sources in the buildEnv store path are used.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Ma27 added 2 commits April 2, 2019 16:02
@Ma27
nixos/roundcube: only configure postgres config if localhost is used …
6b6348e 
…as database

When using a different database, the evaluation fails as
`config.services.postgresql.package` is only set if `services.postgresql` is enabled.

Also, the systemd service shouldn't have a relation to postgres if a
remote database is used.
@Ma27
roundcube: don't resolve symlinks in update.sh
324e6db 
A side-effect of this is that the derivation required a rewrite in order
to apply the patch properly.
@Ma27 Ma27 requested a review from infinisil as a code owner April 2, 2019 14:43
@Ma27 Ma27 changed the title roundcube: minor fixes [WIP] roundcube: minor fixes Apr 2, 2019
@Ma27
Copy link
Member Author

Ma27 commented Apr 2, 2019

@GrahamcOfBorg test roundcube

@Ma27 Ma27 changed the title [WIP] roundcube: minor fixes roundcube: minor fixes Apr 2, 2019
@Vskilet
Copy link
Contributor

Vskilet commented Apr 2, 2019

@Ma27 what do you think to merge this #55706 and I'll do the password stuff later ?

@Ma27 Ma27 requested a review from globin April 2, 2019 19:27
@globin globin merged commit f370553 into NixOS:master Apr 9, 2019
@Ma27 Ma27 deleted the roundcube-fixes branch April 9, 2019 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

@globin globin Awaiting requested review from globin

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @Vskilet @globin @GrahamcOfBorg