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

nextcloud26: init at 26.0.0 #222372

Merged
merged 10 commits into from
Mar 22, 2023
Merged

nextcloud26: init at 26.0.0 #222372

merged 10 commits into from
Mar 22, 2023

Conversation

RaitoBezarius
Copy link
Member

@RaitoBezarius RaitoBezarius commented Mar 21, 2023

Description of changes

🎉
See this slide for relevant changelog: https://youtu.be/docYiLbGSxI?t=5058
https://nextcloud.com/blog/hub-4-pioneers-ethical-ai-integration-for-a-more-productive-and-collaborative-future/

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

closes #219929

@RaitoBezarius RaitoBezarius requested review from onny and Ma27 March 21, 2023 15:51
@github-actions github-actions 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/` labels Mar 21, 2023
@icewind1991
Copy link
Contributor

the "remove custom dbuser creation" patch isn't required anymore for 26, you can now disable that behavior by setting NC_setup_create_db_user=false during setup or add "setup_create_db_user" => false to config.php before setup.

@RaitoBezarius
Copy link
Member Author

the "remove custom dbuser creation" patch isn't required anymore for 26, you can now disable that behavior by setting NC_setup_create_db_user=false during setup or add "setup_create_db_user" => false to config.php before setup.

Thank you for the remark!

@RaitoBezarius
Copy link
Member Author

the "remove custom dbuser creation" patch isn't required anymore for 26, you can now disable that behavior by setting NC_setup_create_db_user=false during setup or add "setup_create_db_user" => false to config.php before setup.

Done.

@RaitoBezarius
Copy link
Member Author

@Ma27 do you think we should remove NC24?

@RaitoBezarius RaitoBezarius marked this pull request as ready for review March 21, 2023 18:02
@GaetanLepage
Copy link
Contributor

Shouldn't it be added here as well ?

relatedPackages = [ "nextcloud24" "nextcloud25" ];

@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

I'll try to take a look later today, but no guarantees because exam phase.

@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

@Ma27 do you think we should remove NC24?

Let's await the final patch release. Reason is quite simple: we can automatically backport all updates on the next updates and we don't have to fix up the backport.

Btw, I'd resolve the review comments and drop the nextcloud23 references (this makes the module simpler on some occasions) and deploy the changes to my setup. Would it be OK if I push the changes after that to your branch? :)

@RaitoBezarius
Copy link
Member Author

@Ma27 do you think we should remove NC24?

Let's await the final patch release. Reason is quite simple: we can automatically backport all updates on the next updates and we don't have to fix up the backport.

Got it.

Btw, I'd resolve the review comments and drop the nextcloud23 references (this makes the module simpler on some occasions) and deploy the changes to my setup. Would it be OK if I push the changes after that to your branch? :)

Please do so! It's running on my setup since the opening of this PR, no trouble so far.

@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

@RaitoBezarius btw, why does 881efdb state that the stateVersion logic is broken? The change seems OK to me :)

@github-actions github-actions bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Mar 22, 2023
@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

FWIW I got bitten by nextcloud/user_saml#709, but considering that we don't ship SAML by default and the workaround is trivial I don't consider this a blocker.

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.

LGTM. @RaitoBezarius would merge soonish if that's OK :)

@Ma27 Ma27 added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 22, 2023
@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

Also needs a manual backport (i.e. backport pf pkgs.nextcloud26), but without the breaking stuff (i.e. changed defaults). Happy to take care of that soonisherer (what's it called if it's soon, but after the soonish from the latest comment? 🤔 )

@ofborg ofborg bot requested a review from Ma27 March 22, 2023 20:32
@RaitoBezarius
Copy link
Member Author

LGTM. @RaitoBezarius would merge soonish if that's OK :)

Completely fine to merge it once CI is green. :)

RaitoBezarius and others added 6 commits March 22, 2023 22:37
…tch and wire the default in the NixOS module
This is not needed anymore because the version is EOL for almost a year
now and we don't even have the packages anymore, only the attributes for
compatibility for upgrades from older NixOS versions.
* Apply review comments.
* Default to PHP 8.2 for v26.
@RaitoBezarius
Copy link
Member Author

@RaitoBezarius btw, why does 881efdb state that the stateVersion logic is broken? The change seems OK to me :)

Fixed, excessive amount of carefulness. :)

@Ma27 Ma27 merged commit c042a31 into master Mar 22, 2023
@Ma27 Ma27 deleted the nextcloud26 branch March 22, 2023 22:35
Ma27 pushed a commit to Ma27/nixpkgs that referenced this pull request Mar 23, 2023
Non-breaking variant of NixOS#222372 for stable.
@Ma27 Ma27 mentioned this pull request Mar 23, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants