Merge pull request #666 from rasendubi/KAA-1057

KAA-1057 Switch to upstream avro-cpp
kaaproject · May 10, 2016 · 17a7b6a · 17a7b6a
2 parents 9b1f3b0 + fcfc83a
commit 17a7b6a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 40 deletions.
diff --git a/nix/avro-cpp/default.nix b/nix/avro-cpp/default.nix
diff --git a/nix/default.nix b/nix/default.nix
@@ -46,12 +46,6 @@ let
       patches = [ ./astyle/max_indent.patch ];
     });
 
-    # avro-cpp was merged into upstream
-    # (https://github.com/NixOS/nixpkgs/pull/14811)
-    #
-    # Remove next line, once it gets into channel.
-    avro-cpp = callPackage ./avro-cpp { };
-
     kaa-client-c = callPackage ./kaa-client-c { };
 
     kaa-client-cpp = callPackage ./kaa-client-cpp { };