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.

Sign up for GitHub

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

Jump to bottom

nrfutil: 5.2 -> 6.1, pc-ble-driver-py: 0.11.4 -> 0.14.2, py-ble-driver: init at 4.1.1 #93063

Merged
merged 3 commits into from Jul 13, 2020
Merged

nrfutil: 5.2 -> 6.1, pc-ble-driver-py: 0.11.4 -> 0.14.2, py-ble-driver: init at 4.1.1 #93063

merged 3 commits into from Jul 13, 2020

Conversation

jonas-schievink
Copy link
Contributor

@jonas-schievink jonas-schievink commented Jul 13, 2020 •
edited

Motivation for this change

Fix the build of nrfutil by updating it and its dependencies.

cc @gebner

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.

@ofborg ofborg bot requested a review from gebner July 13, 2020 13:20
gebner
gebner requested changes Jul 13, 2020
View reviewed changes
Copy link
Member

@gebner gebner left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM.

pkgs/development/python-modules/pc-ble-driver-py/default.nix Outdated

buildPythonPackage rec {
with python37Packages; buildPythonPackage rec {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
with python37Packages; buildPythonPackage rec {
buildPythonPackage rec {

Python packages can be built for different python versions. For example nix-build -A python38Packages.pc-ble-driver-py. This file should not import python37Packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Same for nrfutil? It doesn't build on all Python 3 versions, and not at all on Python 2.

Copy link
Member

Choose a reason for hiding this comment

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

For applications it's fine to hardcode a python version. It's only the libraries where you might want to use them with a different python version.

Please squash the "Don't depend on a fixed Python version" commit into the "nrfutil: ..." commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, done! (I'm assuming you meant the pc-ble-driver-py commit)

Copy link
Member

Choose a reason for hiding this comment

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

Oh yes, of course.

Jonas Schievink added 3 commits July 13, 2020 23:25
@jonas-schievink
pc-ble-driver: init at 4.1.1
e1a1b97 
It's a dependency of pc-ble-driver-py, but it's no longer built
alongside it.
@jonas-schievink
pc-ble-driver-py: 0.11.4 -> 0.14.2
d82b7b8
@jonas-schievink
nrfutil: 5.2 -> 6.1
720a935
@ofborg ofborg bot requested a review from gebner July 13, 2020 21:29
@gebner gebner merged commit 5f8c1a2 into NixOS:master Jul 13, 2020
@gebner
Copy link
Member

gebner commented Jul 13, 2020

Thank you!

@jonas-schievink jonas-schievink deleted the nrfutil branch July 13, 2020 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@gebner gebner Awaiting requested review from gebner

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jonas-schievink @gebner @Janik-Haag