svn merge ^/nixpkgs/trunk

There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174

1 files changed, 4 insertions, 4 deletions

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index afd16dbb2a8a..abb4eff6b57f 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
 
-let rev = "22523"; in
+let rev = "24763"; in
 
 stdenv.mkDerivation {
-  name = "tribler-5.4.3-pre${rev}";
+  name = "tribler-5.5.10";
 
   src = fetchsvn {
-    url = http://svn.tribler.org/abc/branches/release-5.4.x;
+    url = http://svn.tribler.org/abc/branches/release-5.5.x;
     inherit rev;
-    sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
+    sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];