Skip to content

xonsh: add pip to test dependency and other changes#250801

Merged
natsukium merged 1 commit intoNixOS:masterfrom
tjni:xonsh
Aug 23, 2023
Merged

xonsh: add pip to test dependency and other changes#250801
natsukium merged 1 commit intoNixOS:masterfrom
tjni:xonsh

Conversation

@tjni
Copy link
Contributor

@tjni tjni commented Aug 22, 2023

Description of changes

We removed pip from implicitly being in the environment in #248866 and xonsh has stopped building on staging-next. This PR does the following:

  1. Add pip explicitly to nativeCheckInputs. Two tests depend on this.
  2. Switch to pyproject build since that's more modern and upstream uses it already.
  3. Add setuptools and wheel to nativeBuildInputs, which is what pyproject.toml asks for.
  4. Change sha256 to hash opportunistically.
  5. Prefix LC_ALL attribute with env to be more explicit.

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.

@ofborg ofborg bot requested a review from vrthra August 22, 2023 18:41
@ofborg ofborg 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. labels Aug 22, 2023
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

The diff looks fine.

@natsukium natsukium merged commit deae496 into NixOS:master Aug 23, 2023
@tjni tjni deleted the xonsh branch August 23, 2023 03:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

2 participants

Comments