diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/p2p/deluge/default.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
3 files changed, 34 insertions, 32 deletions
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix new file mode 100644 index 000000000000..7f8594b8bbb1 --- /dev/null +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82eafe36d355..1d5e9042dbf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1635,7 +1635,9 @@ with pkgs; 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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f25018345b1..d3f93621d8da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { name = "pyxdg-0.25"; |