Skip to content

brotab: patch out unnecessary "import pip" in setup.py#248601

Merged
doronbehar merged 1 commit intoNixOS:masterfrom
tjni:brotab
Aug 12, 2023
Merged

brotab: patch out unnecessary "import pip" in setup.py#248601
doronbehar merged 1 commit intoNixOS:masterfrom
tjni:brotab

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 11, 2023

Description of changes

In some work I'm doing changing the Python bootstrap, pip is no longer part of the environment by default. This revealed that the setup.py of this project has an "import pip" that is no longer being used.

This is a one line change that could be done with a sed command, but I prefer pulling in the patch I submitted upstream as a signal that this is an upstream problem that should be fixed versus a nixpkgs specific patch.

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 doronbehar August 12, 2023 02:07
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 12, 2023
@doronbehar
Copy link
Copy Markdown
Contributor

doronbehar commented Aug 12, 2023 via email

@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 12, 2023

Hi! Thank you!

The __darwinAllowLocalNetworking attribute is actually a special one that tells nix to add some values to the Apple sandbox so that it's possible to connect to localhost when running a derivation on macOS with sandbox enabled. I've been running with the sandbox on, so I add these when I can so that tests pass locally for me. Hope this makes sense :)

@doronbehar
Copy link
Copy Markdown
Contributor

doronbehar commented Aug 12, 2023 via email

@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 12, 2023

I'm honestly not sure. I do know that the sandbox is turned off by default on Darwin and is also off on Hydra, so that might be one of the reasons. Also, if someone only uses a stable channel, they might always be able to get it from the binary cache.

@doronbehar
Copy link
Copy Markdown
Contributor

Result of nixpkgs-review pr 248601 run on x86_64-linux 1

2 packages built:
  • brotab
  • brotab.dist

@doronbehar doronbehar merged commit b58ace2 into NixOS:master Aug 12, 2023
@tjni tjni deleted the brotab branch August 12, 2023 09:18
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants