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

xonsh: 0.15.1 -> 0.17.0 #314728

Merged
merged 1 commit into from
Jun 21, 2024
Merged

xonsh: 0.15.1 -> 0.17.0 #314728

merged 1 commit into from
Jun 21, 2024

Conversation

SamLukeYes
Copy link
Member

@SamLukeYes SamLukeYes commented May 26, 2024

Description of changes

Adopted from #305316

Fixes #308868
Fixes #206062

Closes #301670

Upstream changes: xonsh/xonsh@0.15.1...0.17.0

Notably, ~/.xonshrc is no longer loaded by default in non-interactive mode. See xonsh/xonsh#5491

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@SamLukeYes SamLukeYes changed the title xonsh: 0.15.1 -> unstable-2024-05-25 xonsh: 0.15.1 -> 0.16.0-unstable-2024-05-25 May 26, 2024
Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

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

Maybe also put the compare link in the PR message:
xonsh/xonsh@0.15.1...1613914

pkgs/by-name/xo/xonsh/package.nix Outdated Show resolved Hide resolved
pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
@drmikecrowe
Copy link

Can this move to 0.16.0 instead of 0.16.0-unstable-2024-05-25?

@AndersonTorres
Copy link
Member

Can this move to 0.16.0 instead of 0.16.0-unstable-2024-05-25?

And using an outdated prompt-toolkit in a wild override stack that will be removed in the next release? Nope.

@SamLukeYes
Copy link
Member Author

0.17.0 was released just now. Let's use this stable version instead.

Co-authored-by: Anderson Torres <[email protected]>

Upstream changes: xonsh/xonsh@0.15.1...0.17.0
@SamLukeYes SamLukeYes changed the title xonsh: 0.15.1 -> 0.16.0-unstable-2024-05-25 xonsh: 0.15.1 -> 0.17.0 Jun 18, 2024
@ofborg ofborg bot requested a review from AndersonTorres June 18, 2024 15:36
@midirhee12
Copy link
Member

LGTM

@Aleksanaa Aleksanaa merged commit 34a8237 into NixOS:master Jun 21, 2024
31 checks passed
@midirhee12
Copy link
Member

Can we backport this to 24.05?

@SamLukeYes SamLukeYes added the backport release-24.05 Backport PR automatically label Jul 3, 2024
@SamLukeYes
Copy link
Member Author

Can we backport this to 24.05?

I'm not so sure about it tho, as it introduces at least one breaking change (xonsh/xonsh#5491)

Copy link
Contributor

github-actions bot commented Jul 3, 2024

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

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-314728-to-release-24.05 origin/release-24.05
cd .worktree/backport-314728-to-release-24.05
git switch --create backport-314728-to-release-24.05
git cherry-pick -x afc31073a3bb5d61825c51cadc67f75ab4d65ed0

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.

xonsh: wrong version of prompt-toolkit library xonsh: captured subproc is not capturing
7 participants