setcap-wrapper: Merging with upstream master and resolving conflicts

2017-01-25 11:08:05 -08:00
parent 1f9494b752 104c3db659
commit bae00e8aa8
4612 changed files with 200748 additions and 124553 deletions
@@ -17,7 +17,7 @@ buildGoPackage rec {
    sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz";
  };

-  goDeps = ./deps.json;
+  goDeps = ./deps.nix;

  nativeBuildInputs = [ sudo ];
  buildFlags = [ "-tags textsecure" ];