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

deluge: 1.3.13 -> 1.3.15

Browse Source 
Change libtorrentRasterbar dependency to 1.0.x series (required for
1.3.x series)
Move Deluge out of pythonPackages (it doesn't support Python 3)
This commit is contained in:
Grant Wu 2017-08-05 17:13:26 -04:00 committed by Franz Pletz
parent 4c91e32da6
commit fa5e343242
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/networking/p2p/deluge/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "deluge-${version}";
version = "1.3.15";
src = fetchurl {
url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
};
propagatedBuildInputs = with pythonPackages; [
pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity
];
nativeBuildInputs = [ intltool ];
postInstall = ''
mkdir -p $out/share/applications
cp -R deluge/data/pixmaps $out/share/
cp -R deluge/data/icons $out/share/
cp deluge/data/share/applications/deluge.desktop $out/share/applications
'';
meta = with stdenv.lib; {
homepage = http://deluge-torrent.org;
description = "Torrent client";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ domenkozar ebzzry ];
platforms = platforms.all;
};
}

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

@ -1635,7 +1635,9 @@ with pkgs;
ddrescue = callPackage ../tools/system/ddrescue { }; ddrescue = callPackage ../tools/system/ddrescue { };
deluge = python2Packages.deluge; # Package should be moved out of python-packages.nix deluge = callPackage ../applications/networking/p2p/deluge {
pythonPackages = python2Packages;
};
desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };

31
pkgs/top-level/python-packages.nix
View File

@ -8775,37 +8775,6 @@ in {
}; };
}; };
deluge = buildPythonPackage rec {
name = "deluge-${version}";
version = "1.3.13";
src = pkgs.fetchurl {
url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp";
};
propagatedBuildInputs = with self; [
pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity
];
nativeBuildInputs = [ pkgs.intltool ];
postInstall = ''
mkdir -p $out/share/applications
cp -R deluge/data/pixmaps $out/share/
cp -R deluge/data/icons $out/share/
cp deluge/data/share/applications/deluge.desktop $out/share/applications
'';
meta = {
homepage = http://deluge-torrent.org;
description = "Torrent client";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ domenkozar ebzzry ];
platforms = platforms.all;
};
};
pyxdg = buildPythonPackage rec { pyxdg = buildPythonPackage rec {
name = "pyxdg-0.25"; name = "pyxdg-0.25";