JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ktorrent: 5.1.0 -> 5.1.2

Browse Source 
Update ktorrent from 5.1.0 to 5.1.2 and libktorrent from 2.1 to 2.1.1,
remove already included patches
This commit is contained in:
Andrei Lapshin 2019-09-04 08:07:12 +03:00
parent de0fc44144
commit 3f0f7d5054
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/p2p/ktorrent/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ktorrent"; pname = "ktorrent";
version = "${libktorrent.mainVersion}.0"; version = "${libktorrent.mainVersion}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz";
sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw"; sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534";
}; };
nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];
@ -22,24 +22,6 @@ stdenv.mkDerivation rec {
libktorrent taglib libgcrypt kplotting libktorrent taglib libgcrypt kplotting
]; ];
patches = [
# Fix build with CMake 3.11
(fetchpatch {
url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8";
sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid";
})
# Fix build against Qt 5.11
(fetchpatch {
url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8";
sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl";
})
(fetchpatch {
url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60";
sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

9
pkgs/development/libraries/libktorrent/default.nix
View File

@ -4,14 +4,15 @@
}: }:
let let
mainVersion = "5.1"; mainVersion = "5.1.2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libktorrent-2.1"; pname = "libktorrent";
version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/ktorrent/${mainVersion}/${name}.tar.xz"; url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz";
sha256 = "0vz2dwc4xd80q56g6r5bx5wqdl9fxcibxmw2irahqhbkxk7drvry"; sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];