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

adb-sync: use python3 #44409

Merged
merged 1 commit into from Aug 3, 2018
Merged

adb-sync: use python3 #44409

merged 1 commit into from Aug 3, 2018

Conversation

dotlambda
Copy link
Member

According to google/adb-sync#2 (comment),
it should work with python2 and python3. Using python3 is prefered in nixpkgs.

Motivation for this change

#18185

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

cc @scolobb
Note that this is completely untested.

adb-sync: use python3
2c79776 
According to google/adb-sync#2 (comment),
it should work with python2 and python3. Using python3 is prefered in nixpkgs.
@scolobb
Copy link
Contributor

scolobb commented Aug 3, 2018

@dotlambda Thanks for the update. I've have just tested this change on my system (release-18.03 with some small modifications) and everything works smoothly.

@dotlambda
Copy link
Member Author

@scolobb Thanks for testing! I'll merge as soon as @GrahamcOfBorg has done the automatic build.

@dotlambda
Copy link
Member Author

@GrahamcOfBorg build adb-sync

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: adb-sync

Partial log (click to expand)

Cannot nix-instantiate `adb-sync' because:
error: while evaluating the attribute 'buildInputs' of the derivation 'adb-sync-2016-08-31' at /var/lib/gc-of-borg/nix-test-rs-31/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-31/pkgs/stdenv/generic/make-derivation.nix:175:11:
while evaluating the attribute 'buildCommand' of the derivation 'android-sdk-25.2.5' at /var/lib/gc-of-borg/nix-test-rs-31/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-31/pkgs/stdenv/generic/make-derivation.nix:175:11:
while evaluating the attribute 'src' of the derivation 'android-platform-tools-r26.0.2' at /var/lib/gc-of-borg/nix-test-rs-31/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-31/pkgs/stdenv/generic/make-derivation.nix:175:11:
System aarch64-linux not supported!

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: adb-sync

Partial log (click to expand)

warning: entry 27 in symbol table refers to a non-existent section, skipping
warning: entry 28 in symbol table refers to a non-existent section, skipping
warning: entry 29 in symbol table refers to a non-existent section, skipping
warning: entry 30 in symbol table refers to a non-existent section, skipping
building '/nix/store/f6xph1syiclinj0bbbdgg6wxxnkrv444-adb-sync-2016-08-31.drv'...
installing
patching script interpreter paths in /nix/store/ms1csw4i94jxn3p8jl3w92ycs8nwq8lq-adb-sync-2016-08-31/bin
/nix/store/ms1csw4i94jxn3p8jl3w92ycs8nwq8lq-adb-sync-2016-08-31/bin/adb-sync: interpreter directive changed from "/usr/bin/python" to "/nix/store/8wfgl06xbcsxs6pmwr3n04kyhnvsh31d-python3-3.6.6/bin/python"
/nix/store/ms1csw4i94jxn3p8jl3w92ycs8nwq8lq-adb-sync-2016-08-31/bin/adb-channel: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
/nix/store/ms1csw4i94jxn3p8jl3w92ycs8nwq8lq-adb-sync-2016-08-31

@dotlambda dotlambda merged commit 0cd86e1 into NixOS:master Aug 3, 2018
@dotlambda dotlambda deleted the adb-sync-python3 branch January 17, 2024 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dotlambda @scolobb @GrahamcOfBorg