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.

Sign up for GitHub

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

nextcloud: fix deprecation warning #68435

Merged
merged 1 commit into from
Sep 15, 2019
Merged

nextcloud: fix deprecation warning #68435

merged 1 commit into from
Sep 15, 2019
+23 −10

Conversation

averelld
Copy link
Contributor

@averelld averelld commented Sep 10, 2019 •
edited
Loading

Motivation for this change

#65706 deprecates phpfpm poolConfigs, but the nextcloud module still sets those by default. This is supposed to get rid of that deprecation warning. Could use some independent testing.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @aanderse

Sorry, something went wrong.

@jonringer
Copy link
Contributor

@GrahamcOfBorg test nextcloud.basic

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 10, 2019
aanderse
aanderse approved these changes Sep 11, 2019
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested, but overall LGTM 👍
I assume all the tests (aside from the redis test mentioned by @jonringer) pass now?

@jonringer
Copy link
Contributor

I tested locally, and the other two pass

@lheckemann lheckemann added this to the 19.09 milestone Sep 12, 2019
@lheckemann
Copy link
Member

Does the warning occur on master as well? If so, this should be based on master and backported to 19.09 once merged.

@averelld averelld force-pushed the nextcloud-fix-deprecation-warning branch from 7575a63 to 56e5ddd Compare September 12, 2019 12:20
@averelld averelld changed the base branch from release-19.09 to master September 12, 2019 12:20
@averelld
Copy link
Contributor Author

Does the warning occur on master as well? If so, this should be based on master and backported to 19.09 once merged.

I think so. I rebased it, but labels/reviewers are messed up now.

@ofborg ofborg bot added 8.has: documentation This PR adds or changes documentation 2.status: merge conflict This PR has merge conflicts with the target branch and removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: vim 8.has: changelog 8.has: documentation This PR adds or changes documentation 2.status: merge conflict This PR has merge conflicts with the target branch labels Sep 12, 2019
@lheckemann
Copy link
Member

Thanks!

Ma27
Ma27 approved these changes Sep 15, 2019
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff seems fine, also tested this on my personal Nextcloud instance. The broken test gets fixed in #68441, so this should be safe to merge now 👍

@Ma27 Ma27 added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 15, 2019
@Ma27 Ma27 merged commit 80e2c41 into NixOS:master Sep 15, 2019
@Ma27
Copy link
Member

Ma27 commented Sep 15, 2019

Backported as 0d38802. Thanks!

@Ma27 Ma27 added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Sep 15, 2019
@averelld averelld deleted the nextcloud-fix-deprecation-warning branch September 15, 2019 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27

@aanderse aanderse

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@averelld @jonringer @lheckemann @Ma27 @aanderse