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

libtorrent-rasterbar: 1.1.11 -> 1.2.5

Browse Source 
https://raw.githubusercontent.com/arvidn/libtorrent/libtorrent-1_2_5/ChangeLog

The old release is kept available as libtorrentRasterbar-1_1_x for deluge 1.x.
This commit is contained in:
Will Dietz 2019-07-05 21:29:09 -05:00 committed by Milan
parent 69e73264a9
commit ca722c5e2b
3 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libtorrent-rasterbar/default.nix → pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses
, zlib, boost, openssl, libtool, python, libiconv, ncurses
}:
let
@ -23,7 +23,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
preConfigure = "./autotool.sh";
postInstall = ''
@ -35,11 +35,9 @@ in stdenv.mkDerivation {
configureFlags = [
"--enable-python-binding"
"--with-libgeoip=system"
"--with-libiconv=yes"
"--with-boost=${boostPython.dev}"
"--with-boost-libdir=${boostPython.out}/lib"
"--with-libiconv=yes"
];
meta = with stdenv.lib; {

50
pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, ncurses
}:
let
version = "1.2.5";
formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
# for the bindings, if overridden
boostPython = boost.override { enablePython = true; inherit python; };
in stdenv.mkDerivation {
pname = "libtorrent-rasterbar";
inherit version;
src = fetchFromGitHub {
owner = "arvidn";
repo = "libtorrent";
rev = "libtorrent-${formattedVersion}";
sha256 = "0y2fzqbvb1bxvf93d7sphwzxih6j40p5p3fay943k26w0nrq802w";
};
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
preConfigure = "./autotool.sh";
postInstall = ''
moveToOutput "include" "$dev"
moveToOutput "lib/${python.libPrefix}" "$python"
'';
outputs = [ "out" "dev" "python" ];
configureFlags = [
"--enable-python-binding"
"--with-libiconv=yes"
"--with-boost=${boostPython.dev}"
"--with-boost-libdir=${boostPython.out}/lib"
];
meta = with stdenv.lib; {
homepage = "https://libtorrent.org/";
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -2840,6 +2840,7 @@ in
ddrutility = callPackage ../tools/system/ddrutility { };
deluge = callPackage ../applications/networking/p2p/deluge {
libtorrentRasterbar = libtorrentRasterbar-1_1_x;
pythonPackages = python2Packages;
};
@ -13241,7 +13242,11 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { };
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
libtorrentRasterbar = libtorrentRasterbar-1_2_x;
# this is still the new version of the old API
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };