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

engage: 0.1.2 -> 0.1.3 #254460

Merged
merged 2 commits into from
Sep 11, 2023
Merged

engage: 0.1.2 -> 0.1.3 #254460

merged 2 commits into from
Sep 11, 2023

Conversation

CobaltCause
Copy link
Contributor

Description of changes

Moves engage to the new by-name scheme and updates it to the latest version, which includes a slight behavior change (bugfix) and is backwards-compatible.

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.11 Release Notes (or backporting 23.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.

@figsoda figsoda merged commit ca40349 into NixOS:master Sep 11, 2023
28 checks passed
@github-actions
Copy link
Contributor

Backport failed for release-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-23.05
git worktree add -d .worktree/backport-254460-to-release-23.05 origin/release-23.05
cd .worktree/backport-254460-to-release-23.05
git checkout -b backport-254460-to-release-23.05
ancref=$(git merge-base 7ec9d1f52dfc1bb04a8f73096aa64ce8e99ccc78 2c5f722cfc65ae5a57c896598f6b0137af35ff22)
git cherry-pick -x $ancref..2c5f722cfc65ae5a57c896598f6b0137af35ff22

@CobaltCause CobaltCause deleted the engage branch September 11, 2023 01:04
@infinisil
Copy link
Member

Fyi, now that #253442 is merged, pkgs/by-name is also usable for backports

@github-actions
Copy link
Contributor

Backport failed for release-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-23.05
git worktree add -d .worktree/backport-254460-to-release-23.05 origin/release-23.05
cd .worktree/backport-254460-to-release-23.05
git checkout -b backport-254460-to-release-23.05
ancref=$(git merge-base 7ec9d1f52dfc1bb04a8f73096aa64ce8e99ccc78 2c5f722cfc65ae5a57c896598f6b0137af35ff22)
git cherry-pick -x $ancref..2c5f722cfc65ae5a57c896598f6b0137af35ff22

@infinisil
Copy link
Member

Merge conflict is unfortunate, the encpipe package in all-packages.nix right above engage doesn't exist in 23.05, so the diff isn't clean 😅

@CobaltCause CobaltCause mentioned this pull request Sep 23, 2023
12 tasks
@CobaltCause
Copy link
Contributor Author

CobaltCause commented Sep 23, 2023

I just opened a manual backport in draft mode because it doesn't build with 23.05's current rustc version.

Edit: and I just closed it because we don't backport rustc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants