-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
python3Packages.ipython: disable clipboard test on darwin #159516
Conversation
Uh, its another of the parameters that would better not change hash if added with an empty list :-/ But... with |
Wondering if the solution is as simple as diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index 0f708f88829..26aa614426e 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -33,12 +33,12 @@ function pytestCheckPhase() {
# Compose arguments
args=" -m pytest"
- if [ -n "$disabledTests" ]; then
+ if [ "${#disabledTests[@]}" -gt 0 ]; then
disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
args+=" -k \""$disabledTestsString"\""
fi
- if [ -n "${disabledTestPaths-}" ]; then
+ if [ "${#disabledTestPaths[@]}" -gt 0 ]; then
eval "disabledTestPaths=($disabledTestPaths)"
fi
Edit: nope, isn't. |
The solution has to be in evaluation time, i.e. shell can't do it. On a quick glance, replacing empty lists by |
Anyway, let's try this particular build |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WFM macos 10.15
52f042a
to
8754ae8
Compare
8754ae8
to
4c7c197
Compare
Rebased, sorry for the noise. Need to learn how to do it properly I guess. |
- Cherry picked NixOS/nixpkgs#159516 - Starship workaround: NixOS/nixpkgs#160876
Motivation for this change
#157584 (comment)
Probably to big to into master, but easier to test on master. Can be rebased later.
cc @NixOS/darwin-maintainers please test
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes