Skip to content

ocis_5-bin: rename from ocis-bin#394598

Merged
NickCao merged 2 commits into
NixOS:masterfrom
Ramblurr:fix/ocis-rename
Apr 2, 2025
Merged

ocis_5-bin: rename from ocis-bin#394598
NickCao merged 2 commits into
NixOS:masterfrom
Ramblurr:fix/ocis-rename

Conversation

@Ramblurr

@Ramblurr Ramblurr commented Mar 30, 2025

Copy link
Copy Markdown
Contributor

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions Bot added the 8.has: documentation This PR adds or changes documentation label Mar 30, 2025
@Ramblurr Ramblurr mentioned this pull request Mar 30, 2025
13 tasks
@github-actions github-actions Bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 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 30, 2025
@Ramblurr

Ramblurr commented Mar 30, 2025

Copy link
Copy Markdown
Contributor Author

@bhankas @danth This PR does not update any versions. It renames ocis-bin to ocis-bin5 and updates the nixos module. In my next PR I will add ocis-bin70 and ocis-bin71, and update the nixos module to choose correctly based on state version.

This is all working very well, I am already running ocis 7.1 with on a couple nixos servers. The upgrade process is manual, but works smoothly.

Comment thread nixos/modules/services/web-apps/ocis.nix Outdated
Comment thread nixos/modules/services/web-apps/ocis.nix Outdated
@Ramblurr Ramblurr force-pushed the fix/ocis-rename branch 2 times, most recently from 3e8f3f2 to f791170 Compare March 31, 2025 09:52

@NickCao NickCao left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Per nixpkgs conventions, ocis_5-bin might be more appropriate?

Ramblurr added 2 commits April 1, 2025 08:49
And we are getting ready for ocis-bin7 to land, where we will need to
compare it to the system.stateVersion.
@Ramblurr

Ramblurr commented Apr 1, 2025

Copy link
Copy Markdown
Contributor Author

Per nixpkgs conventions, ocis_5-bin might be more appropriate?

Done!

@Ramblurr Ramblurr changed the title ocis-bin5: rename from ocis-bin ocis_5-bin: rename from ocis-bin Apr 1, 2025
@Ramblurr

Ramblurr commented Apr 2, 2025

Copy link
Copy Markdown
Contributor Author

@NickCao @Jappie3 Any other changes needed? It would be nice to get this merged so I can submit the next PR introducing the new versions so users can upgrade.

@NickCao

NickCao commented Apr 2, 2025

Copy link
Copy Markdown
Member

@ofborg test ocis

@NickCao

NickCao commented Apr 2, 2025

Copy link
Copy Markdown
Member

Oh it's unfree, tested nixosTests.ocis locally.

@NickCao NickCao merged commit a084e92 into NixOS:master Apr 2, 2025
@Ramblurr Ramblurr deleted the fix/ocis-rename branch April 2, 2025 22:27
@xinyangli xinyangli mentioned this pull request May 4, 2025
13 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: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants