init: ocis_70-bin and ocis_71-bin #409138
Open
Ramblurr wants to merge 5 commits into
Open
Conversation
0fb0cdc to
d7cd0bc
Compare
Contributor
Author
|
Fixed merge conflicts |
Contributor
Author
Contributor
Author
|
Fixed merge conflicts, again. |
Contributor
@Ramblurr apologies for long delays between activity, $LIFE has been very busy and my github activity has diminished as a result. I have also temporarily stopped being a sysadmin for myself, so haven't kept up with ocis dev either. Until I am back to using the package on daily basis it would be wise to take my name off maintainers list. That being said, the changes LGTM, approved. |
bhankas
approved these changes
Jun 5, 2025
89e8a7e to
d5142cd
Compare
Contributor
Author
|
Fixed merge conflicts. |
Contributor
Author
|
@wegank I have yet again fixed the merge conflicts. Could you please remove the label? This PR has been languishing for well over a month and I would like to get it merged as no one can upgrade their owncloud without it. |
0194f32 to
997e956
Compare
Contributor
Author
|
Fixed new fmt requirements. |
997e956 to
500b732
Compare
500b732 to
e0155d6
Compare
e0155d6 to
738511b
Compare
738511b to
f098fd2
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This is a follow up to #394598
TL;DR: (full explanation is in the "Maintainer information" in the nixos documentation)
Upgrading ocis requires stepping through every stable major and minor version. You cannot skip one.
This PR adds ocis 7.0 and ocis 7.1. ocis 6.0 was skipped as it is not a stable version.
The nixos module is updated to choose the appropriate version based on the
system.stateVersion, and now provides some tools to help the user update their
instance.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)pinging fellow maintainers
@bhankas @danth
Add a 👍 reaction to pull requests you find important.