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

Merge pull request #33402 from andir/libtorrent-rastabar-1.1.6

Browse Source 
libtorrentRasterbar: 1.1.5 -> 1.1.6, switch deluge to libtorrentRasterbar & removed libtorrentRasterbar_1_0
This commit is contained in:
adisbladis 2018-01-04 01:42:02 +01:00 committed by GitHub
commit e7524ad3a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/p2p/deluge/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }: { stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
name = "deluge-${version}"; name = "deluge-${version}";
version = "1.3.15"; version = "1.3.15";
@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec {
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity
]; ];
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ intltool ];

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qbittorrent-${version}"; name = "qbittorrent-${version}";
version = "4.0.1"; version = "4.0.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "0khy875ahh9rlk8lyfpwsbxjsbp7i1cwqvd1j1s4cqc812szh3z3"; sha256 = "1lkbrvpzdfbqwilj09a9vraai7pz6dh999w4vl51mj1adm7bh0ws";
}; };
nativeBuildInputs = [ pkgconfig which ]; nativeBuildInputs = [ pkgconfig which ];

13
pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
View File

@ -1,13 +0,0 @@
args@{ callPackage, fetchpatch, ... }:
callPackage (import ./generic.nix {
version = "1.0.11";
sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i";
patches = [
# Compatibility with new Boost
(fetchpatch {
url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch";
sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5";
})
];
}) args

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -1,6 +1,6 @@
args@{ callPackage, ... }: args@{ callPackage, ... }:
callPackage (import ./generic.nix { callPackage (import ./generic.nix {
version = "1.1.5"; version = "1.1.6";
sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7";
}) args }) args

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

@ -9835,8 +9835,6 @@ with pkgs;
libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtoxcore = callPackage ../development/libraries/libtoxcore { };
@ -16541,9 +16539,7 @@ with pkgs;
pythonmagick = callPackage ../applications/graphics/PythonMagick { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { };
qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
libtorrentRasterbar = libtorrentRasterbar_1_0;
};
eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp {
lua5 = lua5_1; lua5 = lua5_1;