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

[20.09] python-miio: fix #102210

Merged
merged 2 commits into from Nov 20, 2020
Merged

[20.09] python-miio: fix #102210

merged 2 commits into from Nov 20, 2020

Conversation

@flyfloh
Copy link
Contributor

@flyfloh flyfloh commented Oct 31, 2020

Backport of #102183.

Motivation for this change

Fix the python-miio package for the 20.09 relase as well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Copy link
Contributor

@jonringer jonringer left a comment

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@flyfloh
Copy link
Contributor Author

@flyfloh flyfloh commented Oct 31, 2020

Oh, I see. Sorry for missing that. Fixed now.

@flyfloh flyfloh requested a review from jonringer Oct 31, 2020
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 31, 2020

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

2 packages marked as broken and skipped:
  • python37Packages.python-miio
  • python38Packages.python-miio

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 31, 2020

Result of nixpkgs-review pr 102210 run on x86_64-darwin 1

2 packages marked as broken and skipped:
  • python37Packages.python-miio
  • python38Packages.python-miio

@jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 6, 2020

please rebase on the latest release-20.09, and remove the "broken = true;"

$ nix-build -A python3Packages.python-miio
error: Package ‘python3.8-python-miio-0.5.3’ in /home/jon/projects/nixpkgs/pkgs/development/python-modules/python-miio/default.nix:34 is marked as broken, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

(use '--show-trace' to show detailed location information)

(cherry picked from commit 79e81e8)
@flyfloh
Copy link
Contributor Author

@flyfloh flyfloh commented Nov 20, 2020

I've rebased and added a commit that removes the 'broken = true'. Is is okay to add the commit here or should I have that merged to master and then include it here?

@jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 20, 2020

I've rebased and added a commit that removes the 'broken = true'. Is is okay to add the commit here or should I have that merged to master and then include it here?

Since this doesn't reflect master, yes, it's perfectly find to add another commit. I had it in my initial review as well (it was the last line)

If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

Copy link
Contributor

@jonringer jonringer left a comment

LGTM

https://github.com/NixOS/nixpkgs/pull/102210
2 packages built:
python37Packages.python-miio python38Packages.python-miio

@jonringer jonringer merged commit 0b2d5b9 into NixOS:release-20.09 Nov 20, 2020
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants