Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0612719388c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0cd86e1e9d1d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 3, 2018

  1. adb-sync: use python3 (#44409)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0cd86e1 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/mobile/adb-sync/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/mobile/adb-sync/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, python, androidsdk, makeWrapper }:
{ stdenv, fetchgit, python3, androidsdk, makeWrapper }:

stdenv.mkDerivation rec {
name = "adb-sync-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d";
};

buildInputs = [ python androidsdk makeWrapper ];
buildInputs = [ python3 androidsdk makeWrapper ];

phases = "installPhase";