From 732760bb5054971af2bb249af181997da6152e0e Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Sat, 15 Mar 2014 20:22:03 +0100 Subject: [PATCH 1/2] Update KTorrent to 4.3.1. --- pkgs/applications/networking/p2p/ktorrent/default.nix | 4 ++-- pkgs/development/libraries/libktorrent/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index b408f20b711..c7840f2024f 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd"; + sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1"; }; patches = [ ./find-workspace.diff ]; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index a452cb7609e..3d7c21fde16 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -2,8 +2,8 @@ , phonon, libgcrypt }: let - mp_ = "2.1"; - version = "1.${mp_}-2"; + mp_ = "3.1"; + version = "1.${mp_}"; version4 = "4.${mp_}"; in stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { pname = "libktorrent"; src = fetchurl { - url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; - sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; + url = "http://ktorrent.pwsp.net//downloads/${version4}/${name}.tar.bz2"; + sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725"; }; nativeBuildInputs = [ cmake automoc4 gettext ]; From 24f4957d50584aa6683451c7cbbb63a42846d5dc Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Sat, 15 Mar 2014 21:31:58 +0100 Subject: [PATCH 2/2] KTorrent: Fix URLs. --- pkgs/applications/networking/p2p/ktorrent/default.nix | 2 +- pkgs/development/libraries/libktorrent/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index c7840f2024f..e53fda08911 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "KDE integrated BtTorrent client"; - homepage = http://ktorrent.org; + homepage = http://ktorrent.pwsp.net; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; inherit (libktorrent.meta) platforms; }; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 3d7c21fde16..db07775d45e 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "libktorrent"; src = fetchurl { - url = "http://ktorrent.pwsp.net//downloads/${version4}/${name}.tar.bz2"; + url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2"; sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A BiTtorrent library used by KTorrent"; - homepage = http://ktorrent.org; + homepage = http://ktorrent.pwsp.net; inherit (kdelibs.meta) platforms; }; }