Merge pull request #9224 from simonvandel/update-qbittorrent-3.2.3
qbittorrent: 3.1.11 -> 3.2.3 + libtorrent-rasterbar: 0.16.17 -> 0.16.19 + 1.0.2 -> 1.0.6
This commit is contained in:
commit
a7b90368a4
@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qbittorrent-${version}";
|
||||
version = "3.1.11";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
|
||||
sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i";
|
||||
sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
|
||||
++ optional guiSupport dbus_libs;
|
||||
|
||||
configureFlags = [
|
||||
"--with-libboost-lib=${boost.lib}/lib"
|
||||
"--with-libboost-inc=${boost.dev}/include"
|
||||
"--with-boost-libdir=${boost.lib}/lib"
|
||||
"--with-boost=${boost.dev}"
|
||||
(if guiSupport then "" else "--disable-gui")
|
||||
(if webuiSupport then "" else "--disable-webui")
|
||||
] ++ optional debugSupport "--enable-debug";
|
||||
|
||||
# https://github.com/qbittorrent/qBittorrent/issues/1992
|
||||
enableParallelBuilding = false;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Free Software alternative to µtorrent";
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "0.16.17";
|
||||
sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7";
|
||||
version = "0.16.19";
|
||||
sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw";
|
||||
})
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "1.0.2";
|
||||
sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w";
|
||||
version = "1.0.6";
|
||||
sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
|
||||
})
|
||||
|
@ -1,18 +1,26 @@
|
||||
{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip
|
||||
{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip
|
||||
# Version specific options
|
||||
, version, sha256
|
||||
, ... }:
|
||||
|
||||
let formattedVersion = lib.replaceChars ["."] ["_"] version;
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtorrent-rasterbar-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libtorrent/${name}.tar.gz";
|
||||
url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [automake autoconf libtool ];
|
||||
|
||||
buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ];
|
||||
|
||||
preConfigure = "./autotool.sh";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-python-binding"
|
||||
"--with-libgeoip=system"
|
||||
@ -21,6 +29,8 @@ stdenv.mkDerivation rec {
|
||||
"--with-boost-libdir=${boost.lib}/lib"
|
||||
"--with-libiconv=yes"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.rasterbar.com/products/libtorrent/;
|
||||
|
@ -12466,8 +12466,8 @@ let
|
||||
pythonmagick = callPackage ../applications/graphics/PythonMagick { };
|
||||
|
||||
qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
|
||||
boost = boost156;
|
||||
libtorrentRasterbar = libtorrentRasterbar_0_16;
|
||||
boost = boost;
|
||||
libtorrentRasterbar = libtorrentRasterbar;
|
||||
};
|
||||
|
||||
eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };
|
||||
|
Loading…
Reference in New Issue
Block a user